version 1.302.2.3, 2006/01/13 21:05:57
|
version 1.304, 2005/12/20 23:12:03
|
Line 594 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,$tagstack) = @_; |
my ($target,$token) = @_; |
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,$tagstack) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\end{center}'; |
$currentstring = '\end{center}'; |
if (&is_inside_of($tagstack, "table")) { |
|
#$currentstring .= ¢er_correction(); |
|
} |
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1192 sub start_p {
|
Line 1183 sub start_p {
|
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; |
|
#$closing_string .= ¢er_correction(); |
|
} |
|
} 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 1537 sub start_div {
|
Line 1524 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; |
|
#$endstring .= ¢er_correction(); |
|
} |
|
} |
} |
elsif ($align eq 'right') { |
elsif ($align eq 'right') { |
$currentstring .= '\begin{flushright}'; |
$currentstring .= '\begin{flushright}'; |
Line 1961 sub start_table {
|
Line 1944 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 (!defined($TeXwidth)) { |
if (not defined $TeXwidth) { |
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack, |
$TeXwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1); |
$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 2209 sub end_table {
|
Line 2187 sub end_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++) { |
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|}{'; |
|
} |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { |
$output.=¢er_correction().'\begin{center}'; |
# $output.='\vspace*{-6 mm}\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}';#.¢er_correction(); |
# $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 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'}.' '; |
$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' '; |
Line 2366 sub start_td_tex {
|
Line 2361 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(); |
|
|
|
|
|
|
|
|
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 2457 sub end_td_tex {
|
Line 2457 sub end_td_tex {
|
} |
} |
# Should be be killing off the 'include' elements as they're used up? |
# 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; |
|
# Get the column and row spans. |
|
# Colspan can be done via \multicolumn if I can figure out the data structs. |
|
# Rowspan, can be done using the multirow package which adds similar stuff to rowspanning. |
|
|
|
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); |
|
|
|
|
|
# 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 ''; |
return ''; |
} |
} |
|
|
Line 2653 sub start_img {
|
Line 2680 sub start_img {
|
$safeeval, |
$safeeval, |
undef,1)); |
undef,1)); |
if(!$align) { |
if(!$align) { |
# disabled for now see BUG#4535 |
|
if (&is_inside_of($tagstack, "table")) { |
if (&is_inside_of($tagstack, "table")) { |
$align = "top"; # Force top of image to top of table cell |
$align = "right"; # Force wraptext use. |
} else { |
} 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. |
} |
} |