--- loncom/xml/londefdef.pm 2002/11/15 16:35:23 1.103 +++ loncom/xml/londefdef.pm 2003/03/18 07:26:49 1.121 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.103 2002/11/15 16:35:23 sakharuk Exp $ +# $Id: londefdef.pm,v 1.121 2003/03/18 07:26:49 www Exp $ # # # Copyright Michigan State University Board of Trustees @@ -44,15 +44,17 @@ package Apache::londefdef; -use Apache::lonnet; +use Apache::lonnet(); use strict; -use Apache::lonxml; +use Apache::lonxml(); use Apache::File(); use Image::Magick; +use Apache::lonmenu(); +use Apache::lonmeta(); 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','accessrule','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')); } @@ -108,6 +110,28 @@ sub end_m { } 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); + } + } + return $result; +} + +sub end_tthoption { + my ($target,$token) = @_; + my $result; + return $result; +} + #-- tag sub start_html { my ($target,$token) = @_; @@ -133,11 +157,12 @@ sub start_html { } elsif ($target eq 'tex') { @Apache::londefdef::table = (); $currentstring .= '\documentclass[letterpaper]{article} - \newcommand{\keephidden}[1]{} - \renewcommand{\deg}{$^{\circ}$} - \usepackage[dvips]{graphicx} - \usepackage{epsfig}\usepackage{calc} - \newenvironment{choicelist}{\begin{enumerate}}{\end{enumerate}}'; + \newcommand{\keephidden}[1]{} + \renewcommand{\deg}{$^{\circ}$} + \usepackage{textcomp} + \usepackage[dvips]{graphicx} + \usepackage{epsfig}\usepackage{calc} +\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'; } return $currentstring; } @@ -162,7 +187,7 @@ sub start_html { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = &Apache::lonxml::registerurl(undef,$target). + $currentstring = &Apache::lonmenu::registerurl(undef,$target). $token->[2]; } return $currentstring; @@ -300,25 +325,28 @@ sub start_html { } #-- tag sub start_meta { - my ($target,$token,$tagstack,$parstack,$parser) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { my $args=''; if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } if ($args eq '') { - &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]); + &Apache::lonxml::get_all_text("/meta",$parser); } else { $currentstring = $token->[4]; } } if ($target eq 'meta') { - unless ($token->[2]->{'http-equiv'}) { + unless (&Apache::lonxml::get_param + ('http-equiv',$parstack,$safeeval,undef,1)) { my $name=$token->[2]->{'name'}; $name=~tr/A-Z/a-z/; - $name=~s/\s/\_/g; + $name=~s/\s/\_/gs; + $name=~s/\W//gs; if ($name) { $currentstring='<'.$name.'>'. - $token->[2]->{'content'}. + &Apache::lonxml::get_param + ('content',$parstack,$safeeval,undef,1). ''; } } @@ -337,6 +365,46 @@ sub start_html { } return $currentstring; } +# accessrule + sub start_accessrule { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my $currentstring = ''; + my $eff=&Apache::lonxml::get_param + ('effect',$parstack,$safeeval,undef,1); + my $realm=&Apache::lonxml::get_param + ('realm',$parstack,$safeeval,undef,1); + my $cont=&Apache::lonxml::get_param + ('content',$parstack,$safeeval,undef,1); + $cont=~s/\s+//g; + $cont=~s/\W/\;/g; + if ($target eq 'web') { + my $args=''; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + if ($args eq '') { + &Apache::lonxml::get_all_text("/accessrule",$parser); + } else { + $currentstring = $token->[4]; + } + } + if ($target eq 'meta') { + $currentstring=''. + $eff.':'.$realm.':'.$cont. + ''; + } + return $currentstring; + } + sub end_accessrule { + my ($target,$token,$tagstack,$parstack,$parser) = @_; + my $currentstring = ''; + if ($target eq 'web') { + my $args=''; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + if ($args ne '') { + $currentstring = $token->[4]; + } + } + return $currentstring; + } #-- tag sub start_body { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; @@ -344,7 +412,7 @@ sub start_html { if ($target eq 'web') { if (!$Apache::lonxml::registered) { $currentstring.=''. - &Apache::lonxml::registerurl(undef,$target).''; + &Apache::lonmenu::registerurl(undef,$target).''; } my $onLoad=''; foreach my $key (keys(%{$token->[2]})) { @@ -353,7 +421,7 @@ sub start_html { delete($token->[2]->{$key}); } } - $token->[2]->{'onLoad'}=&Apache::lonxml::loadevents(). + $token->[2]->{'onload'}=&Apache::lonmenu::loadevents(). ';'.$onLoad; my $onUnload=''; foreach my $key (keys(%{$token->[2]})) { @@ -362,7 +430,7 @@ sub start_html { delete($token->[2]->{$key}); } } - $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents(). + $token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents(). ';'.$onUnload; $currentstring .= '<'.$token->[1]; @@ -376,7 +444,9 @@ sub start_html { EDITBUTTON - } + } else { + $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1); + } } elsif ($target eq 'tex') { $currentstring = '\begin{document}'; } @@ -965,7 +1035,7 @@ EDITBUTTON if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\underline{'; + &Apache::lonxml::startredirection(); } return $currentstring; } @@ -975,7 +1045,10 @@ EDITBUTTON if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - $currentstring .= '}'; + $currentstring=&Apache::lonxml::endredirection(); + $currentstring=~s/(\S)(\s+)(\S)/$1}$2\\underline{$3/g; + $currentstring=~s/^\s*(\S)/\\underline{$1/; + $currentstring=~s/(\S)\s*$/$1}/; } return $currentstring; } @@ -986,7 +1059,7 @@ EDITBUTTON if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\underline{'; + &Apache::lonxml::startredirection(); } return $currentstring; } @@ -996,7 +1069,10 @@ EDITBUTTON if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - $currentstring .= '}'; + $currentstring=&Apache::lonxml::endredirection(); + $currentstring=~s/(\S)(\s+)(\S)/$1}$2\\underline{$3/g; + $currentstring=~s/^\s*(\S)/\\underline{$1/; + $currentstring=~s/(\S)\s*$/$1}/; } return $currentstring; } @@ -1142,7 +1218,7 @@ EDITBUTTON if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\underline{'; + &Apache::lonxml::startredirection(); } return $currentstring; } @@ -1152,7 +1228,10 @@ EDITBUTTON if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - $currentstring .= '}'; + $currentstring=&Apache::lonxml::endredirection(); + $currentstring=~s/(\S)(\s+)(\S)/$1}$2\\underline{$3/g; + $currentstring=~s/^\s*(\S)/\\underline{$1/; + $currentstring=~s/(\S)\s*$/$1}/; } return $currentstring; } @@ -1425,6 +1504,9 @@ sub start_table { my $shorthand = ($filled_columns+1)*4; $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 '; if ($#Apache::londefdef::table > 0) { $inmemory = $Apache::londefdef::table[-1]{'output'}; @@ -1478,7 +1560,7 @@ sub start_table { my $currentstring = ''; if ($target eq 'web') { $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); if ($what_to_push eq '') { $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);; @@ -1486,7 +1568,6 @@ sub start_table { push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push; $Apache::londefdef::table[-1]{'counter_columns'}++; &Apache::lonxml::startredirection(); -; } return $currentstring; } @@ -1505,7 +1586,7 @@ sub start_table { } else { if (length($data)<5) { $Apache::londefdef::table[-1]{'length'} .= '0 mm,'; - $tempolen = '5 mm'; + $tempolen = '6 mm'; } else { $Apache::londefdef::table[-1]{'length'} .= '0 mm,'; $tempolen = 'TOBECHANGEDONNUMBER'; @@ -1562,10 +1643,21 @@ sub start_table { my $scaling = .3; if ($target eq 'web') { - $currentstring = $token->[4]; + if ($ENV{'browser.imagesuppress'} ne 'on') { + $currentstring = $token->[4]; + } else { + my $alttag= &Apache::lonxml::get_param + ('alt',$parstack,$safeeval,undef,1); + unless ($alttag) { + $alttag=&Apache::lonmeta::alttag + ($Apache::lonxml::pwd[-1],$src); + } + $currentstring='[IMAGE: '.$alttag.']'; + } } elsif ($target eq 'tex') { - &image_replication($src); - $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); + $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); + &image_replication($src); + #if original gif/jpg/png file exist do following: if (-e $src) { #defines the default size of image @@ -1575,8 +1667,8 @@ sub start_table { $height_param = $image->Get('height') * $scaling;; undef $image; #do we have any specified size of the picture? - my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval) - my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval) + my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); + my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, undef,1); if ($TeXwidth ne '') { @@ -1603,7 +1695,7 @@ sub start_table { if (-e $newsrc) { #eps counterpart for image exist if ($path) { - $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} '; + $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; } } else { #there is no eps counterpart for image - check for ps one @@ -1612,7 +1704,7 @@ sub start_table { #ps counterpart for image exist $file =~ s/\.eps$/\.ps/; if ($path) { - $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} '; + $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; } } else { #there aren't eps or ps - so create eps @@ -1620,12 +1712,18 @@ sub start_table { my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; $temp_file = Apache::File->new('>>'.$filename); print $temp_file "$src\n"; - $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} '; + $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; } } } else { #original image file doesn't exist so check the alt attribute - my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1); + my $alt = + &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1); + unless ($alt) { + $alt=&Apache::lonmeta::alttag + ($Apache::lonxml::pwd[-1],$src); + } + if ($alt) { $currentstring .= ' '.$alt.' '; } else { @@ -1635,6 +1733,7 @@ sub start_table { } return $currentstring; } + sub end_img { my ($target,$token) = @_; my $currentstring = ''; @@ -1648,19 +1747,35 @@ sub start_table { #-- tag sub start_applet { - my ($target,$token) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'code'}; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'archive'}; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + + my $code=&Apache::lonxml::get_param + ('code',$parstack,$safeeval,undef,1); + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$code; + + my $archive=&Apache::lonxml::get_param + ('archive',$parstack,$safeeval,undef,1); + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$archive; + my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + if ($ENV{'browser.appletsuppress'} ne 'on') { + $currentstring = $token->[4]; + } else { + my $alttag= &Apache::lonxml::get_param + ('alt',$parstack,$safeeval,undef,1); + unless ($alttag) { + $alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1], + $code); + } + $currentstring='[APPLET: '.$alttag.']'; + } } elsif ($target eq 'tex') { $currentstring = " \\begin{figure} "; } return $currentstring; } + sub end_applet { my ($target,$token) = @_; my $currentstring = ''; @@ -1675,17 +1790,27 @@ sub end_applet { #-- tag sub start_embed { - my ($target,$token) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'src'}; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + if ($ENV{'browser.embedsuppress'} ne 'on') { + $currentstring = $token->[4]; + } else { + my $alttag=&Apache::lonxml::get_param + ('alt',$parstack,$safeeval,undef,1); + unless ($alttag) { + $alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src); + } + $currentstring='[EMBED: '.$alttag.']'; + } } elsif ($target eq 'tex') { $currentstring = " \\begin{figure} "; } return $currentstring; } + sub end_embed { my ($target,$token) = @_; my $currentstring = ''; @@ -1700,13 +1825,16 @@ sub start_embed { #-- tag sub start_param { - my ($target,$token) = @_; - if ($token->[2]->{'name'} eq 'cabbase') { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + if (&Apache::lonxml::get_param + ('name',$parstack,$safeeval,undef,1)=~/^cabbase$/i) { $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'value'}; + &Apache::lonxml::get_param + ('value',$parstack,$safeeval,undef,1); } $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'src'}; + &Apache::lonxml::get_param + ('src',$parstack,$safeeval,undef,1); my $currentstring = ''; if ($target eq 'web') { $currentstring = $token->[4]; @@ -1728,9 +1856,9 @@ sub start_embed { #-- tag sub start_allow { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $token->[2]->{'src'}; my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); + $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); + $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; &image_replication($src); my $result; if ($target eq 'edit') { @@ -1757,7 +1885,7 @@ sub end_allow { if ($target eq 'web') { if (!$Apache::lonxml::registered) { $currentstring.=''. - &Apache::lonxml::registerurl(undef,$target).''; + &Apache::lonmenu::registerurl(undef,$target).''; } $currentstring .= $token->[4]; } @@ -2546,15 +2674,17 @@ sub end_allow { sub image_replication { my $src = shift; - if (not -e '/home/httpd/html'.$src) { + if (not -e $src) { #replicates image itself - &Apache::lonnet::repcopy('/home/httpd/html'.$src); + &Apache::lonnet::repcopy($src); #replicates eps or ps my $newsrc = $src; - $newsrc =~ s/(.gif|.jpg|.png)$/.eps/; - if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') { - $newsrc =~ s/\.ps$/\.eps/; - &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc); + $newsrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i; + if (not -e $newsrc) { + if (&Apache::lonnet::repcopy($newsrc) ne 'OK') { + $newsrc =~ s/\.eps$/\.ps/; + &Apache::lonnet::repcopy($newsrc); + } } } return '';