--- loncom/xml/londefdef.pm 2013/09/26 22:03:36 1.447 +++ loncom/xml/londefdef.pm 2023/03/15 16:53:49 1.468 @@ -1,8 +1,8 @@ # The LearningOnline Network with CAPA -# Tags Default Definition Module +# Tags Default Definition Module +# +# $Id: londefdef.pm,v 1.468 2023/03/15 16:53:49 raeburn Exp $ # -# $Id: londefdef.pm,v 1.447 2013/09/26 22:03:36 raeburn Exp $ -# # # Copyright Michigan State University Board of Trustees # @@ -25,19 +25,19 @@ # /home/httpd/html/adm/gpl.txt # # http://www.lon-capa.org/ -## Copyright for TtHfunc and TtMfunc by Ian Hutchinson. -# TtHfunc and TtMfunc (the "Code") may be compiled and linked into -# binary executable programs or libraries distributed by the -# Michigan State University (the "Licensee"), but any binaries so +## Copyright for TtHfunc and TtMfunc by Ian Hutchinson. +# TtHfunc and TtMfunc (the "Code") may be compiled and linked into +# binary executable programs or libraries distributed by the +# Michigan State University (the "Licensee"), but any binaries so # distributed are hereby licensed only for use in the context -# of a program or computational system for which the Licensee is the -# primary author or distributor, and which performs substantial +# of a program or computational system for which the Licensee is the +# primary author or distributor, and which performs substantial # additional tasks beyond the translation of (La)TeX into HTML. # The C source of the Code may not be distributed by the Licensee # to any other parties under any circumstances. # -package Apache::londefdef; +package Apache::londefdef; use Apache::lonnet; use strict; @@ -92,6 +92,26 @@ sub start_m { my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); if ($target eq 'web' || $target eq 'analyze') { &Apache::lonxml::debug("M is starting with:$inside:"); + if (!($inside =~ /^\s*\$.*\$\s*$/ || $inside =~ /^\s*\\[([].*\\[)\]]\s*$/)) { + # Non-math LaTeX will not be rendered correctly with MathJax + # and it should be avoided anyway. + # On top of that, MathJax will render math without $, but + # it will fail with tth. This is worth a warning. + # (even though some people might just use latex for printing) + &Apache::lonxml::warning(&mt('Missing $ in [_1].','<m>')); + } elsif (($env{'browser.type'} eq 'safari') && ($env{'form.editxmltext'}) && + (($env{'form.problemmode'} eq 'view') || ($env{'form.problemmode'} eq 'discard'))) { + my $delimiter; + if ($inside =~ /\$$/) { + $delimiter = '$'; + } elsif ($inside =~ /\\([)\]])$/) { + $delimiter = $1; + } + if ($delimiter) { + &Apache::lonxml::warning(&mt('Insert a space between [_1] and [_2].', + $delimiter,'</m>')); + } + } my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); if ($eval eq 'on') { $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); @@ -174,7 +194,7 @@ sub start_html { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) { - # start_body() takes care of emitting the + # start_body() takes care of emitting the } elsif ($target eq 'tex') { $currentstring .= &latex_header(); @@ -197,7 +217,7 @@ sub start_head { my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { &Apache::lonxml::startredirection(); - } + } return $currentstring; } @@ -210,7 +230,7 @@ sub end_head { if ($Apache::lonxml::redirection) { $Apache::londefdef::head = &Apache::lonxml::endredirection(); } - } + } return $currentstring; } @@ -219,8 +239,8 @@ sub start_map { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -228,8 +248,8 @@ sub end_map { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -238,7 +258,7 @@ sub start_select { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { $Apache::londefdef::select=0; } @@ -249,8 +269,8 @@ sub end_select { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -259,7 +279,7 @@ sub start_option { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { $Apache::londefdef::select++; if ($Apache::londefdef::select == 1) { @@ -275,7 +295,7 @@ sub end_option { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { $currentstring='}'; } @@ -287,8 +307,8 @@ sub start_input { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -296,8 +316,8 @@ sub end_input { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -306,8 +326,8 @@ sub start_textarea { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -315,8 +335,8 @@ sub end_textarea { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -325,8 +345,8 @@ sub start_form { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -334,8 +354,8 @@ sub end_form { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -344,10 +364,10 @@ sub start_title { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $Apache::londefdef::title = + $Apache::londefdef::title = &Apache::lonxml::get_all_text('/title',$parser,$style); } elsif ($target eq 'tex') { - $currentstring .= '\keephidden{Title of the document: ' + $currentstring .= '\keephidden{Title of the document: '; } if ($target eq 'meta') { $currentstring=''; @@ -363,11 +383,11 @@ sub end_title { # start_title takes care of swallowing the title } elsif ($target eq 'tex') { $currentstring .= '}'; - } + } if ($target eq 'meta') { &end_output($target); $currentstring=''; - } + } return $currentstring; } @@ -535,7 +555,7 @@ sub end_accessrule { if ($args ne '') { $currentstring = $token->[4]; } - } + } return $currentstring; } @@ -544,7 +564,7 @@ sub generate_css_links { my $css_href = &Apache::lonnet::EXT('resource.0.cssfile'); if ($css_href =~ /\S/) { &Apache::lonxml::extlink($css_href); - $links .= + $links .= ''; } return $links; @@ -579,20 +599,24 @@ sub start_body { 'text' => 'HTML Editor', 'href' => '', }); - # breadcrumbs (and tools) will be created + # breadcrumbs (and tools) will be created # in start_page->bodytag->innerregister } else { # FIXME Where are we? } - $currentstring = + my $args = {'add_entries' => $token->[2], + 'force_register' => 1,}; + if ($target eq 'web') { + $args->{'print_suppress'} = 1; + if ($env{'request.use_absolute'}) { + $args->{'use_absolute'} = $env{'request.use_absolute'}; + } + } + $currentstring = &Apache::loncommon::start_page($Apache::londefdef::title, $Apache::londefdef::head - .$extra_head, - {'add_entries' => $token->[2], -# 'no_title' => 1, - 'force_register' => 1}); - + .$extra_head,$args); my $header = ''; if ($env{'request.state'} ne 'published' && $env{'request.state'} ne 'construct') { @@ -634,6 +658,12 @@ sub edit_controls { } $result .= '
'; + if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) { + my $uri = $env{'request.uri'}; + my $daxeurl = '/daxepage'.$uri; + $result .= ''; + } if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); if ($url =~ /\.html?$/i) { @@ -682,16 +712,16 @@ sub end_body { if ($target eq 'web' || $target eq 'webgrade') { $currentstring .= &Apache::loncommon::end_page({'discussion' => 1}); } elsif ($target eq 'tex') { - $currentstring .= '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}'; - } + $currentstring .= '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}'; + } return $currentstring; } -# \begin{center} causes a new paragprah spacing that looks odd inside +# \begin{center} causes a new paragprah spacing that looks odd inside # of a table cell. Same at the end of a \center but with a slightly # larger space .. hence center_correction and center_end_correction. # -sub center_correction { return '\vspace*{-6 mm}'; } +sub center_correction { return '\vspace*{-6 mm}'; } sub center_end_correction { return '\vspace*{-7 mm}'; } #--
tag (end tag required) @@ -699,12 +729,12 @@ sub start_center { my ($target,$token,$tagstack) = @_; my $currentstring = &end_p(); # Close off any prior para. if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { if (&is_inside_of($tagstack, "table")) { $currentstring .= ¢er_correction(); } - $currentstring .= '\begin{center}'; + $currentstring .= '\begin{center}'; } return $currentstring; } @@ -713,9 +743,9 @@ sub end_center { my ($target,$token,$tagstack) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = '\end{center}'; + $currentstring = '\end{center}'; if (&is_inside_of($tagstack, "table")) { $currentstring .= ¢er_end_correction(); } @@ -729,11 +759,11 @@ sub start_b { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { &disable_para(); - $currentstring .= '\textbf{'; - } + $currentstring .= '\textbf{'; + } return $currentstring; } @@ -741,11 +771,11 @@ sub end_b { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { &enable_para(); $currentstring = '}'; - } + } return $currentstring; } @@ -755,11 +785,11 @@ sub start_strong { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { &disable_para(); - $currentstring = '\textbf{'; - } + $currentstring = '\textbf{'; + } return $currentstring; } @@ -767,10 +797,10 @@ sub end_strong { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { &enable_para(); - $currentstring = '}'; + $currentstring = '}'; } return $currentstring; } @@ -793,7 +823,7 @@ sub start_h1 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; } elsif ($target eq 'meta') { $currentstring.=''; &start_output($target); @@ -808,7 +838,7 @@ sub end_h1 { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { my $post='\vskip 0 mm '; - my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); + my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1)); if ($align eq 'center') { $post='\end{center}'; } elsif ($align eq 'left') { @@ -820,7 +850,7 @@ sub end_h1 { } elsif ($target eq 'meta') { &end_output($target); $currentstring=''; - } + } return $currentstring; } @@ -842,8 +872,8 @@ sub start_h2 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; - } + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; + } return $currentstring; } @@ -863,7 +893,7 @@ sub end_h2 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -885,8 +915,8 @@ sub start_h3 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; - } + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; + } return $currentstring; } @@ -906,7 +936,7 @@ sub end_h3 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -928,8 +958,8 @@ sub start_h4 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; - } + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; + } return $currentstring; } @@ -949,7 +979,7 @@ sub end_h4 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -971,8 +1001,8 @@ sub start_h5 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; - } + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; + } return $currentstring; } @@ -992,7 +1022,7 @@ sub end_h5 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -1014,8 +1044,8 @@ sub start_h6 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; - } + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; + } return $currentstring; } @@ -1035,7 +1065,7 @@ sub end_h6 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -1081,7 +1111,7 @@ sub end_i { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $currentstring .= '}'; - } + } return $currentstring; } @@ -1116,7 +1146,7 @@ sub start_dfn { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\textit{'; - } + } return $currentstring; } @@ -1185,7 +1215,7 @@ sub start_code { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\texttt{'; - } + } return $currentstring; } @@ -1196,7 +1226,7 @@ sub end_code { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $currentstring .= '}'; - } + } return $currentstring; } @@ -1219,7 +1249,7 @@ sub end_em { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $currentstring .= '}'; - } + } return $currentstring; } @@ -1242,7 +1272,7 @@ sub end_q { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $currentstring .= '}'; - } + } return $currentstring; } @@ -1258,7 +1288,7 @@ sub end_q { my $closing_string = ''; # String required to close

# Some tags are

fragile meaning that

inside of them -# does not work within TeX mode. This is managed via the +# does not work within TeX mode. This is managed via the # counter below: # @@ -1287,6 +1317,10 @@ sub start_p { $currentstring .= &end_p(); # close off prior para if in progress. my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); + if (!defined $align) { + # check inline CSS + $align = &get_css_property('text-align',$parstack,$safeeval); + } if ($align eq 'center') { $currentstring .='\begin{center}\par '; $closing_string = '\end{center}'; @@ -1294,13 +1328,13 @@ sub start_p { $currentstring = ¢er_correction().$currentstring; } } elsif ($align eq 'right') { - $currentstring.="\n".'{\flushright '; + $currentstring.="\n".'\begin{flushright}'; # $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{'; - $closing_string= "}\n"; + $closing_string= '\end{flushright}'."\n"; } elsif ($align eq 'left') { - $currentstring.= "\n".'{\flushleft '; + $currentstring.= "\n".'\begin{flushleft}'; # $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{{'; - $closing_string = "}\n"; + $closing_string = '\end{flushleft}'."\n"; } else { $currentstring.='\par '; if (&is_inside_of($tagstack, 'table')) { @@ -1354,7 +1388,7 @@ sub start_br { if ($signal != 1) { $currentstring .= '\strut \\\\ \strut '; } - + } return $currentstring; } @@ -1376,7 +1410,7 @@ sub start_big { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '{\large '; - } + } return $currentstring; } @@ -1419,7 +1453,7 @@ sub start_basefont { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval); if (defined $basesize) { @@ -1433,7 +1467,7 @@ sub end_basefont { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval); if (defined $basesize) { @@ -1449,7 +1483,7 @@ sub start_font { my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval); - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval); if (defined $fontsize) { @@ -1463,7 +1497,7 @@ sub end_font { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval); if (defined $fontsize) { @@ -1472,7 +1506,7 @@ sub end_font { } return $currentstring; } - + #-- tag (end tag required) sub start_strike { my ($target,$token) = @_; @@ -1481,7 +1515,7 @@ sub start_strike { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { &Apache::lonxml::startredirection(); - } + } return $currentstring; } @@ -1492,8 +1526,8 @@ sub end_strike { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $currentstring=&Apache::lonxml::endredirection(); - $currentstring=~s/(\S)(\s+)(\S)/$1\}$2\\underline\{$3/g; - $currentstring=~s/^\s*(\S)/\\underline\{$1/; + $currentstring=~s/(\S)(\s+)(\S)/$1\}$2\\underline\{$3/g; + $currentstring=~s/^\s*(\S)/\\underline\{$1/; $currentstring=~s/(\S)\s*$/$1\}/; } return $currentstring; @@ -1507,7 +1541,7 @@ sub start_s { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { &Apache::lonxml::startredirection(); - } + } return $currentstring; } @@ -1533,7 +1567,7 @@ sub start_sub { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{'; - } + } return $currentstring; } @@ -1556,7 +1590,7 @@ sub start_sup { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\raisebox{\smallskipamount}{\scriptsize{'; - } + } return $currentstring; } @@ -1580,7 +1614,7 @@ sub start_hr { } elsif ($target eq 'tex') { #

can't be inside of thank you LaTeX. - # + # my $restart_sub = 0; my $restart_sup = 0; @@ -1590,7 +1624,7 @@ sub start_hr { if (&is_inside_of($tagstack, "sub")) { $restart_sub = 1; - $currentstring .= &end_sub($target, $token, $tagstack, + $currentstring .= &end_sub($target, $token, $tagstack, $parstack, $parser, $safeeval); } if (&is_inside_of($tagstack, "sup")) { @@ -1629,7 +1663,7 @@ sub start_hr { $currentstring .= &start_sup($target, $token, $tagstack, $parstack, $parser, $safeeval); } - } + } return $currentstring; } @@ -1656,12 +1690,12 @@ sub start_div { my $currentstring = &end_p(); # Close enclosing para. if ($target eq 'web' || $target eq 'webgrade') { $currentstring .= $token->[4]; - } + } if ($target eq 'tex') { # 4 possible alignments: left, right, center, and -missing-. # If inside a table row, we must let the table logic # do the alignment, however. - # + # my $endstring = ''; @@ -1672,7 +1706,7 @@ sub start_div { $endstring = '\end{center}'; if (&is_inside_of($tagstack, "table")) { $currentstring = ¢er_correction().$currentstring; - $endstring .= ¢er_end_correction(); + $endstring .= ¢er_end_correction(); } } elsif ($align eq 'right') { @@ -1731,8 +1765,8 @@ sub start_a { } elsif ($env{'request.course.id'}) { my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/docs/)}) { - my $cleanhref = &Apache::londefdef::clean_docs_httpref($linkurl,$url,$cdom,$cnum); + if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/(docs|supplemental)/)}) { + my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum); if ($cleanhref) { &Apache::lonxml::extlink($cleanhref); } @@ -1782,11 +1816,11 @@ sub start_li { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0); - #FIXME need to support types i and I + #FIXME need to support types i and I if ($type=~/disc/) { $currentstring .= ' \item[$\bullet$] '; } elsif ($type=~/circle/) { @@ -1803,7 +1837,7 @@ sub start_li { $currentstring .= ' \item['.$value.'] '; } else { $currentstring .= ' \item '; - } + } $Apache::londefdef::list_index++; } return $currentstring; @@ -1813,8 +1847,8 @@ sub end_li { my ($target,$token) = @_; my $currentstring = &end_p(); # In case there's a

in the

  • if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[2]; - } + $currentstring .= $token->[2]; + } return $currentstring; } @@ -1826,7 +1860,7 @@ sub start_u { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { &Apache::lonxml::startredirection(); - } + } return $currentstring; } @@ -1849,28 +1883,28 @@ sub start_ul { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = &end_p(); # Close off enclosing list. if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); $Apache::londefdef::list_index=0; if ($TeXtype eq 'disc') { $currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'. - '\renewcommand{\labelitemii}{$\bullet$}'. + '\renewcommand{\labelitemii}{$\bullet$}'. '\renewcommand{\labelitemiii}{$\bullet$}'. '\renewcommand{\labelitemiv}{$\bullet$}'; } elsif ($TeXtype eq 'circle') { $currentstring .= '\renewcommand{\labelitemi}{$\circ$}'. - '\renewcommand{\labelitemii}{$\circ$}'. + '\renewcommand{\labelitemii}{$\circ$}'. '\renewcommand{\labelitemiii}{$\circ$}'. '\renewcommand{\labelitemiv}{$\circ$}'; } elsif ($TeXtype eq 'square') { $currentstring .= '\renewcommand{\labelitemi}{$\diamond$}'. - '\renewcommand{\labelitemii}{$\diamond$}'. + '\renewcommand{\labelitemii}{$\diamond$}'. '\renewcommand{\labelitemiii}{$\diamond$}'. '\renewcommand{\labelitemiv}{$\diamond$}'; } - $currentstring .= '\strut \begin{itemize}'; - } + $currentstring .= '\strut \begin{itemize}'; + } return $currentstring; } @@ -1878,13 +1912,13 @@ sub end_ul { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { $currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'. - '\renewcommand{\labelitemii}{$\bullet$}'. + '\renewcommand{\labelitemii}{$\bullet$}'. '\renewcommand{\labelitemiii}{$\bullet$}'. - '\renewcommand{\labelitemiv}{$\bullet$}\strut '; - } + '\renewcommand{\labelitemiv}{$\bullet$}\strut '; + } return $currentstring; } @@ -1893,10 +1927,10 @@ sub start_menu { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{itemize} "; - } + $currentstring = " \\begin{itemize} "; + } return $currentstring; } @@ -1904,10 +1938,10 @@ sub end_menu { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{itemize}"; - } + $currentstring = " \\end{itemize}"; + } return $currentstring; } @@ -1916,10 +1950,10 @@ sub start_dir { my ($target,$token) = @_; my $currentstring = &end_p(); # In case there's a

    prior to the list. if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= " \\begin{itemize} "; - } + $currentstring .= " \\begin{itemize} "; + } return $currentstring; } @@ -1927,10 +1961,10 @@ sub end_dir { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{itemize}"; - } + $currentstring = " \\end{itemize}"; + } return $currentstring; } @@ -1939,18 +1973,18 @@ sub start_ol { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = &end_p(); # In case there's a

    prior to the list. if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $Apache::londefdef::list_index=0; my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); if ($type eq '1') { $currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'. - '\renewcommand{\labelenumii}{\arabic{enumii}.}'. + '\renewcommand{\labelenumii}{\arabic{enumii}.}'. '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'. '\renewcommand{\labelenumiv}{\arabic{enumiv}.}'; } elsif ($type eq 'A') { $currentstring .= '\renewcommand{\labelenumi}{\Alph{enumi}.}'. - '\renewcommand{\labelenumii}{\Alph{enumii}.}'. + '\renewcommand{\labelenumii}{\Alph{enumii}.}'. '\renewcommand{\labelenumiii}{\Alph{enumiii}.}'. '\renewcommand{\labelenumiv}{\Alph{enumiv}.}'; } elsif ($type eq 'a') { @@ -1969,8 +2003,8 @@ sub start_ol { '\renewcommand{\labelenumiii}{\Roman{enumiii}.}'. '\renewcommand{\labelenumiv}{\Roman{enumiv}.}'; } - $currentstring .= '\strut \begin{enumerate}'; - } + $currentstring .= '\strut \begin{enumerate}'; + } return $currentstring; } @@ -1978,13 +2012,13 @@ sub end_ol { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { $currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'. '\renewcommand{\labelenumii}{\arabic{enumii}.}'. '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'. - '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut '; - } + '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut '; + } return $currentstring; } @@ -1993,7 +2027,7 @@ sub start_dl { my ($target,$token) = @_; my $currentstring = &end_p(); # In case there's a

    unclosed prior to the list. if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\begin{description}'; $Apache::londefdef::DL++; @@ -2001,7 +2035,7 @@ sub start_dl { $Apache::londefdef::DD[$Apache::londefdef::DL]=0; $Apache::londefdef::DT[$Apache::londefdef::DL]=0; $Apache::londefdef::seenDT[$Apache::londefdef::DL]=0; - } + } return $currentstring; } @@ -2009,7 +2043,7 @@ sub end_dl { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } if ($Apache::londefdef::DD[-1]) { &end_dd(@_); } @@ -2017,12 +2051,12 @@ sub end_dl { $currentstring.=' '.$element.' '; } pop(@Apache::londefdef::description); - $currentstring.='\end{description}'; + $currentstring.='\end{description}'; delete($Apache::londefdef::DD[$Apache::londefdef::DL]); delete($Apache::londefdef::DT[$Apache::londefdef::DL]); delete($Apache::londefdef::seenDT[$Apache::londefdef::DL]); $Apache::londefdef::DL--; - } + } return $currentstring; } @@ -2031,14 +2065,14 @@ sub start_dt { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring=''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } if ($Apache::londefdef::DD[-1]) { &end_dd(@_); } &Apache::lonxml::startredirection(); $Apache::londefdef::DT[-1]++; $Apache::londefdef::seenDT[-1]=1; - } + } return $currentstring; } @@ -2046,21 +2080,21 @@ sub end_dt { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { if ($Apache::londefdef::DT[-1]) { my $data=&item_cleanup(); push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm'); $Apache::londefdef::DT[-1]--; } - } + } return $currentstring; } sub item_cleanup { my $item=&Apache::lonxml::endredirection(); - $item=~s/\\begin{center}//g; - $item=~s/\\end{center}//g; + $item=~s/\\begin\{center}//g; + $item=~s/\\end\{center}//g; return $item; } @@ -2069,7 +2103,7 @@ sub start_dd { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } if ($Apache::londefdef::DD[-1]) { &end_dd(@_);} @@ -2080,7 +2114,7 @@ sub start_dd { $Apache::londefdef::description[-1]->[-1].=' \strut '; $Apache::londefdef::DD[-1]++; &Apache::lonxml::startredirection(); - } + } return $currentstring; } @@ -2088,7 +2122,7 @@ sub end_dd { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { $Apache::londefdef::description[-1]->[-1].= &Apache::lonxml::endredirection().' \vskip 0mm '; @@ -2100,7 +2134,7 @@ sub end_dd { #-- tag (end tag required) #
    also ends any prior

    that is not closed. # but, unless I allow

    's to nest, that's the -# only way I could think of to allow

    in +# only way I could think of to allow

    in #

    tag: if ($Apache::londefdef::TD_redirection) { - &end_td_tex($parstack,$parser,$safeeval); + &end_td_tex($parstack,$parser,$safeeval); } $Apache::londefdef::table[-1]->end_row(); @@ -2261,7 +2295,7 @@ sub end_tr { if (0) { if ($Apache::londefdef::TD_redirection) { - &end_td_tex($parstack,$parser,$safeeval); + &end_td_tex($parstack,$parser,$safeeval); } # Counter columns must be the maximum number of columns seen # in the table so far so: @@ -2280,17 +2314,17 @@ sub start_td { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { $Apache::londefdef::TD_redirection = 1; &tag_check('tr','td',$tagstack,$parstack,$parser,$safeeval); - } + } return $currentstring; -} - +} + sub tag_check { my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_; - my @ar=@$parstack; + my @ar=@$parstack; for (my $i=$#ar-1;$i>=0;$i--) { if (lc($$tagstack[$i]) eq $good_tag) { &start_td_tex($parstack,$parser,$safeeval); @@ -2312,7 +2346,7 @@ sub tag_check { sub cell_config_hash { my ($align, $rowspan, $colspan, $width) = @_; if ($rowspan ne '') { - $rowspan =~ s/^\s+|\s+$//g; + $rowspan =~ s/^\s+|\s+$//g; } if ($colspan ne '') { $colspan =~ s/^\s+|\s+$//g; @@ -2332,7 +2366,7 @@ sub cell_config_hash { } return \%config; } - + sub start_td_tex { my ($parstack,$parser,$safeeval) = @_; @@ -2349,7 +2383,7 @@ sub start_td_tex { my $table = $Apache::londefdef::table[-1]; $table->add_cell('', $config); - + #------------------------------------------------ # Old table code. @@ -2387,7 +2421,7 @@ sub end_td_tex { if (0) { my ($parstack,$parser,$safeeval) = @_; my $current_row = $Apache::londefdef::table[-1]{'row_number'}; - my $current_column = $Apache::londefdef::table[-1]{'counter_columns'}; + my $current_column = $Apache::londefdef::table[-1]{'counter_columns'}; my $data = &Apache::lonxml::endredirection(); # The rowspan array of the table indicates which cells are part of a span. @@ -2397,14 +2431,14 @@ sub end_td_tex { # If this and subsequent cells are part of a rowspan, we must # push along the row until we find one that is not. - while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column]) + while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column]) && ($Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] =~ /[\^\_]/)) { # Part of a span. push @ {$Apache::londefdef::table[-1]{'content'}[-1]}, ''; $current_column++; } $Apache::londefdef::table[-1]{'counter_columns'} = $current_column; - + # Get the column and row spans. # Colspan can be done via \multicolumn if I can figure out the data structs. @@ -2480,9 +2514,9 @@ sub end_td_tex { push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; } - $data=~s/\\\\\s*$//; - } else { - $data=~s/^\s+(\S.*)/$1/; + $data=~s/\\\\\s*$//; + } else { + $data=~s/^\s+(\S.*)/$1/; $data=~s/(.*\S)\s+$/$1/; $data=~s/(\s)+/$1/; my ($current_length,$min_length)=(0,0); @@ -2513,13 +2547,13 @@ sub end_td_tex { push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length; push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length; } - } + } } # Substitute all of the tables nested in this cell in their appropriate places. my $nested_count = $#{$Apache::londefdef::table[-1]{'include'}}; # This one is constant... - for (my $in=0; $in<=$nested_count; $in++) { + for (my $in=0; $in<=$nested_count; $in++) { my $nested = shift @{$Apache::londefdef::table[-1]{'include'}}; $nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/; # $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; @@ -2558,7 +2592,7 @@ sub end_td { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { $Apache::londefdef::TD_redirection =0; &end_td_tex($parstack,$parser,$safeeval); @@ -2571,17 +2605,17 @@ sub start_th { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { $Apache::londefdef::TD_redirection = 1; &tagg_check('tr','th',$tagstack,$parstack,$parser,$safeeval); - } + } return $currentstring; -} - +} + sub tagg_check { my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_; - my @ar=@$parstack; + my @ar=@$parstack; for (my $i=$#ar-1;$i>=0;$i--) { if (lc($$tagstack[$i]) eq $good_tag) { &start_th_tex($parstack,$parser,$safeeval); @@ -2595,7 +2629,7 @@ sub tagg_check { } return ''; } - + sub start_th_tex { my ($parstack,$parser,$safeeval) = @_; @@ -2674,8 +2708,8 @@ sub end_th_tex { push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; - } else { - $data=~s/^\s+(\S.*)/$1/; + } else { + $data=~s/^\s+(\S.*)/$1/; $data=~s/(.*\S)\s+$/$1/; $data=~s/(\s)+/$1/; my ($current_length,$min_length)=(0,0); @@ -2704,9 +2738,9 @@ sub end_th_tex { push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length; push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length; - } + } } - for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) { + for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) { $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; } #make data bold @@ -2720,47 +2754,51 @@ sub end_th { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = &end_p(); # Close any open

    in the row. if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[2]; + $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $Apache::londefdef::TD_redirection =0; &end_th_tex($parstack,$parser,$safeeval); } return $currentstring; } - + #-- tag (end tag forbidden) # # Render the tag. -# has the following attributes (in addition to the +# has the following attributes (in addition to the # standard HTML ones: # TeXwrap - Governs how the tex target will try to wrap text around # horizontally aligned images. # TeXwidth - The width of the image when rendered for print (mm). # TeXheight - The height of the image when rendered for print (mm) # (Note there seems to also be support for this as a % of page size) -# +# sub start_img { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval, undef,1); - if (! $src && + if (! $src && ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex') - ) { + ) { my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style); return ''; } - &Apache::lonxml::extlink($src); + unless ($src =~ m{^data\:image/gif;base64,}) { + &Apache::lonxml::extlink($src); + } my $currentstring = ''; my $scaling = .3; # Render unto browsers that which are the browser's... if ($target eq 'web' || $target eq 'webgrade') { - my $enc = ('yes' eq + my $enc = ('yes' eq lc(&Apache::lonxml::get_param('encrypturl',$parstack, $safeeval))); - $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, - $enc); + unless ($src =~ m{^data\:image/gif;base64,}) { + $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, + $enc); + } # and render unto TeX that which is LaTeX } elsif ($target eq 'tex') { @@ -2770,7 +2808,7 @@ sub start_img { # simulate the alignments offered by html. # # - my $align = lc(&Apache::lonxml::get_param('align', + my $align = lc(&Apache::lonxml::get_param('align', $parstack, $safeeval, undef,1)); @@ -2780,7 +2818,7 @@ sub start_img { # &Apache::lonxml::debug("Alignemnt = $align"); # LaTeX's image/text wrapping is really bad since it wants to - # make figures float. + # make figures float. # The user has the optional parameter (applicable only to l/r # alignment to use the picins/parpic directive to get wrapped text # this is also imperfect.. that's why we give them a choice... @@ -2803,7 +2841,7 @@ sub start_img { # &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); - #if original bmp/gif/jpg/png file exist do following: + #if original bmp/gif/jpg/png/svg file exist do following: my $origsrc=$src; my ($path,$file) = &get_eps_image($src); # &Apache::lonnet::logthis("Image source: $src result: $path $file"); @@ -2817,25 +2855,25 @@ sub start_img { if ($width_param) { $size.='width='.$width_param.' mm,'; } if ($height_param) { $size.='height='.$height_param.' mm]'; } # Default size if not able to extract that (e.g. eps image). - + # &Apache::lonnet::logthis("Size = $size"); - + $size='['.$size; - $size=~s/,$/]/; + $size=~s/,$/]/; $currentstring .= '\graphicspath{{'.$path.'}}' .'\includegraphics'.$size.'{'.$file.'} '; my $closure; - ($currentstring, $closure) = &align_latex_image($align, - $latex_rendering, - $currentstring, - $width_param, + ($currentstring, $closure) = &align_latex_image($align, + $latex_rendering, + $currentstring, + $width_param, $height_param); $currentstring .= $closure; } else { &Apache::lonxml::debug("$src does not exist"); #original image file doesn't exist so check the alt attribute - my $alt = + my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1); unless ($alt) { $alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src); @@ -2850,8 +2888,8 @@ sub start_img { my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); $currentstring .=&Apache::edit::tag_start($target,$token); $currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). - &Apache::edit::browse('src',undef,'alt',$only).' '. - &Apache::edit::search('src',undef,'alt').'
    '; + &Apache::edit::browse_or_search('src',undef,'alt',$only,undef,1). + '
    '; $currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'
    '; $currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5); $currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'
    '; @@ -2863,7 +2901,7 @@ sub start_img { ['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2); my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval); my $enc= &Apache::lonxml::get_param('encrypturl',$parstack,$safeeval); - + $currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl', ['no','yes'], $token, 2); if (($alt=~/\S/) && (lc($enc) eq 'yes')) { @@ -2873,17 +2911,19 @@ sub start_img { my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval); my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); - + my $element = &Apache::edit::get_element('src'); + my $text; if ($token->[2]{'src'}=~/\$/) { - $currentstring.=&mt('Variable image source'); + $text = &mt('Variable image source'); } elsif ($token->[2]{'src'}=~/\S/) { $currentstring .= ''.$alt.''; } else { - $currentstring.=&mt("No image source specified"); + $text = &mt("No image source specified"); } + $currentstring .= ' '.$text.''; } elsif ($target eq 'modified') { my ($osrc,$owidth,$oheight)= ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); @@ -2904,7 +2944,7 @@ sub start_img { } if ($osrc ne $nsrc || (!$nwidth && !$nheight)) { # changed image or no size specified, - # if they didn't explicitly change the + # if they didn't explicitly change the # width or height use the ones from the image if ($iwidth && $iheight) { if ($owidth == $nwidth || (!$nwidth && !$nheight)) { @@ -2943,7 +2983,7 @@ sub end_img { #-- tag (end tag required) sub start_applet { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - + my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,undef,1); &Apache::lonxml::extlink($code); my $archive=&Apache::lonxml::get_param('archive',$parstack,$safeeval, @@ -2964,7 +3004,7 @@ sub start_applet { if (&is_inside_of($tagstack, "sub")) { $restart_sub = 1; - $currentstring .= &end_sub($target, $token, $tagstack, + $currentstring .= &end_sub($target, $token, $tagstack, $parstack, $parser, $safeeval); } if (&is_inside_of($tagstack, "sup")) { @@ -2996,7 +3036,7 @@ sub start_applet { $currentstring .= &start_sup($target, $token, $tagstack, $parstack, $parser, $safeeval); } - } + } return $currentstring; } @@ -3006,20 +3046,20 @@ sub end_applet { if ($target eq 'web' || $target eq 'webgrade') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - } + } return $currentstring; } #-- tag (end tag optional/required) -sub start_embed { +sub start_embed { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); &Apache::lonxml::extlink($src); my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); + $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); } elsif ($target eq 'tex') { - } + } return $currentstring; } @@ -3084,7 +3124,7 @@ sub start_param { } $currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert); } elsif ($target eq 'tex') { - } + } return $currentstring; } @@ -3092,9 +3132,9 @@ sub end_param { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - } + } return $currentstring; } @@ -3129,8 +3169,8 @@ sub end_allow { sub start_frameset { my ($target,$token) = @_; my $currentstring = ''; # Close any pending para. - if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = + if ($target eq 'web' || $target eq 'webgrade') { + $currentstring = &Apache::loncommon::start_page($Apache::londefdef::title, $Apache::londefdef::head, {'add_entries' => $token->[2], @@ -3159,7 +3199,7 @@ sub start_xmp { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\begin{verbatim}'; - } + } return $currentstring; } @@ -3183,7 +3223,7 @@ sub start_pre { } elsif ($target eq 'tex') { $currentstring .= '\begin{verbatim}'; &Apache::lonxml::disable_LaTeX_substitutions(); - } + } return $currentstring; } @@ -3264,8 +3304,8 @@ sub start_abbr { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3273,8 +3313,8 @@ sub end_abbr { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3283,8 +3323,8 @@ sub start_acronym { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3292,8 +3332,8 @@ sub end_acronym { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3302,8 +3342,8 @@ sub start_area { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3311,8 +3351,8 @@ sub end_area { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3321,7 +3361,7 @@ sub start_base { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } return $currentstring; } @@ -3330,8 +3370,8 @@ sub end_base { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3340,8 +3380,8 @@ sub start_bdo { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3349,8 +3389,8 @@ sub end_bdo { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3359,8 +3399,8 @@ sub start_bgsound { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3368,8 +3408,8 @@ sub end_bgsound { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3378,8 +3418,8 @@ sub start_blink { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3387,8 +3427,8 @@ sub end_blink { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3397,8 +3437,8 @@ sub start_blockquote { my ($target,$token) = @_; my $currentstring = &end_p(); # Close any unclosed

    if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[4]; - } + $currentstring .= $token->[4]; + } if ($target eq 'tex') { $currentstring .= '\begin{quote}'; } @@ -3409,8 +3449,8 @@ sub end_blockquote { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } if ($target eq 'tex') { $currentstring = '\end{quote}'; } @@ -3422,8 +3462,8 @@ sub start_button { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3431,8 +3471,8 @@ sub end_button { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3441,8 +3481,8 @@ sub start_caption { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3450,8 +3490,8 @@ sub end_caption { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3460,8 +3500,8 @@ sub start_col { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3469,8 +3509,8 @@ sub end_col { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3479,8 +3519,8 @@ sub start_colgroup { my ($target,$token,$tagstack, $parstack, $parser, $safeeval, $style) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } if ($target eq 'tex') { # TODO: Ensure this tag is in a table: @@ -3509,8 +3549,8 @@ sub end_colgroup { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3520,11 +3560,11 @@ sub start_del { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { &disable_para(); - $currentstring .= '\st{'; - } + $currentstring .= '\st{'; + } return $currentstring; } @@ -3532,11 +3572,11 @@ sub end_del { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { &enable_para(); $currentstring = '}'; - } + } return $currentstring; } @@ -3545,8 +3585,8 @@ sub start_fieldset { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3554,8 +3594,8 @@ sub end_fieldset { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3564,8 +3604,8 @@ sub start_frame { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3573,8 +3613,8 @@ sub end_frame { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3608,31 +3648,35 @@ sub start_iframe { $query.='&inhibitmenu=yes'; } else { $query = 'inhibitmenu=yes'; - } + } $currentstring .= 'src="'.$url.'?'.$query.'" '; } else { $currentstring .= lc($attrib).'="'.$token->[2]->{$attrib}.'" '; } } $currentstring =~ s/\s+$//; - $currentstring .= '>'; + if ($token->[4] =~ m{/>$}) { + $currentstring .= ' />'; + } else { + $currentstring .= '>'; + } } else { $currentstring = $token->[4]; } - if (($url !~ m{^https?://}) && ($env{'request.course.id'})) { - my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'}); - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - if ($url =~ m{^([^/]|/uploaded/)}) { - my $cleanhref = &Apache::londefdef::clean_docs_httpref($url,$docuri,$cdom,$cnum); - if ($cleanhref) { - &Apache::lonxml::extlink($cleanhref); - } - } elsif (($url =~ m{/res/$LONCAPA::domain_re/}) && ($docuri =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E})) { - if (!&Apache::lonnet::allowed('bre',$url)) { - if (&Apache::lonnet::is_on_map($url)) { - &Apache::lonxml::extlink($url); - } + } + if (($url !~ m{^https?://}) && ($env{'request.course.id'})) { + my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'}); + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + if ($url =~ m{^([^/]|/uploaded/)}) { + my $cleanhref = &clean_docs_httpref($url,$docuri,$cdom,$cnum); + if ($cleanhref) { + &Apache::lonxml::extlink($cleanhref); + } + } elsif (($url =~ m{/res/$LONCAPA::domain_re/}) && ($docuri =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E})) { + if (!&Apache::lonnet::allowed('bre',$url)) { + if (&Apache::lonnet::is_on_map($url)) { + &Apache::lonxml::extlink($url); } } } @@ -3648,8 +3692,8 @@ sub end_iframe { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3658,8 +3702,8 @@ sub start_ins { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3667,8 +3711,8 @@ sub end_ins { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3677,8 +3721,8 @@ sub start_isindex { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3686,8 +3730,8 @@ sub end_isindex { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3696,8 +3740,8 @@ sub start_keygen { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3705,8 +3749,8 @@ sub end_keygen { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3715,8 +3759,8 @@ sub start_label { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3724,8 +3768,8 @@ sub end_label { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3734,8 +3778,8 @@ sub start_layer { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3743,8 +3787,8 @@ sub end_layer { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3753,8 +3797,8 @@ sub start_legend { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3762,8 +3806,8 @@ sub end_legend { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3775,8 +3819,8 @@ sub start_link { my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval, undef,1); &Apache::lonxml::extlink($href); - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3784,8 +3828,8 @@ sub end_link { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3794,8 +3838,8 @@ sub start_marquee { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3803,8 +3847,8 @@ sub end_marquee { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3813,8 +3857,8 @@ sub start_multicol { my ($target,$token) = @_; my $currentstring = &end_p(); # Close any pending

    if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[4]; - } + $currentstring .= $token->[4]; + } return $currentstring; } @@ -3822,8 +3866,8 @@ sub end_multicol { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3832,7 +3876,7 @@ sub start_nobr { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { $currentstring='\mbox{'; } @@ -3843,7 +3887,7 @@ sub end_nobr { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { $currentstring='}'; } @@ -3855,8 +3899,8 @@ sub start_noembed { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3864,8 +3908,8 @@ sub end_noembed { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3874,8 +3918,8 @@ sub start_noframes { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3883,8 +3927,8 @@ sub end_noframes { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3893,8 +3937,8 @@ sub start_nolayer { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3902,8 +3946,8 @@ sub end_nolayer { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3912,8 +3956,8 @@ sub start_noscript { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3921,8 +3965,8 @@ sub end_noscript { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3931,8 +3975,8 @@ sub start_object { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3940,8 +3984,8 @@ sub end_object { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3950,8 +3994,8 @@ sub start_optgroup { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3959,8 +4003,8 @@ sub end_optgroup { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3969,7 +4013,7 @@ sub start_samp { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { $currentstring='\texttt{'; } @@ -3980,7 +4024,7 @@ sub end_samp { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { $currentstring='}'; } @@ -3992,8 +4036,8 @@ sub start_server { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -4001,8 +4045,8 @@ sub end_server { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -4011,8 +4055,8 @@ sub start_spacer { my ($target,$token) = @_; my $currentstring = &end_p(); # Close off any open

    tag. if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[4]; - } + $currentstring .= $token->[4]; + } return $currentstring; } @@ -4020,18 +4064,38 @@ sub end_spacer { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } +my @span_end_stack; # for span tex target + #-- tag (end tag required) sub start_span { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } elsif ($target eq 'tex') { + my $endstring = ''; + my $family = &get_css_property('font-family',$parstack,$safeeval); + if ($family eq 'monospace') { + $currentstring .= '\texttt{'; + $endstring .= '}'; + } + my $weight = &get_css_property('font-weight',$parstack,$safeeval); + if ($weight eq 'bold') { + $currentstring .= '\textbf{'; + $endstring .= '}'; + } + my $style = &get_css_property('font-style',$parstack,$safeeval); + if ($style eq 'italic') { + $currentstring .= '\textit{'; + $endstring .= '}'; + } + push(@span_end_stack, $endstring); + } return $currentstring; } @@ -4039,8 +4103,11 @@ sub end_span { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } elsif ($target eq 'tex') { + my $endstring = pop @span_end_stack; + $currentstring .= $endstring; + } return $currentstring; } @@ -4049,8 +4116,8 @@ sub start_tbody { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } if ($target eq 'tex') { # TODO: Ensure this tag is within a table: @@ -4064,8 +4131,8 @@ sub end_tbody { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } if($target eq 'tex') { # TODO: Ensure this tag is within a table: @@ -4080,8 +4147,8 @@ sub start_tfoot { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } if ($target eq 'tex') { # TODO: ensure this is within a table tag. my $table = $Apache::londefdef::table[-1]; @@ -4094,10 +4161,10 @@ sub end_tfoot { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } if ($target eq 'tex') { - # TODO: Ensure this is in side a table + # TODO: Ensure this is in side a table my $table = $Apache::londefdef::table[-1]; $table->end_foot(); } @@ -4109,8 +4176,8 @@ sub start_thead { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } if ($target eq 'tex') { # Assume we're in a table... TODO: Verify that and ignore tag if not. my $table = $Apache::londefdef::table[-1]; @@ -4123,8 +4190,8 @@ sub end_thead { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } if ($target eq 'tex') { # TODO: Verify we are in a table and ignore tag if not. @@ -4139,9 +4206,9 @@ sub start_var { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = '\textit{'; + $currentstring = '\textit{'; } return $currentstring; } @@ -4152,8 +4219,8 @@ sub end_var { if ($target eq 'web' || $target eq 'webgrade') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = '}'; - } + $currentstring = '}'; + } return $currentstring; } @@ -4162,8 +4229,8 @@ sub start_wbr { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -4171,8 +4238,8 @@ sub end_wbr { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -4180,8 +4247,8 @@ sub end_wbr { sub start_hideweboutput { my ($target,$token) = @_; if ($target eq 'web' || $target eq 'webgrade') { - &Apache::lonxml::startredirection(); - } + &Apache::lonxml::startredirection(); + } return ''; } @@ -4189,8 +4256,8 @@ sub end_hideweboutput { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = &Apache::lonxml::endredirection(); - } + $currentstring = &Apache::lonxml::endredirection(); + } return ''; } @@ -4198,7 +4265,7 @@ sub end_hideweboutput { sub image_replication { my $src = shift; if (not -e $src) { &Apache::lonnet::repcopy($src); } - #replicates eps or ps + #replicates eps or ps my $epssrc = my $pssrc = $src; $epssrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i; $pssrc =~ s/\.(gif|jpg|jpeg|png)$/.ps/i; @@ -4221,9 +4288,9 @@ sub resize_image { $width_param = $width_param * $scaling; #do we have any specified LaTeX size of the picture? - my $toget='TeXwidth'; - if ($cis) { - $toget=lc($toget); + my $toget='TeXwidth'; + if ($cis) { + $toget=lc($toget); } my $TeXwidth = &Apache::lonxml::get_param($toget,$parstack, $safeeval,$depth,$cis); @@ -4233,11 +4300,11 @@ sub resize_image { #do we have any specified web size of the picture? my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, $depth,1); - if ($TeXwidth) { + if ($TeXwidth) { my $old_width_param=$width_param; if ($TeXwidth=~/(\d+)\s*\%/) { $width_param = $1*$env{'form.textwidth'}/100; - } else { + } else { $width_param = $TeXwidth; } if ($TeXheight) { @@ -4271,7 +4338,7 @@ sub resize_image { sub image_size { my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_; - #size of image from gif/jpg/jpeg/png + #size of image from gif/jpg/jpeg/png my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); if (-e $ressrc) { $src = $ressrc; @@ -4284,7 +4351,7 @@ sub image_size { undef($image); ($height_param, $width_param) = &resize_image($height_param, $width_param, - $scaling, $parstack, $safeeval, + $scaling, $parstack, $safeeval, $depth, $cis); return ($height_param, $width_param); @@ -4313,8 +4380,8 @@ sub get_eps_image { &Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal. } &Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); - my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg)/i); - $src=~s/\.(bmp|gif|png|jpg|jpeg)$/\.eps/i; + my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg|svg)/i); + $src=~s/\.(bmp|gif|png|jpg|jpeg|svg)$/\.eps/i; $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); &Apache::lonxml::debug("Filelocation gives: $src"); if (! -e $src) { @@ -4370,9 +4437,9 @@ sub get_eps_image { } sub eps_generation { - my ($src,$file,$width_param) = @_; + my ($src,$file,$width_param) = @_; my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat"; - if (open(my $tmpfile,">>$filename")) { + if (open(my $tmpfile,">>$filename")) { print $tmpfile "$src\n"; close($tmpfile); } @@ -4393,13 +4460,13 @@ sub eps_generation { } } -sub file_path { +sub file_path { my $src=shift; - my ($file,$path); + my ($file,$path); if ($src =~ m!(.*)/([^/]*)$!) { - $file = $2; - $path = $1.'/'; - } + $file = $2; + $path = $1.'/'; + } return $file,$path; } @@ -4425,23 +4492,23 @@ sub recalc { sub LATEX_length { my $garbage=shift; $garbage=~s/^\s+$//; - $garbage=~s/^\s+(\S.*)/$1/;#space before - $garbage=~s/(.*\S)\s+$/$1/;#space after + $garbage=~s/^\s+(\S.*)/$1/;#space before + $garbage=~s/(.*\S)\s+$/$1/;#space after $garbage=~s/(\s)+/$1/;#only one space - $garbage=~s/(\\begin{([^\}]+)}|\\end{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...} - $garbage=~s/(\$\_\{|\$\_|\$\^{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$ + $garbage=~s/(\\begin\{([^\}]+)}|\\end\{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...} + $garbage=~s/(\$\_\{|\$\_|\$\^\{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$ $garbage=~s/([^\\])\$/$1/g;#$ - $garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...} + $garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^\{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...} $garbage=~s/(\\alpha|\\beta|\\gamma|\\delta|\\epsilon|\\verepsilon|\\zeta|\\eta|\\theta|\\vartheta|\\iota|\\kappa|\\lambda|\\mu|\\nu|\\xi|\\pi|\\varpi|\\rho|\\varrho|\\sigma|\\varsigma|\\tau|\\upsilon|\\phi|\\varphi|\\chi|\\psi|\\omega|\\Gamma|\\Delta|\\Theta|\\Lambda|\\Xi|\\Pi|\\Sigma|\\Upsilon|\\Phi|\\Psi|\\Omega)/1/g; $garbage=~s/(\\pm|\\mp|\\times|\\div|\\cdot|\\ast|\\star|\\dagger|\\ddagger|\\amalg|\\cap|\\cup|\\uplus|\\sqcap|\\sqcup|\\vee|\\wedge|\\oplus|\\ominus|\\otimes|\\circ|\\bullet|\\diamond|\\lhd|\\rhd|\\unlhd|\\unrhd|\\oslash|\\odot|\\bigcirc|\\Box|\\Diamond|\\bigtriangleup|\\bigtriangledown|\\triangleleft|\\triangleright|\\setminus|\\wr)/1/g; $garbage=~s/(\\le|\\ll|\\leq|\\ge|\\geq|\\gg|\\neq|\\doreq|\\sim|\\simeq|\\subset|\\subseteq|\\sqsubset|\\sqsubseteq|\\in|\\vdash|\\models|\\supset|\\supseteq|\\sqsupset|\\sqsupseteq|\\ni|\\dash|\\perp|\\approx|\\cong|\\equiv|\\propto|\\prec|\\preceq|\\parallel|\\asymp|\\smile|\\frown|\\bowtie|\\succ|\\succeq|\\mid)/1/g; $garbage=~s/(\\not<|\\\\not\\le|\\not\\prec|\\not\\preceq|\\not\\subset|\\not\\subseteq|\\not\\sqsubseteq|\\not\\in|\\not>|\\not\\ge|\\not\\succ|\\notsucceq|\\not\\supset|\\notsupseteq|\\not\\sqsupseteq|\\notin|\\not=|\\not\\equiv|\\not\\sim|\\not\\simeq|\\not\\approx|\\not\\cong|\\not\\asymp)/1/g; $garbage=~s/(\\leftarrow|\\gets|\\Leftarrow|\\rightarrow|\\to|\\Rightarrow|\\leftrightarrow|\\Leftrightarrow|\\mapsto|\\hookleftarrow|\\leftharpoonup|\\leftkarpoondown|\\rightleftharpoons|\\longleftarrow|\\Longleftarrow|\\longrightarrow|\\Longrightarrow|\\longleftrightarrow|\\Longleftrightarrow|\\longmapsto|\\hookrightarrow|\\rightharpoonup|\\rightharpoondown|\\uparrow|\\Uparrow|\\downarrow|\\Downarrow|\\updownarrow|\\Updownarrow|\\nearrow|\\searrow|\\swarrow|\\nwarrow)/11/g; $garbage=~s/(\\aleph|\\hbar|\\imath|\\jmath|\\ell|\\wp|\\Re|\\Im|\\mho|\\prime|\\emptyset|\\nabla|\\surd|\\partial|\\top|\\bot|\\vdash|\\dashv|\\forall|\\exists|\\neg|\\flat|\\natural|\\sharp|\\\||\\angle|\\backslash|\\Box|\\Diamond|\\triangle|\\clubsuit|\\diamondsuit|\\heartsuit|\\spadesuit|\\Join|\\infty)/11/g; - $garbage=~s/(\\hat{([^}]+)}|\\check{([^}]+)}|\\dot{([^}]+)}|\\breve{([^}]+)}|\\acute{([^}]+)}|\\ddot{([^}]+)}|\\grave{([^}]+)}|\\tilde{([^}]+)}|\\mathring{([^}]+)}|\\bar{([^}]+)}|\\vec{([^}]+)})/$1/g; + $garbage=~s/(\\hat\{([^}]+)}|\\check\{([^}]+)}|\\dot\{([^}]+)}|\\breve\{([^}]+)}|\\acute\{([^}]+)}|\\ddot\{([^}]+)}|\\grave\{([^}]+)}|\\tilde\{([^}]+)}|\\mathring\{([^}]+)}|\\bar\{([^}]+)}|\\vec\{([^}]+)})/$1/g; #remove some other LaTeX command - $garbage=~s|\\(\w+)\\|\\|g; - $garbage=~s|\\(\w+)(\s*)|$2|g; + $garbage=~s|\\(\w+)\\|\\|g; + $garbage=~s|\\(\w+)(\s*)|$2|g; $garbage=~s|\+|11|g; my $value=length($garbage); return $value; @@ -4461,8 +4528,8 @@ sub align_latex_image { # If there's an alignment specification we need to honor it here. # For the horizontal alignments, we will also honor the # value of the latex specfication. The default is parbox, - # and that's used for illegal values too. - # + # and that's used for illegal values too. + # # Even though we set a default alignment value, the user # could have given us an illegal value. In that case we # just use the default alignment of bottom.. @@ -4474,8 +4541,8 @@ sub align_latex_image { my $offset = $height/2; $currentstring .= '\raisebox{-'.$offset.'mm}{'.$image; $closure = '}'; - } elsif ($align eq "left") { - if ($latex_rendering eq "parpic") { + } elsif ($align eq "left") { + if ($latex_rendering eq "parpic") { $currentstring .= '\parpic[l]{'.$image; $closure = '}'; } elsif ($latex_rendering eq "parbox") { @@ -4484,12 +4551,12 @@ sub align_latex_image { $closure = '\end{minipage}'; } elsif ($latex_rendering eq "wrapfigure" || $latex_rendering ne 'none') { # wrapfig render - $currentstring .= + $currentstring .= '\begin{wrapfigure}{l}{'.$width.'mm}' .'\scalebox{1.0}{'.$image; $closure = '}\end{wrapfigure}'; } - } elsif ($align eq "right") { + } elsif ($align eq "right") { if ($latex_rendering eq "parpic") { $currentstring .= '\parpic[r]{'.$image; $closure = '}'; @@ -4499,7 +4566,7 @@ sub align_latex_image { $closure = '\end{minipage}'; } elsif ($latex_rendering eq "wrapfigure" || $latex_rendering ne 'none') { # wrapfig render - $currentstring .= + $currentstring .= '\begin{wrapfigure}{r}{'.$width.'mm}' .'\scalebox{1.0}{'.$image; $closure = '}\end{wrapfigure}'; @@ -4532,58 +4599,52 @@ sub latex_header { my ($mode) = @_; my $currentstring = ''; - $currentstring .= + $currentstring .= "\n% &Apache::lonxml::londefdef \n" . '\documentclass[letterpaper,twoside]{article}\raggedbottom'; if (($env{'form.latex_type'}=~'batchmode') || - (!$env{'request.role.adv'}) || - ($mode eq 'batchmode')) {$currentstring .='\batchmode';} + (!$env{'request.role.adv'}) || + ($mode eq 'batchmode')) {$currentstring .='\batchmode';} $currentstring .= '\newcommand{\keephidden}[1]{}'. '\renewcommand{\deg}{$^{\circ}$}'. - '\usepackage{multirow}'. - '\usepackage{longtable}'. - '\usepackage{textcomp}'. - '\usepackage{makeidx}'. - '\usepackage[dvips]{graphicx}'. - '\usepackage{wrapfig}'. - '\usepackage{picins}'. + '\usepackage{multirow}'."\n". + '\usepackage{longtable}'."\n". + '\usepackage{textcomp}'."\n". + '\usepackage{makeidx}'."\n". + '\usepackage[dvips]{graphicx}'."\n". + '\usepackage{wrapfig}'."\n". + '\usepackage{picins}'."\n". '\usepackage[T1]{fontenc}'."\n". '\usepackage{lmodern}'."\n". '\usepackage[postscript]{ucs}'."\n". '\usepackage[utf8x]{inputenc}'."\n". - '\usepackage{pifont}' ."\n". + '\usepackage{pifont}'."\n". '\usepackage{latexsym}'."\n". - '\usepackage{epsfig}'. - "\\usepackage{xtab}\n". - "\\usepackage{tabularx}\n". - "\\usepackage{booktabs}\n". - "\\usepackage{array}\n". - "\\usepackage{colortbl}\n". - "\\usepackage{xcolor}\n". - '\usepackage{calc}'. - '\usepackage{amsmath}'. - '\usepackage{soul}'. - '\usepackage{amssymb}'. - '\usepackage{amsfonts}'. - '\usepackage{amsthm}'. - '\usepackage{amscd}' - .'\usepackage{picins}\usepackage{calc}'."\n". # From lonprintout.pm - '\usepackage[T1]{fontenc}'."\n". - '\usepackage{lmodern}'."\n". - '\usepackage[postscript]{ucs}'."\n". - '\usepackage[utf8x]{inputenc}'."\n". - '\usepackage{pifont}' . "\n"; - + '\usepackage{epsfig}'."\n". + '\usepackage{xtab}'."\n". + '\usepackage{tabularx}'."\n". + '\usepackage{booktabs}'."\n". + '\usepackage{array}'."\n". + '\usepackage{colortbl}'."\n". + '\usepackage{xcolor}'."\n". + '\usepackage{calc}'."\n". + '\usepackage{amsmath}'."\n". + '\usepackage{soul}'."\n". + '\usepackage{amssymb}'."\n". + '\usepackage{amsfonts}'."\n". + '\usepackage{amsthm}'."\n". + '\usepackage{amscd}'."\n". + '\usepackage{actuarialangle}'."\n"; if($env{'form.pdfFormFields'} eq 'yes') { $currentstring .= '\usepackage{hyperref}'. '\usepackage{eforms}'. '\usepackage{tabularx}'; - } - + } + $currentstring .= '\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}}'. '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}'; $currentstring .= '\begin{document}'; - + return $currentstring; } @@ -4591,7 +4652,7 @@ sub latex_header { sub clean_docs_httpref { my ($href,$docuri,$cdom,$cnum) = @_; if ($docuri eq '') { - &Apache::lonnet::hreflocation('',$env{'request.filename'}); + $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'}); } if ($cdom eq '') { $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; @@ -4600,7 +4661,7 @@ sub clean_docs_httpref { $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; } my $cleanhref; - if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/docs/\E)(.+/)[^/]+$}) { + if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/)(.+/)[^/]+$}) { my $prefix = $1; my $relpath = $2; my ($hrefpath,$fname); @@ -4612,8 +4673,17 @@ sub clean_docs_httpref { return $cleanhref; } } else { - (my $path,$fname) = ($href =~ m{^(.+)/([^/]*)$}); - $hrefpath = $relpath.$path; + if ($href =~ m{/}) { + (my $path,$fname) = ($href =~ m{^(.*)/([^/]*)$}); + $hrefpath = $relpath.$path; + if ($path eq '') { + $hrefpath =~ s{/$}{}; + } + } else { + $fname = $href; + $hrefpath = $relpath; + $hrefpath =~ s{/$}{}; + } } if ($fname ne '') { my $cleanrelpath; @@ -4625,17 +4695,33 @@ sub clean_docs_httpref { $cleanrelpath .= $dir.'/'; } } - $cleanrelpath =~ s{/$}{}; if ($cleanrelpath ne '') { - $cleanhref = $prefix.'/'.$cleanrelpath.'/'.$fname; + $cleanhref = $prefix.$cleanrelpath.$fname; } else { - $cleanhref = $prefix.'/'.$fname; + $cleanhref = $prefix.$fname; } } } return $cleanhref; } +# This is retrieving a CSS property from the style attribute of the current element. +# It is not checking

    bodies # #list of supported attributes: border,width,TeXwidth,TeXtheme @@ -2110,7 +2144,7 @@ sub start_table { my $textwidth = ''; my $currentstring = &end_p(); if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { &disable_para(); # Can't have paras in a table. @@ -2178,12 +2212,12 @@ sub start_table { } return $currentstring; } - + sub end_table { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { @@ -2203,7 +2237,7 @@ sub start_tr { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } elsif ($target eq 'tex') { my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1); @@ -2237,21 +2271,21 @@ sub start_tr { push @ {$Apache::londefdef::table[-1]{'maxlen'}}, []; push @ {$Apache::londefdef::table[-1]{'content'}}, []; } - } + } return $currentstring; } - + sub end_tr { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = &end_p(); # Close any pending

    in the row. if ($target eq 'web' || $target eq 'webgrade') { - $currentstring .= $token->[2]; + $currentstring .= $token->[2]; } elsif ($target eq 'tex') { # In case the user is missing a or