version 1.106.2.2, 2003/03/17 17:18:50
|
version 1.111, 2003/02/05 23:17:32
|
Line 121 sub start_tthoption {
|
Line 121 sub start_tthoption {
|
&tth::tthoptions($inside); |
&tth::tthoptions($inside); |
} |
} |
} |
} |
return $result; |
|
} |
} |
|
|
sub end_tthoption { |
sub end_tthoption { |
Line 375 sub start_html {
|
Line 374 sub start_html {
|
delete($token->[2]->{$key}); |
delete($token->[2]->{$key}); |
} |
} |
} |
} |
$token->[2]->{'onLoad'}=&Apache::lonxml::loadevents(). |
$token->[2]->{'onload'}=&Apache::lonxml::loadevents(). |
';'.$onLoad; |
';'.$onLoad; |
my $onUnload=''; |
my $onUnload=''; |
foreach my $key (keys(%{$token->[2]})) { |
foreach my $key (keys(%{$token->[2]})) { |
Line 384 sub start_html {
|
Line 383 sub start_html {
|
delete($token->[2]->{$key}); |
delete($token->[2]->{$key}); |
} |
} |
} |
} |
$token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents(). |
$token->[2]->{'onunload'}=&Apache::lonxml::unloadevents(). |
';'.$onUnload; |
';'.$onUnload; |
|
|
$currentstring .= '<'.$token->[1]; |
$currentstring .= '<'.$token->[1]; |
Line 1456 sub start_table {
|
Line 1455 sub start_table {
|
my $shorthand = ($filled_columns+1)*4; |
my $shorthand = ($filled_columns+1)*4; |
$output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g; |
$output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g; |
} |
} |
|
if ($how_many_columns==1) { #start of block with width correction for one column table |
|
$output=~s/^\s*\\parbox{([^}]*)}/\\parbox{\\textwidth - 1 cm}/; |
|
} #end of block with width correction for one column table |
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm '; |
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm '; |
if ($#Apache::londefdef::table > 0) { |
if ($#Apache::londefdef::table > 0) { |
$inmemory = $Apache::londefdef::table[-1]{'output'}; |
$inmemory = $Apache::londefdef::table[-1]{'output'}; |
Line 1509 sub start_table {
|
Line 1511 sub start_table {
|
my $currentstring = ''; |
my $currentstring = ''; |
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); |
my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); |
if ($what_to_push eq '') { |
if ($what_to_push eq '') { |
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);; |
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);; |
Line 1517 sub start_table {
|
Line 1519 sub start_table {
|
push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push; |
push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push; |
$Apache::londefdef::table[-1]{'counter_columns'}++; |
$Apache::londefdef::table[-1]{'counter_columns'}++; |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
; |
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 2584 sub image_replication {
|
Line 2585 sub image_replication {
|
my $newsrc = $src; |
my $newsrc = $src; |
$newsrc =~ s/\.(gif|jpg|png)$/.eps/; |
$newsrc =~ s/\.(gif|jpg|png)$/.eps/; |
if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') { |
if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') { |
$newsrc =~ s/\.ps$/\.eps/; |
$newsrc =~ s/\.eps$/\.ps/; |
&Apache::lonnet::repcopy('/home/httpd/html'.$newsrc); |
&Apache::lonnet::repcopy('/home/httpd/html'.$newsrc); |
} |
} |
} |
} |