--- loncom/xml/londefdef.pm 2006/01/12 23:48:00 1.313
+++ loncom/xml/londefdef.pm 2007/06/05 22:37:58 1.366
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.313 2006/01/12 23:48:00 foxr Exp $
+# $Id: londefdef.pm,v 1.366 2007/06/05 22:37:58 albertel Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -48,6 +48,7 @@ use Apache::lonmenu();
use Apache::lonmeta();
use Apache::Constants qw(:common);
use File::Basename;
+use LONCAPA();
# use Data::Dumper;
BEGIN {
@@ -79,6 +80,8 @@ sub initialize_londefdef {
@Apache::londefdef::DT=(0);
@Apache::londefdef::seenDT=(0);
$Apache::londefdef::list_index=0;
+ undef($Apache::londefdef::head);
+ undef($Apache::londefdef::title);
}
#======================= TAG SUBROUTINES =====================
@@ -105,16 +108,27 @@ sub start_m {
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
#&Apache::lonxml::debug("M is evaulated to:$inside:");
}
+ my $tex = $inside;
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
if ($Apache::lontexconvert::errorstring) {
- &Apache::lonxml::warning("tth error: ".
- $Apache::lontexconvert::errorstring);
+ my $errormsg=''.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'
occured while attempting to convert this TeX: ';
+ $tex = &HTML::Entities::encode($tex,'<>&"');
+ my ($linenumber) =
+ ($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
+ if (defined($linenumber)) {
+ my @tex=split("\n",$tex);
+ $tex[$linenumber]=''.
+ $tex[$linenumber].'';
+ $tex=join("\n",@tex);
+ }
+ &Apache::lonxml::warning($errormsg.$tex.'');
$Apache::lontexconvert::errorstring='';
}
#&Apache::lonxml::debug("M is ends with:$currentstring:");
$Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'tex') {
+
$currentstring = $inside;
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {
@@ -122,11 +136,13 @@ sub start_m {
}
if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
# detect simple math mode entry exits, and convert them
- # to use \ensuremath
- if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
- $currentstring=~s/^(\s*)\$/$1/;
- $currentstring=~s/\$(\s*)$/$1/;
- $currentstring='\ensuremath{'.$currentstring.'}';
+ # to use \ensuremath ... unless there's a \verb inside.
+ if (! ($currentstring=~/\\verb/)) {
+ if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
+ $currentstring=~s/^(\s*)\$/$1/;
+ $currentstring=~s/\$(\s*)$/$1/;
+ $currentstring='\ensuremath{'.$currentstring.'}';
+ }
}
$Apache::lonxml::post_evaluate=0;
}
@@ -145,7 +161,7 @@ sub end_m {
sub start_tthoption {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $result;
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'webgrade') {
my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser,
$style);
$inside=~s/^\s*//;
@@ -168,12 +184,11 @@ sub end_tthoption {
sub start_html {
my ($target,$token) = @_;
my $currentstring = '';
- my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
- &Apache::lontexconvert::init_tth();
if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
- $currentstring = &Apache::lonxml::xmlbegin();
+ # start_body() takes care of emitting the
} elsif ($target eq 'tex') {
- $currentstring .= '\documentclass[letterpaper,twoside]{article}';
+ $currentstring .=
+ '\documentclass[letterpaper,twoside]{article}\raggedbottom';
if (($env{'form.latex_type'}=~'batchmode') ||
(!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
$currentstring .= '\newcommand{\keephidden}[1]{}'.
@@ -201,8 +216,8 @@ sub start_html {
sub end_html {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
- if ($target eq 'web') {
- $currentstring = '';
+ if ($target eq 'web' || $target eq 'webgrade') {
+ # end_body takes care of the