version 1.158, 2003/08/01 13:35:20
|
version 1.159, 2003/08/07 20:12:40
|
Line 1858 sub start_td {
|
Line 1858 sub start_td {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); |
&tag_check('tr','td',$tagstack,$parstack,$parser,$safeeval); |
if ($what_to_push eq '') { |
# my @ar=@$parstack; |
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);; |
# for (my $i=$#ar-1;$i>=0;$i--) { |
} |
# if (lc($$tagstack[$i]) eq 'tr') { |
push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push; |
# &start_td_tex($parstack,$parser,$safeeval); |
$Apache::londefdef::table[-1]{'counter_columns'}++; |
# last; |
&Apache::lonxml::startredirection(); |
# } elsif (lc($$tagstack[$i]) eq 'td') { |
|
# splice @ar, $i+1; |
|
# &end_td_tex(\@ar,$parser,$safeeval); |
|
# &start_td_tex($parstack,$parser,$safeeval); |
|
# last; |
|
# } |
|
# } |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
|
sub tag_check { |
|
my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_; |
|
my @ar=@$parstack; |
|
for (my $i=$#ar-1;$i>=0;$i--) { |
|
if (lc($$tagstack[$i]) eq $good_tag) { |
|
&start_td_tex($parstack,$parser,$safeeval); |
|
last; |
|
} elsif (lc($$tagstack[$i]) eq $bad_tag) { |
|
splice @ar, $i+1; |
|
&end_td_tex(\@ar,$parser,$safeeval); |
|
&start_td_tex($parstack,$parser,$safeeval); |
|
last; |
|
} |
|
} |
|
return ''; |
|
} |
|
|
|
sub start_td_tex { |
|
my ($parstack,$parser,$safeeval) = @_; |
|
my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); |
|
if ($what_to_push eq '') { |
|
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);; |
|
} |
|
push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push; |
|
$Apache::londefdef::table[-1]{'counter_columns'}++; |
|
&Apache::lonxml::startredirection(); |
|
return ''; |
|
} |
|
|
|
sub end_td_tex { |
|
my ($parstack,$parser,$safeeval) = @_; |
|
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
|
my $data=&Apache::lonxml::endredirection(); |
|
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 { |
|
if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { |
|
my $current_length=&recalc($1); |
|
$current_length=~/(\d+\.?\d*)/; |
|
$Apache::londefdef::table[-1]{'TeXlength'} .= $1.','; |
|
$Apache::londefdef::table[-1]{'length'} .= '0,'; |
|
} else { |
|
$data=~s/^\s+(\S.*)/$1/; |
|
$data=~s/(.*\S)\s+$/$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]/; |
|
} |
|
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'}; |
|
return''; |
|
} |
|
|
sub end_td { |
sub end_td { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
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') { |
my $current_row = $Apache::londefdef::table[-1]{'row_number'}; |
&end_td_tex($parstack,$parser,$safeeval); |
my $data=&Apache::lonxml::endredirection(); |
|
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 { |
|
if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { |
|
my $current_length=&recalc($1); |
|
$current_length=~/(\d+\.?\d*)/; |
|
$Apache::londefdef::table[-1]{'TeXlength'} .= $1.','; |
|
$Apache::londefdef::table[-1]{'length'} .= '0,'; |
|
} else { |
|
$data=~s/^\s+(\S.*)/$1/; |
|
$data=~s/(.*\S)\s+$/$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]/; |
|
} |
|
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'}; |
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |