version 1.315, 2006/01/25 11:30:14
|
version 1.318, 2006/02/04 22:11:42
|
Line 105 sub start_m {
|
Line 105 sub start_m {
|
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
#&Apache::lonxml::debug("M is evaulated to:$inside:"); |
#&Apache::lonxml::debug("M is evaulated to:$inside:"); |
} |
} |
|
my $tex = $inside; |
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval); |
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval); |
$currentstring = &Apache::lontexconvert::converted(\$inside,$display); |
$currentstring = &Apache::lontexconvert::converted(\$inside,$display); |
if ($Apache::lontexconvert::errorstring) { |
if ($Apache::lontexconvert::errorstring) { |
&Apache::lonxml::warning("tth error: ". |
my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occured while attempting to convert this TeX: <pre>'; |
$Apache::lontexconvert::errorstring); |
$tex = &HTML::Entities::encode($tex,'<>&"'); |
|
my ($linenumber) = |
|
($Apache::lontexconvert::errorstring =~ /Line (\d+)/); |
|
if (defined($linenumber)) { |
|
my @tex=split("\n",$tex); |
|
$tex[$linenumber]='<b><font color="red">'. |
|
$tex[$linenumber].'</font></b>'; |
|
$tex=join("\n",@tex); |
|
} |
|
&Apache::lonxml::warning($errormsg.$tex.'</pre>'); |
$Apache::lontexconvert::errorstring=''; |
$Apache::lontexconvert::errorstring=''; |
} |
} |
#&Apache::lonxml::debug("M is ends with:$currentstring:"); |
#&Apache::lonxml::debug("M is ends with:$currentstring:"); |
Line 1980 sub start_table {
|
Line 1990 sub start_table {
|
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; |
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; |
} else { |
} else { |
$Apache::londefdef::table[-1]{'width'}=$TeXwidth; |
$Apache::londefdef::table[-1]{'width'}=$TeXwidth; |
} |
} |
|
# In the end, however the table width cannot be wider than $textwidth... |
|
|
|
if ($Apache::londefdef::table[-1]{'width'} > $textwidth) { |
|
$Apache::londefdef::table[-1]{'width'} = $textwidth; |
|
} |
|
|
#table's border |
#table's border |
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); |
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); |
Line 3164 sub start_pre {
|
Line 3179 sub start_pre {
|
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring .= '\begin{verbatim}'; |
$currentstring .= '\begin{verbatim}'; |
|
&Apache::lonxml::disable_LaTeX_substitutions; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 3175 sub end_pre {
|
Line 3191 sub end_pre {
|
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring .= '\end{verbatim}'; |
$currentstring .= '\end{verbatim}'; |
|
&Apache::lonxml::enable_LaTeX_substitutions; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |