version 1.306, 2005/12/26 19:01:25
|
version 1.321, 2006/02/21 10:27:43
|
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 173 sub start_html {
|
Line 183 sub start_html {
|
if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) { |
if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) { |
$currentstring = &Apache::lonxml::xmlbegin(); |
$currentstring = &Apache::lonxml::xmlbegin(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring .= '\documentclass[letterpaper]{article}'; |
$currentstring .= '\documentclass[letterpaper,twoside]{article}'; |
if (($env{'form.latex_type'}=~'batchmode') || |
if (($env{'form.latex_type'}=~'batchmode') || |
(!$env{'request.role.adv'})) {$currentstring .='\batchmode';} |
(!$env{'request.role.adv'})) {$currentstring .='\batchmode';} |
$currentstring .= '\newcommand{\keephidden}[1]{}'. |
$currentstring .= '\newcommand{\keephidden}[1]{}'. |
Line 594 sub end_body {
|
Line 604 sub end_body {
|
return $currentstring; |
return $currentstring; |
} |
} |
|
|
|
# \begin{center} causes a new paragprah spacing that looks odd inside |
|
# of a table cell |
|
sub center_correction { return '\vspace*{-6 mm}'; } |
#-- <center> tag (end tag required) |
#-- <center> tag (end tag required) |
sub start_center { |
sub start_center { |
my ($target,$token) = @_; |
my ($target,$token,$tagstack) = @_; |
my $currentstring = &end_p(); # Close off any prior para. |
my $currentstring = &end_p(); # Close off any prior para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
|
if (&is_inside_of($tagstack, "table")) { |
|
$currentstring .= ¢er_correction(); |
|
} |
$currentstring .= '\begin{center}'; |
$currentstring .= '\begin{center}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
sub end_center { |
sub end_center { |
my ($target,$token) = @_; |
my ($target,$token,$tagstack) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
Line 1178 sub start_p {
|
Line 1194 sub start_p {
|
$closing_string = '</p>'; # Deal correctly with <p /> e.g. |
$closing_string = '</p>'; # Deal correctly with <p /> e.g. |
} |
} |
} elsif ($target eq 'tex' && !$para_disabled) { |
} elsif ($target eq 'tex' && !$para_disabled) { |
|
|
$currentstring .= &end_p(); # close off prior para if in progress. |
$currentstring .= &end_p(); # close off prior para if in progress. |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if ($align eq 'center') { |
if ($align eq 'center') { |
$currentstring .='\begin{center}\par'; |
$currentstring .='\begin{center}\par'; |
$closing_string = '\end{center}'; |
$closing_string = '\end{center}'; |
|
if (&is_inside_of($tagstack, "table")) { |
|
$currentstring = ¢er_correction().$currentstring; |
|
} |
} elsif ($align eq 'right') { |
} elsif ($align eq 'right') { |
$currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{'; |
$currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{'; |
$closing_string= '}}'; |
$closing_string= '}}'; |
Line 1191 sub start_p {
|
Line 1211 sub start_p {
|
$closing_string = '}\hfill}'; |
$closing_string = '}\hfill}'; |
} else { |
} else { |
$currentstring.='\par '; |
$currentstring.='\par '; |
$closing_string = '\strut\\\\\strut '; |
if (&is_inside_of($tagstack, 'table')) { |
|
$closing_string = '\vskip 0pt'; # Seems to be consistent with <p> in tables. |
|
} else { |
|
$closing_string = '\strut\\\\\strut '; |
|
} |
} |
} |
|
|
} |
} |
Line 1524 sub start_div {
|
Line 1548 sub start_div {
|
if ($align eq 'center') { |
if ($align eq 'center') { |
$currentstring .= '\begin{center}'; |
$currentstring .= '\begin{center}'; |
$endstring = '\end{center}'; |
$endstring = '\end{center}'; |
|
if (&is_inside_of($tagstack, "table")) { |
|
$currentstring = ¢er_correction().$currentstring; |
|
} |
} |
} |
elsif ($align eq 'right') { |
elsif ($align eq 'right') { |
$currentstring .= '\begin{flushright}'; |
$currentstring .= '\begin{flushright}'; |
Line 1944 sub start_table {
|
Line 1971 sub start_table {
|
|
|
# width either comes forced from the TeXwidth or the width parameters. |
# width either comes forced from the TeXwidth or the width parameters. |
# in either case it can be a percentage or absolute width. |
# in either case it can be a percentage or absolute width. |
|
# in the width case we ignore absolute width |
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
if (not defined $TeXwidth) { |
if (!defined($TeXwidth)) { |
$TeXwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1); |
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack, |
|
$safeeval,undef,1); |
|
if ($htmlwidth =~ /%/) { |
|
$TeXwidth = $htmlwidth; |
|
} else { |
|
$TeXwidth = $textwidth; |
|
} |
} else { |
} else { |
$Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; |
$Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; |
} |
} |
Line 1958 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 2002 sub end_table {
|
Line 2039 sub end_table {
|
my $inmemory = ''; |
my $inmemory = ''; |
my $output = ''; |
my $output = ''; |
my $WARNING=''; |
my $WARNING=''; |
# &debug_dump_table($Apache::londefdef::table[-1]); |
|
#width of columns from TeXwidth attributes |
#width of columns from TeXwidth attributes |
|
|
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { |
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { |
Line 2189 sub end_table {
|
Line 2225 sub end_table {
|
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { |
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { |
my $have_rowspan = 0; |
my $have_rowspan = 0; |
for (my $jn=0;$jn<=$#fwidth;$jn++) { |
for (my $jn=0;$jn<=$#fwidth;$jn++) { |
|
|
|
#----------------------------------------------------------- |
|
# I think this order of doing things will ensure that |
|
# single rowspan, columspan and combined row/colspans will |
|
# work correctly. LaTeX is delicate here. |
|
# RF. |
|
|
|
# Start a rowspan if necessary: |
|
|
|
my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; |
|
my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn]; |
# |
# |
# Do the appropriate magic if this has a colspan |
# Do the appropriate magic if this has a colspan |
# |
# |
my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn]; |
|
if ($colspan > 1) { |
if ($colspan > 1) { |
$output .= '\multicolumn{'. |
$output .= '\multicolumn{'. |
$colspan |
$colspan |
.'}{|l|}{'; |
.'}{|l|}{'; |
} |
} |
my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; |
|
|
|
# Start a rowspan if necessary: |
|
|
|
if ($rowspan > 1) { |
if ($rowspan > 1) { |
$have_rowspan++; |
$have_rowspan++; |
Line 2209 sub end_table {
|
Line 2253 sub end_table {
|
if (($rowspan eq '^') || ($rowspan eq '_')) { |
if (($rowspan eq '^') || ($rowspan eq '_')) { |
$have_rowspan++; |
$have_rowspan++; |
} |
} |
|
#-------------------------------------------------------------- |
|
|
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
# $output.='\vspace*{-6 mm}\begin{center}'; |
$output.=¢er_correction().'\begin{center}'; |
$output.='\begin{center}'; |
|
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
$output.=' \hfill \llap{' |
$output.=' \hfill \llap{' |
} |
} |
$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn]; |
$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn]; |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
# $output.='\end{center}\vspace*{-6 mm}'; |
|
$output.='\end{center}'; |
$output.='\end{center}'; |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
$output.='} '; |
$output.='} '; |
Line 2245 sub end_table {
|
Line 2288 sub end_table {
|
$output .= ' \\\\ '; |
$output .= ' \\\\ '; |
for (my $jn=0; $jn<=$#fwidth;$jn++) { |
for (my $jn=0; $jn<=$#fwidth;$jn++) { |
my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; |
my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; |
if (($rowspan <= 1) || ($rowspan eq '_')) { |
if ($rowspan ne "^") { |
my $column = $jn+1; |
if (($rowspan <= 1) || ($rowspan eq '_')) { |
$output .= '\cline{'.$column.'-'.$column.'} '; |
my $column = $jn+1; |
|
$output .= '\cline{'.$column.'-'.$column.'} '; |
|
} |
} |
} |
} |
} |
|
|
Line 2417 sub end_td_tex {
|
Line 2462 sub end_td_tex {
|
$Apache::londefdef::table[-1]{'counter_columns'} = $current_column; |
$Apache::londefdef::table[-1]{'counter_columns'} = $current_column; |
|
|
|
|
|
# Get the column and row spans. |
|
# Colspan can be done via \multicolumn if I can figure out the data structs. |
|
|
|
my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 0); |
|
if (!$colspan) { |
|
$colspan = 1; |
|
} |
|
|
my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 0); |
my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 0); |
if (!$rowspan) { |
if (!$rowspan) { |
Line 2425 sub end_td_tex {
|
Line 2477 sub end_td_tex {
|
|
|
|
|
|
|
$Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] = $rowspan; |
for (my $c = 0; $c < $colspan; $c++) { |
for (my $i = 1; $i < $rowspan; $i++) { |
$Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column+$c] = $rowspan; |
$Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column] = '^'; |
for (my $i = 1; $i < $rowspan; $i++) { |
if ($i == ($rowspan-1)) { |
$Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column+$c] = '^'; |
$Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column] = '_'; |
if ($i == ($rowspan-1)) { |
|
$Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column+$c] = '_'; |
|
} |
} |
} |
} |
} |
|
|
Line 2524 sub end_td_tex {
|
Line 2578 sub end_td_tex {
|
|
|
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; |
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; |
|
|
# Get the column and row spans. |
|
# Colspan can be done via \multicolumn if I can figure out the data structs. |
|
|
|
my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 0); |
|
if (!$colspan) { |
|
$colspan = 1; |
|
} |
|
|
|
|
|
# the colspan array will indicate how many columns will be spanned by this |
# the colspan array will indicate how many columns will be spanned by this |
Line 2539 sub end_td_tex {
|
Line 2587 sub end_td_tex {
|
# counter_columns is incremented in the start_td_tex, we adjust by colspan-1. |
# counter_columns is incremented in the start_td_tex, we adjust by colspan-1. |
# |
# |
|
|
$Apache::londefdef::table[-1]{'colspan'}[$current_row][$current_column] = $colspan; |
|
$Apache::londefdef::table[-1]{'counter_columns'} += $colspan -1; |
$Apache::londefdef::table[-1]{'counter_columns'} += $colspan -1; |
|
|
# Put empty text in spanned cols. |
|
|
|
for (my $i = 0; $i < ($colspan -1); $i++) { |
for (my $i = 0; $i < ($colspan -1); $i++) { |
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },''; |
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },''; |
} |
} |
|
for (my $r = 0; $r < $rowspan; $r++) { |
|
$Apache::londefdef::table[-1]{'colspan'}[$current_row+$r][$current_column] = $colspan; |
|
# Put empty text in spanned cols. |
|
|
|
} |
|
|
|
|
|
|
return ''; |
return ''; |
Line 2745 sub start_img {
|
Line 2795 sub start_img {
|
$safeeval, |
$safeeval, |
undef,1)); |
undef,1)); |
if(!$align) { |
if(!$align) { |
if (&is_inside_of($tagstack, "table")) { |
|
$align = "right"; # Force wraptext use. |
|
} else { |
|
$align = "bottom"; # This is html's default so it's ours too. |
$align = "bottom"; # This is html's default so it's ours too. |
} |
|
} |
} |
# |
# |
&Apache::lonxml::debug("Alignemnt = $align"); |
&Apache::lonxml::debug("Alignemnt = $align"); |
Line 2764 sub start_img {
|
Line 2810 sub start_img {
|
$parstack, |
$parstack, |
$safeeval, |
$safeeval, |
undef,0); |
undef,0); |
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering"); |
# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering"); |
if(!$latex_rendering) { |
if(!$latex_rendering) { |
$latex_rendering = "texwrap"; |
$latex_rendering = "texwrap"; |
|
} |
|
# using texwrap inside a table does not work. So, if after all of this, |
|
# texwrap is on, we turn it off if we detect we're in a table: |
|
# |
|
if (($latex_rendering eq 'texwrap') && &is_inside_of($tagstack, "table")) { |
|
$latex_rendering = 'parpic'; |
} |
} |
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
|
|
#if original gif/jpg/png file exist do following: |
#if original gif/jpg/png file exist do following: |
my $origsrc=$src; |
my $origsrc=$src; |
Line 3142 sub start_pre {
|
Line 3194 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 3153 sub end_pre {
|
Line 3206 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; |
} |
} |