version 1.293, 2005/11/08 02:04:23
|
version 1.316, 2006/01/27 22:30:23
|
Line 48 use Apache::lonmenu();
|
Line 48 use Apache::lonmenu();
|
use Apache::lonmeta(); |
use Apache::lonmeta(); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use File::Basename; |
use File::Basename; |
|
# use Data::Dumper; |
|
|
BEGIN { |
BEGIN { |
|
|
Line 55 BEGIN {
|
Line 56 BEGIN {
|
|
|
} |
} |
|
|
|
# |
|
# Dumps all elements of the table structure. |
|
# Need this 'cause evidently when given an array, Data::Dumper only seems |
|
# to dump element 0. |
|
# |
|
#sub debug_dump_table { |
|
# my $lastrow = $#Apache::londefdef::table; |
|
# &Apache::lonnet::logthis("Dumping table: Last row index: $lastrow"); |
|
# my $row; |
|
# for ($row =0; $row <= $lastrow; $row++ ) { |
|
# my $text = Dumper($Apache::londefdef::table[$row]); |
|
# &Apache::lonnet::logthis("table [ $row ]".$text); |
|
# } |
|
#} |
sub initialize_londefdef { |
sub initialize_londefdef { |
$Apache::londefdef::TD_redirection=0; |
$Apache::londefdef::TD_redirection=0; |
@Apache::londefdef::table = (); |
@Apache::londefdef::table = (); |
Line 129 sub end_m {
|
Line 143 sub end_m {
|
} |
} |
|
|
sub start_tthoption { |
sub start_tthoption { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my $result; |
my $result; |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser); |
my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser, |
|
$style); |
$inside=~s/^\s*//; |
$inside=~s/^\s*//; |
if ($env{'browser.mathml'}) { |
if ($env{'browser.mathml'}) { |
&tth::ttmoptions($inside); |
&tth::ttmoptions($inside); |
Line 158 sub start_html {
|
Line 173 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]{}'. |
'\renewcommand{\deg}{$^{\circ}$}'. |
'\renewcommand{\deg}{$^{\circ}$}'. |
|
'\usepackage{multirow}'. |
'\usepackage{longtable}'. |
'\usepackage{longtable}'. |
'\usepackage{textcomp}'. |
'\usepackage{textcomp}'. |
'\usepackage{makeidx}'. |
'\usepackage{makeidx}'. |
Line 369 sub end_title {
|
Line 385 sub end_title {
|
|
|
#-- <meta> tag (end tag forbidden) |
#-- <meta> tag (end tag forbidden) |
sub start_meta { |
sub start_meta { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $args=''; |
my $args=''; |
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
if ($args eq '') { |
if ($args eq '') { |
&Apache::lonxml::get_all_text("/meta",$parser); |
&Apache::lonxml::get_all_text("/meta",$parser,$style); |
} else { |
} else { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} |
} |
Line 438 sub end_meta {
|
Line 454 sub end_meta {
|
|
|
# accessrule |
# accessrule |
sub start_accessrule { |
sub start_accessrule { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
my $eff=&Apache::lonxml::get_param |
my $eff=&Apache::lonxml::get_param |
('effect',$parstack,$safeeval,undef,1); |
('effect',$parstack,$safeeval,undef,1); |
Line 457 sub start_accessrule {
|
Line 473 sub start_accessrule {
|
my $args=''; |
my $args=''; |
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } |
if ($args eq '') { |
if ($args eq '') { |
&Apache::lonxml::get_all_text("/accessrule",$parser); |
&Apache::lonxml::get_all_text("/accessrule",$parser,$style); |
} else { |
} else { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} |
} |
Line 578 sub end_body {
|
Line 594 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 1162 sub start_p {
|
Line 1184 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 1175 sub start_p {
|
Line 1201 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 1508 sub start_div {
|
Line 1538 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 1925 sub start_table {
|
Line 1958 sub start_table {
|
} |
} |
} |
} |
} |
} |
|
|
|
# width either comes forced from the TeXwidth or the width parameters. |
|
# 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)) { |
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1); |
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack, |
if ($htmlwidth=~/%/) { |
$safeeval,undef,1); |
$Apache::londefdef::table[-1]{'percent'}=1; |
if ($htmlwidth =~ /%/) { |
$htmlwidth=~/(\d+)/; |
$TeXwidth = $htmlwidth; |
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;; |
} else { |
} else { |
$TeXwidth = $textwidth; |
$Apache::londefdef::table[-1]{'width'}=$textwidth; |
|
} |
} |
} elsif ($TeXwidth=~/%/) { |
} else { |
|
$Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; |
|
} |
|
if ($TeXwidth=~/%/) { |
$Apache::londefdef::table[-1]{'percent'}=1; |
$Apache::londefdef::table[-1]{'percent'}=1; |
$TeXwidth=~/(\d+)/; |
$TeXwidth=~/(\d+)/; |
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; |
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; |
} else { |
} else { |
$Apache::londefdef::table[-1]{'forcetablewidth'}=1; |
|
$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); |
my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0); |
my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0); |
Line 1970 sub start_table {
|
Line 2014 sub start_table {
|
$Apache::londefdef::table[-1]{'content'}=[]; |
$Apache::londefdef::table[-1]{'content'}=[]; |
$Apache::londefdef::table[-1]{'align'}=[]; |
$Apache::londefdef::table[-1]{'align'}=[]; |
$currentstring.='\keephidden{NEW TABLE ENTRY}'; |
$currentstring.='\keephidden{NEW TABLE ENTRY}'; |
} |
|
|
|
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 1983 sub end_table {
|
Line 2029 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++) { |
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { |
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { |
if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) { |
if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) { |
Line 2166 sub end_table {
|
Line 2214 sub end_table {
|
$header_of_table .= '}'; |
$header_of_table .= '}'; |
#fill the table |
#fill the 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; |
for (my $jn=0;$jn<=$#fwidth;$jn++) { |
for (my $jn=0;$jn<=$#fwidth;$jn++) { |
|
# |
|
# Do the appropriate magic if this has a colspan |
|
# |
|
my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn]; |
|
if ($colspan > 1) { |
|
$output .= '\multicolumn{'. |
|
$colspan |
|
.'}{|l|}{'; |
|
} |
|
my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; |
|
|
|
# Start a rowspan if necessary: |
|
|
|
if ($rowspan > 1) { |
|
$have_rowspan++; |
|
$output .= '\multirow{'.$rowspan.'}[0]{'.$fwidth[$jn].'mm}{'; |
|
} |
|
if (($rowspan eq '^') || ($rowspan eq '_')) { |
|
$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}'; |
} 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}'; |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { |
$output.='} '; |
$output.='} '; |
} |
} |
|
# Close off any open multirow: |
|
|
|
if ($rowspan > 1) { |
|
$output .= '}'; |
|
} |
|
# Close off the colspan... |
|
# |
|
if ($colspan > 1) { |
|
$output .= '}'; |
|
$jn += $colspan-1; # Adjust for number of rows really left. |
|
} |
if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};} |
if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};} |
} |
} |
$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' '; |
# If have_rowspan > 0, and borders are on, then |
|
# we need to do more than put an \hline at the bottom of row. |
|
# we need to do the appropriate \cline to ensure that |
|
# the spanned rows don't have \hlines through them. |
|
|
|
if (($Apache::londefdef::table[-1]{'hinc'} =~ /\\hline/) && $have_rowspan) { |
|
$output .= ' \\\\ '; |
|
for (my $jn=0; $jn<=$#fwidth;$jn++) { |
|
my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; |
|
if (($rowspan <= 1) || ($rowspan eq '_')) { |
|
my $column = $jn+1; |
|
$output .= '\cline{'.$column.'-'.$column.'} '; |
|
} |
|
} |
|
|
|
} else { |
|
$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' '; |
|
} |
} |
} |
# Note that \newline destroys alignment env's produced by e.g. <div> |
# Note that \newline destroys alignment env's produced by e.g. <div> |
# $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut '; |
# $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut '; |
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut'.'\\\\'."\n".'\strut '; |
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut'.'\\\\'."\n".'\strut '; |
if ($#Apache::londefdef::table > 0) { |
if ($#Apache::londefdef::table > 0) { |
my $inmemory = $Apache::londefdef::table[-1]{'output'}; |
my $inmemory = $Apache::londefdef::table[-1]{'output'}; |
|
# Figure out max/and min width by summing us and then |
|
# apply that to the current column of the table we nest in |
|
# if it's larger than the current width or the current width |
|
# is undefined. |
|
# |
|
my $min_nested_width = 0; |
|
my $max_nested_width = 0; |
|
for (my $col = 0; $col <= $Apache::londefdef::table[-1]{'counter_columns'}; $col++) { |
|
$min_nested_width += $min_len[$col]; |
|
$max_nested_width += $max_len[$col]; |
|
|
|
} |
|
# Fudge in an extra 5 mm for borders etc: |
|
|
|
$min_nested_width += 5; |
|
$max_nested_width += 5; |
|
|
|
my $outer_column = $Apache::londefdef::table[-2]{'counter_columns'}; |
|
my $outer_row = $Apache::londefdef::table[-2]{'row_number'}; |
|
if ($min_nested_width > $Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column]) { |
|
$Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column] = $min_nested_width; |
|
} |
|
if ($max_nested_width > $Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column]) { |
|
$Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column] = $max_nested_width; |
|
} |
|
|
pop @Apache::londefdef::table; |
pop @Apache::londefdef::table; |
push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory; |
push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory; |
} else { |
} else { |
Line 2213 sub start_tr {
|
Line 2337 sub start_tr {
|
push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l'; |
push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l'; |
} |
} |
push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'}); |
push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'}); |
|
# |
|
# Need to save the number of table columns to preserve the max # columns. |
|
# |
|
$Apache::londefdef::table[-1]{'prior_columns'} = $Apache::londefdef::table[-1]{'counter_columns'}; |
$Apache::londefdef::table[-1]{'counter_columns'} = -1; |
$Apache::londefdef::table[-1]{'counter_columns'} = -1; |
push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, []; |
push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, []; |
push @ {$Apache::londefdef::table[-1]{'objectlen'}}, []; |
push @ {$Apache::londefdef::table[-1]{'objectlen'}}, []; |
Line 2232 sub end_tr {
|
Line 2360 sub end_tr {
|
if ($Apache::londefdef::TD_redirection) { |
if ($Apache::londefdef::TD_redirection) { |
&end_td_tex($parstack,$parser,$safeeval); |
&end_td_tex($parstack,$parser,$safeeval); |
} |
} |
|
# Counter columns must be the maximum number of columns seen |
|
# in the table so far so: |
|
if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) { |
|
$Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'}; |
|
} |
|
|
|
|
|
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 2286 sub start_td_tex {
|
Line 2422 sub start_td_tex {
|
|
|
sub end_td_tex { |
sub end_td_tex { |
my ($parstack,$parser,$safeeval) = @_; |
my ($parstack,$parser,$safeeval) = @_; |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
my $data=&Apache::lonxml::endredirection(); |
my $current_column = $Apache::londefdef::table[-1]{'counter_columns'}; |
|
my $data = &Apache::lonxml::endredirection(); |
|
|
|
# The rowspan array of the table indicates which cells are part of a span. |
|
# n indicates the start of a span set of n rows. |
|
# ^ indicates a cell that continues a span set. |
|
# _ indicates the cell is at the bottom of a span set. |
|
# If this and subsequent cells are part of a rowspan, we must |
|
# push along the row until we find one that is not. |
|
|
|
while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column]) |
|
&& ($Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] =~ /[\^\_]/)) { |
|
# Part of a span. |
|
push @ {$Apache::londefdef::table[-1]{'content'}[-1]}, ''; |
|
$current_column++; |
|
} |
|
$Apache::londefdef::table[-1]{'counter_columns'} = $current_column; |
|
|
|
|
|
|
|
my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 0); |
|
if (!$rowspan) { |
|
$rowspan = 1; |
|
} |
|
|
|
|
|
|
|
$Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] = $rowspan; |
|
for (my $i = 1; $i < $rowspan; $i++) { |
|
$Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column] = '^'; |
|
if ($i == ($rowspan-1)) { |
|
$Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column] = '_'; |
|
} |
|
} |
|
|
my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); |
if (defined $TeXwidth) { |
if (defined $TeXwidth) { |
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; |
Line 2364 sub end_td_tex {
|
Line 2534 sub end_td_tex {
|
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length; |
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length; |
} |
} |
} |
} |
for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) { |
# Substitute all of the tables nested in this cell in their appropriate places. |
$data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; |
|
} |
|
|
my $nested_count = $#{$Apache::londefdef::table[-1]{'include'}}; # This one is constant... |
|
for (my $in=0; $in<=$nested_count; $in++) { |
|
my $nested = shift @{$Apache::londefdef::table[-1]{'include'}}; |
|
$nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/; |
|
# $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; |
|
$data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/; |
|
|
|
} |
|
# Should be be killing off the 'include' elements as they're used up? |
|
|
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; |
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; |
return''; |
|
|
# 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 |
|
# cell..this requires that counter_columns also be adjusted accordingly |
|
# so that the next bunch of text goes in the right cell. Note that since |
|
# 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; |
|
|
|
# Put empty text in spanned cols. |
|
|
|
for (my $i = 0; $i < ($colspan -1); $i++) { |
|
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },''; |
|
} |
|
|
|
|
|
return ''; |
} |
} |
|
|
sub end_td { |
sub end_td { |
Line 2524 sub end_th {
|
Line 2730 sub end_th {
|
# (Note there seems to also be support for this as a % of page size) |
# (Note there seems to also be support for this as a % of page size) |
# |
# |
sub start_img { |
sub start_img { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval, |
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval, |
undef,1); |
undef,1); |
if (not $src and ($target eq 'web' or $target eq 'tex')) { |
if (not $src and ($target eq 'web' or $target eq 'tex')) { |
my $inside = &Apache::lonxml::get_all_text("/img",$parser); |
my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style); |
return ''; |
return ''; |
} |
} |
&Apache::lonxml::extlink($src); |
&Apache::lonxml::extlink($src); |
Line 2564 sub start_img {
|
Line 2770 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 2583 sub start_img {
|
Line 2785 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"; |
} |
} |
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
# 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"); |
|
|
#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 4056 sub file_path {
|
Line 4264 sub file_path {
|
} |
} |
return $file,$path; |
return $file,$path; |
} |
} |
|
# Converts a measurement in to mm from any of |
|
# the other valid LaTeX units of measure. |
|
# If the units of measure are missing from the |
|
# parameter, it is assumed to be in and returned |
|
# with mm units of measure |
sub recalc { |
sub recalc { |
my $argument = shift; |
my $argument = shift; |
if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';} |
if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';} |