version 1.107, 2003/01/16 02:55:05
|
version 1.113, 2003/02/14 19:35:55
|
Line 49 use strict;
|
Line 49 use strict;
|
use Apache::lonxml; |
use Apache::lonxml; |
use Apache::File(); |
use Apache::File(); |
use Image::Magick; |
use Image::Magick; |
|
use Apache::lonmenu; |
|
|
BEGIN { |
BEGIN { |
|
|
&Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','u','ul','var','wbr')); |
&Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr')); |
|
|
} |
} |
|
|
Line 108 sub end_m {
|
Line 109 sub end_m {
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
|
sub start_tthoption { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
|
my $result; |
|
if ($target eq 'web') { |
|
my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser); |
|
$inside=~s/^\s*//; |
|
if ($ENV{'browser.mathml'}) { |
|
&tth::ttmoptions($inside); |
|
} else { |
|
&tth::tthoptions($inside); |
|
} |
|
} |
|
} |
|
|
|
sub end_tthoption { |
|
my ($target,$token) = @_; |
|
my $result; |
|
return $result; |
|
} |
|
|
#-- <html> tag |
#-- <html> tag |
sub start_html { |
sub start_html { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
Line 162 sub start_html {
|
Line 184 sub start_html {
|
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = &Apache::lonxml::registerurl(undef,$target). |
$currentstring = &Apache::lonmenu::registerurl(undef,$target). |
$token->[2]; |
$token->[2]; |
} |
} |
return $currentstring; |
return $currentstring; |
Line 306 sub start_html {
|
Line 328 sub start_html {
|
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[$#$parser]); |
&Apache::lonxml::get_all_text("/meta",$parser); |
} else { |
} else { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} |
} |
Line 344 sub start_html {
|
Line 366 sub start_html {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
if (!$Apache::lonxml::registered) { |
if (!$Apache::lonxml::registered) { |
$currentstring.='<head>'. |
$currentstring.='<head>'. |
&Apache::lonxml::registerurl(undef,$target).'</head>'; |
&Apache::lonmenu::registerurl(undef,$target).'</head>'; |
} |
} |
my $onLoad=''; |
my $onLoad=''; |
foreach my $key (keys(%{$token->[2]})) { |
foreach my $key (keys(%{$token->[2]})) { |
Line 353 sub start_html {
|
Line 375 sub start_html {
|
delete($token->[2]->{$key}); |
delete($token->[2]->{$key}); |
} |
} |
} |
} |
$token->[2]->{'onLoad'}=&Apache::lonxml::loadevents(). |
$token->[2]->{'onload'}=&Apache::lonmenu::loadevents(). |
';'.$onLoad; |
';'.$onLoad; |
my $onUnload=''; |
my $onUnload=''; |
foreach my $key (keys(%{$token->[2]})) { |
foreach my $key (keys(%{$token->[2]})) { |
Line 362 sub start_html {
|
Line 384 sub start_html {
|
delete($token->[2]->{$key}); |
delete($token->[2]->{$key}); |
} |
} |
} |
} |
$token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents(). |
$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents(). |
';'.$onUnload; |
';'.$onUnload; |
|
|
$currentstring .= '<'.$token->[1]; |
$currentstring .= '<'.$token->[1]; |
Line 376 sub start_html {
|
Line 398 sub start_html {
|
<input type="submit" name="editmode" value="Edit" /> |
<input type="submit" name="editmode" value="Edit" /> |
</form> |
</form> |
EDITBUTTON |
EDITBUTTON |
} |
} else { |
|
$currentstring.=&Apache::lonmenu::menubuttons(undef,$target); |
|
} |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\begin{document}'; |
$currentstring = '\begin{document}'; |
} |
} |
Line 1434 sub start_table {
|
Line 1458 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 1487 sub start_table {
|
Line 1514 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 1495 sub start_table {
|
Line 1522 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 1766 sub end_allow {
|
Line 1792 sub end_allow {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
if (!$Apache::lonxml::registered) { |
if (!$Apache::lonxml::registered) { |
$currentstring.='<head>'. |
$currentstring.='<head>'. |
&Apache::lonxml::registerurl(undef,$target).'</head>'; |
&Apache::lonmenu::registerurl(undef,$target).'</head>'; |
} |
} |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} |
} |
Line 2562 sub image_replication {
|
Line 2588 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); |
} |
} |
} |
} |