--- loncom/xml/londefdef.pm 2013/01/04 05:30:52 1.442 +++ loncom/xml/londefdef.pm 2023/11/28 04:48:14 1.474 @@ -1,8 +1,8 @@ # The LearningOnline Network with CAPA -# Tags Default Definition Module +# Tags Default Definition Module +# +# $Id: londefdef.pm,v 1.474 2023/11/28 04:48:14 raeburn Exp $ # -# $Id: londefdef.pm,v 1.442 2013/01/04 05:30:52 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; @@ -571,40 +591,60 @@ sub start_body { &Apache::lonhtmlcommon::clear_breadcrumbs(); if ($env{'request.state'} eq 'construct') { my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); + my $text = 'Authoring Space'; + my $href = &Apache::loncommon::authorspace($url); + if ($env{'request.course.id'}) { + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + if ($href eq "/priv/$cdom/$cnum/") { + $text = 'Course Authoring Space'; + } + } &Apache::lonhtmlcommon::add_breadcrumb({ - 'text' => 'Construction Space', - 'href' => &Apache::loncommon::authorspace($url), + 'text' => $text, + 'href' => $href, }); &Apache::lonhtmlcommon::add_breadcrumb({ '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'}; + } + if ($env{'form.only_body'}) { + $args->{'only_body'} = 1; + } + } + $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') { $header=&Apache::lonmenu::constspaceform(); } if ($env{'request.state'} ne 'published') { - $header.=&edit_controls(); + unless ($env{'form.inhibitmenu'} eq 'yes') { + $header.=&edit_controls(); + } } if ($env{'request.state'} eq 'construct') { - $currentstring.=&Apache::loncommon::head_subbox( - &Apache::loncommon::CSTR_pageheader() - .$header); + unless ($env{'form.inhibitmenu'} eq 'yes') { + $currentstring.=&Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader() + .$header); + } } elsif ($env{'request.state'} eq 'edit') { $currentstring.=&Apache::loncommon::head_subbox($header); } @@ -618,9 +658,9 @@ sub start_body { sub edit_controls { my ($nochgview) = @_; - my $result .= ' + my $result = &Apache::lonxml::seteditor_javascript().'
-
'; +
'."\n"; unless ($nochgview) { $result .= '
'. @@ -629,29 +669,53 @@ sub edit_controls {
'; } $result .= ' -
'; +
+ +'."\n"; + if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) { + my $uri = $env{'request.uri'}; + if ($uri =~ /\.(xml|html|htm|xhtml|xhtm)$/) { + my %editors = &Apache::loncommon::permitted_editors(); + if ($editors{'daxe'}) { + my $daxeurl = '/daxepage'.$uri; + $result .= ''."\n"; + } + } + } if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); if ($url =~ /\.html?$/i) { + my ($cdom,$cnum); if ($env{'request.course.id'}) { + $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; if ($env{'request.filename'} =~ m{/userfiles/supplemental/default|\d+/}) { if (&Apache::lonnet::is_course_upload($env{'request.filename'}, - $env{'course.'.$env{'request.course.id'}.'.num'}, - $env{'course.'.$env{'request.course.id'}.'.domain'})) { + $cnum,$cdom)) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['folderpath','title']); } } } - my ($symb,$itemtitle,$displayfile) = - &Apache::lonxml::get_courseupload_hierarchy($url, - $env{'form.folderpath'}, - $env{'form.title'}); - if (($symb ne '') || ($env{'httpref.'.$url} ne '')) { + my ($symb,$itemtitle,$displayfile,$caller); + if ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}) { + $itemtitle = &mt('Syllabus'); + $caller = "/public/$cdom/$cnum/syllabus"; + } else { + $caller = $url; + ($symb,$itemtitle,$displayfile) = + &Apache::lonxml::get_courseupload_hierarchy($url, + $env{'form.folderpath'}, + $env{'form.title'}); + } + if (($symb ne '') || ($env{'httpref.'.$url} ne '') || + ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/})) { $result .= (' ' x 3). &Apache::lonhtmlcommon::dependencies_button()."\n". &Apache::lonhtmlcommon::dependencycheck_js($symb, - $itemtitle,$url,$env{'form.folderpath'},$url)."\n"; + $itemtitle,$url,$env{'form.folderpath'},$caller)."\n"; } } } @@ -668,16 +732,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) @@ -685,12 +749,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; } @@ -699,9 +763,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(); } @@ -715,11 +779,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; } @@ -727,11 +791,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; } @@ -741,11 +805,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; } @@ -753,10 +817,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; } @@ -779,7 +843,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); @@ -794,7 +858,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') { @@ -806,7 +870,7 @@ sub end_h1 { } elsif ($target eq 'meta') { &end_output($target); $currentstring=''; - } + } return $currentstring; } @@ -828,8 +892,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; } @@ -849,7 +913,7 @@ sub end_h2 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -871,8 +935,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; } @@ -892,7 +956,7 @@ sub end_h3 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -914,8 +978,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; } @@ -935,7 +999,7 @@ sub end_h4 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -957,8 +1021,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; } @@ -978,7 +1042,7 @@ sub end_h5 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -1000,8 +1064,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; } @@ -1021,7 +1085,7 @@ sub end_h6 { $post='}'.'\vskip 0 mm '; } $currentstring .= '}}'.$post; - } + } return $currentstring; } @@ -1067,7 +1131,7 @@ sub end_i { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $currentstring .= '}'; - } + } return $currentstring; } @@ -1102,7 +1166,7 @@ sub start_dfn { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\textit{'; - } + } return $currentstring; } @@ -1171,7 +1235,7 @@ sub start_code { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\texttt{'; - } + } return $currentstring; } @@ -1182,7 +1246,7 @@ sub end_code { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $currentstring .= '}'; - } + } return $currentstring; } @@ -1205,7 +1269,7 @@ sub end_em { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $currentstring .= '}'; - } + } return $currentstring; } @@ -1228,7 +1292,7 @@ sub end_q { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $currentstring .= '}'; - } + } return $currentstring; } @@ -1244,7 +1308,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: # @@ -1273,6 +1337,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}'; @@ -1280,13 +1348,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')) { @@ -1340,7 +1408,7 @@ sub start_br { if ($signal != 1) { $currentstring .= '\strut \\\\ \strut '; } - + } return $currentstring; } @@ -1362,7 +1430,7 @@ sub start_big { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '{\large '; - } + } return $currentstring; } @@ -1405,7 +1473,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) { @@ -1419,7 +1487,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) { @@ -1435,7 +1503,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) { @@ -1449,7 +1517,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) { @@ -1458,7 +1526,7 @@ sub end_font { } return $currentstring; } - + #-- tag (end tag required) sub start_strike { my ($target,$token) = @_; @@ -1467,7 +1535,7 @@ sub start_strike { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { &Apache::lonxml::startredirection(); - } + } return $currentstring; } @@ -1478,8 +1546,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; @@ -1493,7 +1561,7 @@ sub start_s { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { &Apache::lonxml::startredirection(); - } + } return $currentstring; } @@ -1519,7 +1587,7 @@ sub start_sub { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{'; - } + } return $currentstring; } @@ -1542,7 +1610,7 @@ sub start_sup { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\raisebox{\smallskipamount}{\scriptsize{'; - } + } return $currentstring; } @@ -1566,7 +1634,7 @@ sub start_hr { } elsif ($target eq 'tex') { #

