--- loncom/xml/londefdef.pm 2003/04/16 17:59:01 1.126
+++ loncom/xml/londefdef.pm 2003/05/07 16:59:01 1.131
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.126 2003/04/16 17:59:01 sakharuk Exp $
+# $Id: londefdef.pm,v 1.131 2003/05/07 16:59:01 sakharuk Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -1696,9 +1696,14 @@ sub end_dd {
#--
tag
sub start_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
- my $textwidth=&recalc($ENV{'form.textwidth'});
- $textwidth=~/(\d+)/;
- $textwidth=$1;
+ my $textwidth;
+ if (not defined @Apache::londefdef::table) {
+ $textwidth=&recalc($ENV{'form.textwidth'});
+ $textwidth=~/(\d+)/;
+ $textwidth=$1;
+ } else {
+ $textwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
+ }
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
@@ -1737,6 +1742,7 @@ sub start_table {
$Apache::londefdef::table[-1]{'vvinc'} = '';
}
$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
+ $currentstring = '\keephidden{NEW TABLE ENTRY '.$textwidth.'}';
}
return $currentstring;
}
@@ -1755,8 +1761,6 @@ sub end_table {
$header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
}
$header_of_table .= '}';
-
-
#define the length of the table cells
#always starts with TeXwidth (if defined everything else is ignored)
my @length_row_final = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[0]);
@@ -1784,8 +1788,6 @@ sub end_table {
}
}
$needed=$#length_row_final-$needed+1;
- $currentstring.=' SSSSS '.$needed.' EEEEE \\\\';
- $currentstring.=' SSSSS '.$available_length.' EEEEE \\\\';
for (my $jn=0;$jn<=$#length_row_final;$jn++) {
if ($length_row_final[$jn]==0) {
if ($length_raw_row[$jn]<$available_length/3) {
@@ -1800,10 +1802,6 @@ sub end_table {
$length_row_final[$jn]=0.9*$available_length/$needed;
}
}
- for (my $jn=0;$jn<=$#length_row_final;$jn++) {
- $currentstring.=' SSSSS '.$length_row_final[$jn].' EEEEE \\\\';
- $currentstring.=' JJJJJJJ '.$length_raw_row[$jn].' HHHHHHH \\\\';
- }
#fill the table
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
for (my $jn=0;$jn<=$#length_row_final;$jn++) {
@@ -1815,7 +1813,14 @@ sub end_table {
$output .= ' \\\\ ';
}
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
- $currentstring .= $Apache::londefdef::table[-1]{'output'};
+ if ($#Apache::londefdef::table > 0) {
+ my $inmemory = $Apache::londefdef::table[-1]{'output'};
+ pop @Apache::londefdef::table;
+ push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;
+ } else {
+ $currentstring .= $Apache::londefdef::table[-1]{'output'};
+ pop @Apache::londefdef::table;
+ }
}
return $currentstring;
}
@@ -1901,9 +1906,11 @@ sub end_td {
$Apache::londefdef::table[-1]{'length'} .= $current_length.',';
$Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
}
- }
- @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.
- $Apache::londefdef::table[-1]{'vinc'};
+ }
+ for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {
+ $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
+ }
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
}
return $currentstring;
}
@@ -1922,29 +1929,48 @@ sub start_th {
push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
$Apache::londefdef::table[-1]{'counter_columns'}++;
&Apache::lonxml::startredirection();
- ;
}
return $currentstring;
-}
-
+}
+
sub end_th {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
my $current_row = $Apache::londefdef::table[-1]{'row_number'};
my $data=&Apache::lonxml::endredirection();
- if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) {
- $Apache::londefdef::table[-1]{'length'} .= $1.',';
+ my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
+ if (defined $TeXwidth) {
+ my $current_length=&recalc($TeXwidth);
+ $current_length=~/(\d+)/;
+ $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
+ $Apache::londefdef::table[-1]{'length'} .= '0,';
} else {
- $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
- }
- @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{\textbf{'.$data.'}} '.$Apache::londefdef::table[-1]{'vinc'};
+ if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
+ my $current_length=&recalc($1);
+ $current_length=~/(\d+)/;
+ $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
+ $Apache::londefdef::table[-1]{'length'} .= '0,';
+ } else {
+ $data=~/^\s*(\S.*)/;
+ $data=$1;
+ $data=~/(.*\S)\s*$/;
+ $data=$1;
+ my $current_length=2*length($data);
+ $Apache::londefdef::table[-1]{'length'} .= $current_length.',';
+ $Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
+ }
+ }
+ for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {
+ $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
+ }
+ $data='\textbf{'.$data.'}';
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
}
return $currentstring;
}
-
#--
tag
sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;