can't be inside of thank you LaTeX. - # + # my $restart_sub = 0; my $restart_sup = 0; @@ -1576,7 +1644,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")) { @@ -1615,7 +1683,7 @@ sub start_hr { $currentstring .= &start_sup($target, $token, $tagstack, $parstack, $parser, $safeeval); } - } + } return $currentstring; } @@ -1642,12 +1710,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 = ''; @@ -1658,7 +1726,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') { @@ -1714,6 +1782,15 @@ sub start_a { if (!&Apache::lonnet::allowed('bre',$linkurl)) { if (&Apache::lonnet::is_on_map($url)) { &Apache::lonxml::extlink($linkurl); + } 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|supplemental)/)}) { + my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum); + if ($cleanhref) { + &Apache::lonxml::extlink($cleanhref); + } + } } } } @@ -1759,11 +1836,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/) { @@ -1780,7 +1857,7 @@ sub start_li { $currentstring .= ' \item['.$value.'] '; } else { $currentstring .= ' \item '; - } + } $Apache::londefdef::list_index++; } return $currentstring; @@ -1790,8 +1867,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; } @@ -1803,7 +1880,7 @@ sub start_u { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { &Apache::lonxml::startredirection(); - } + } return $currentstring; } @@ -1826,28 +1903,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; } @@ -1855,13 +1932,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; } @@ -1870,10 +1947,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; } @@ -1881,10 +1958,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; } @@ -1893,10 +1970,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; } @@ -1904,10 +1981,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; } @@ -1916,18 +1993,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') { @@ -1946,8 +2023,8 @@ sub start_ol { '\renewcommand{\labelenumiii}{\Roman{enumiii}.}'. '\renewcommand{\labelenumiv}{\Roman{enumiv}.}'; } - $currentstring .= '\strut \begin{enumerate}'; - } + $currentstring .= '\strut \begin{enumerate}'; + } return $currentstring; } @@ -1955,13 +2032,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; } @@ -1970,7 +2047,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++; @@ -1978,7 +2055,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; } @@ -1986,7 +2063,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(@_); } @@ -1994,12 +2071,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; } @@ -2008,14 +2085,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; } @@ -2023,21 +2100,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; } @@ -2046,7 +2123,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(@_);} @@ -2057,7 +2134,7 @@ sub start_dd { $Apache::londefdef::description[-1]->[-1].=' \strut '; $Apache::londefdef::DD[-1]++; &Apache::lonxml::startredirection(); - } + } return $currentstring; } @@ -2065,7 +2142,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 '; @@ -2077,7 +2154,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(); @@ -2238,7 +2315,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: @@ -2257,17 +2334,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); @@ -2289,7 +2366,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; @@ -2309,7 +2386,7 @@ sub cell_config_hash { } return \%config; } - + sub start_td_tex { my ($parstack,$parser,$safeeval) = @_; @@ -2326,7 +2403,7 @@ sub start_td_tex { my $table = $Apache::londefdef::table[-1]; $table->add_cell('', $config); - + #------------------------------------------------ # Old table code. @@ -2364,7 +2441,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. @@ -2374,14 +2451,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. @@ -2457,9 +2534,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); @@ -2490,13 +2567,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]/; @@ -2535,7 +2612,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); @@ -2548,17 +2625,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); @@ -2572,7 +2649,7 @@ sub tagg_check { } return ''; } - + sub start_th_tex { my ($parstack,$parser,$safeeval) = @_; @@ -2651,8 +2728,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); @@ -2681,9 +2758,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 @@ -2697,47 +2774,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') { @@ -2747,7 +2828,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)); @@ -2757,7 +2838,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... @@ -2780,7 +2861,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"); @@ -2794,25 +2875,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); @@ -2827,8 +2908,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).'
    '; @@ -2840,7 +2921,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')) { @@ -2850,17 +2931,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'}); @@ -2881,7 +2964,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)) { @@ -2920,7 +3003,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, @@ -2941,7 +3024,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")) { @@ -2973,7 +3056,7 @@ sub start_applet { $currentstring .= &start_sup($target, $token, $tagstack, $parstack, $parser, $safeeval); } - } + } return $currentstring; } @@ -2983,20 +3066,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; } @@ -3061,7 +3144,7 @@ sub start_param { } $currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert); } elsif ($target eq 'tex') { - } + } return $currentstring; } @@ -3069,9 +3152,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; } @@ -3106,8 +3189,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], @@ -3136,7 +3219,7 @@ sub start_xmp { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $currentstring .= '\begin{verbatim}'; - } + } return $currentstring; } @@ -3160,7 +3243,7 @@ sub start_pre { } elsif ($target eq 'tex') { $currentstring .= '\begin{verbatim}'; &Apache::lonxml::disable_LaTeX_substitutions(); - } + } return $currentstring; } @@ -3216,12 +3299,12 @@ sub end_externallink { return $currentstring; } -#-- +#-- sub start_blankspace { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = &end_p(); # closes off any unclosed

    if ($target eq 'tex') { - my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1); + my $howmuch = &Apache::lonxml::get_param('height',$parstack,$safeeval,undef,1); $currentstring .= '\vskip '.$howmuch.' '; } return $currentstring; @@ -3241,8 +3324,8 @@ sub start_abbr { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3250,8 +3333,8 @@ sub end_abbr { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3260,8 +3343,8 @@ sub start_acronym { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3269,8 +3352,8 @@ sub end_acronym { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3279,8 +3362,8 @@ sub start_area { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3288,8 +3371,8 @@ sub end_area { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3298,7 +3381,7 @@ sub start_base { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; + $currentstring = $token->[4]; } return $currentstring; } @@ -3307,8 +3390,8 @@ sub end_base { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3317,8 +3400,8 @@ sub start_bdo { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3326,8 +3409,8 @@ sub end_bdo { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3336,8 +3419,8 @@ sub start_bgsound { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3345,8 +3428,8 @@ sub end_bgsound { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3355,8 +3438,8 @@ sub start_blink { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3364,8 +3447,8 @@ sub end_blink { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3374,8 +3457,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}'; } @@ -3386,8 +3469,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}'; } @@ -3399,8 +3482,8 @@ sub start_button { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3408,8 +3491,8 @@ sub end_button { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3418,8 +3501,8 @@ sub start_caption { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3427,8 +3510,8 @@ sub end_caption { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3437,8 +3520,8 @@ sub start_col { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3446,8 +3529,8 @@ sub end_col { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3456,8 +3539,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: @@ -3486,8 +3569,8 @@ sub end_colgroup { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3497,11 +3580,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; } @@ -3509,11 +3592,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; } @@ -3522,8 +3605,8 @@ sub start_fieldset { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3531,8 +3614,8 @@ sub end_fieldset { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3541,8 +3624,8 @@ sub start_frame { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + $currentstring = $token->[4]; + } return $currentstring; } @@ -3550,8 +3633,8 @@ sub end_frame { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[2]; - } + $currentstring = $token->[2]; + } return $currentstring; } @@ -3560,8 +3643,68 @@ sub start_iframe { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web' || $target eq 'webgrade') { - $currentstring = $token->[4]; - } + my ($src,$url,$query); + if ($token->[2]->{'src'}) { + $src = $token->[2]->{'src'}; + } elsif ($token->[2]->{'SRC'}) { + $src = $token->[2]->{'SRC'}; + } + if ($src) { + ($url,$query) = ($src =~ /^([^?]+)\??([^?]*)$/); + if ($query =~ /inhibitmenu=yes/) { + $currentstring = $token->[4]; + } else { + my $inhibit; + if ($url =~ m{^[^/.].*\.x?html?$}) { + $inhibit = 1; + } elsif ($url =~ m{^/(uploaded|res)/.*\.x?html?$}) { + $inhibit = 1; + } + if ($inhibit) { + $currentstring = '

    bodies # #list of supported attributes: border,width,TeXwidth,TeXtheme @@ -2087,7 +2164,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. @@ -2155,12 +2232,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') { @@ -2180,7 +2257,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); @@ -2214,21 +2291,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