--- loncom/xml/lonxml.pm 2023/11/28 02:39:01 1.566 +++ loncom/xml/lonxml.pm 2024/04/17 15:15:13 1.572 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# XML Parser Module +# XML Parser Module # -# $Id: lonxml.pm,v 1.566 2023/11/28 02:39:01 raeburn Exp $ +# $Id: lonxml.pm,v 1.572 2024/04/17 15:15:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,13 +25,13 @@ # # 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. @@ -57,7 +57,7 @@ described at http://www.lon-capa.org. -package Apache::lonxml; +package Apache::lonxml; use vars qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount); use strict; @@ -117,7 +117,7 @@ use Apache::lonhtmlcommon(); use Apache::functionplotresponse(); use Apache::lonnavmaps(); -#==================================== Main subroutine: xmlparse +#==================================== Main subroutine: xmlparse #debugging control, to turn on debugging modify the correct handler @@ -208,7 +208,7 @@ sub xmlend { if ($Apache::lonhomework::parsing_a_problem || $Apache::lonhomework::parsing_a_task ) { $mode='problem'; - $status=$Apache::inputtags::status[-1]; + $status=$Apache::inputtags::status[-1]; } my $discussion; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, @@ -317,7 +317,7 @@ sub xmlparse { } &init_state(); if ($env{'form.return_only_error_and_warning_counts'}) { - if ($env{'request.filename'}=~/\.(html|htm|xml)$/i) { + if ($env{'request.filename'}=~/\.(html|htm|xml)$/i) { my $error=&verify_html($content_file_string); if ($error) { $errorcount++; } } @@ -343,7 +343,7 @@ sub latex_special_symbols { $string=~s/([^\\])\&/$1\\\&/g; $string=~s/([^\\])\#/$1\\\#/g; $string =~ s/_/\\_/g; # _ -> \_ - $string =~ s/\^/\\\^{}/g; # ^ -> \^{} + $string =~ s/\^/\\\^{}/g; # ^ -> \^{} } else { $string=~s/\\/\\ensuremath{\\backslash}/g; $string=~s/\\\%|\%/\\\%/g; @@ -469,7 +469,7 @@ sub inner_xmlparse { if ($token->[0] eq 'E') { if ($dontpop) { - $lastdontpop = $token; + $lastdontpop = $token; } else { $lastendtag = $token->[1]; &end_tag($stack,$parstack,$token); @@ -483,7 +483,7 @@ sub inner_xmlparse { } } - if (($#$stack == 0) && ($stack->[0] eq 'physnet') && ($target eq 'web') && + if (($#$stack == 0) && ($stack->[0] eq 'physnet') && ($target eq 'web') && ($lastendtag eq 'LONCAPA_INTERNAL_TURN_STYLE_ON')) { if ((ref($lastdontpop) eq 'ARRAY') && ($lastdontpop->[1] eq 'physnet')) { &end_tag($stack,$parstack,$lastdontpop); @@ -506,11 +506,11 @@ sub inner_xmlparse { if ($target eq 'modified') { # if modfied, handle startpart and endpart $finaloutput=~s/\]*\>(.*)\]*\>/$1<\/part>/gs; - } + } return $finaloutput; } -## +## ## Looks to see if there is a subroutine defined for this tag. If so, call it, ## otherwise do not call it as we do not know what it is. ## @@ -597,7 +597,7 @@ sub callsub { sub init_state { undef(%state); } - + sub set_state { my ($key,$value) = @_; $state{$key} = $value; @@ -699,7 +699,7 @@ sub init_safespace { $safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check'); $safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval, '&r_cas_formula_fix'); - + $safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval, '&capa_formula_fix'); @@ -725,7 +725,7 @@ sub init_safespace { $safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1'); $safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn'); $safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv'); - + $safehole->wrap(\&Math::Cephes::bdtr ,$safeeval,'&bdtr' ); $safehole->wrap(\&Math::Cephes::bdtrc ,$safeeval,'&bdtrc' ); $safehole->wrap(\&Math::Cephes::bdtri ,$safeeval,'&bdtri' ); @@ -1072,7 +1072,7 @@ sub increment_counter { } $Apache::lonxml::counter += $increment; - # If the caller supplied the response_id parameter, + # If the caller supplied the response_id parameter, # Maintain its counter.. creating if necessary. if (defined($part_response)) { @@ -1193,7 +1193,7 @@ sub set_bubble_lines { =item get_bubble_line_hash -Returns the current bubble line hash. This is assumed to +Returns the current bubble line hash. This is assumed to be small so we return a copy @@ -1219,8 +1219,8 @@ sub get_all_text { my $depth=0; my $token; my $result=''; - if ( $tag =~ m:^/: ) { - my $tag=substr($tag,1); + if ( $tag =~ m:^/: ) { + my $tag=substr($tag,1); #&Apache::lonxml::debug("have:$tag:"); my $top_empty=0; while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) { @@ -1321,7 +1321,7 @@ sub newparser { push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]); } else { push (@Apache::lonxml::pwd, $dir); - } + } } sub parstring { @@ -1338,7 +1338,7 @@ sub parstring { push(@values,"\"$val\""); } } - my $var_init = + my $var_init = (@vars) ? 'my ('.join(',',@vars).') = ('.join(',',@values).');' : ''; return $var_init; @@ -1591,7 +1591,7 @@ FULLPAGE } } elsif ($symb || $folderpath) { $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n"; - $initialize .= + $initialize .= &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle, undef,$folderpath,$uri)."\n"; } @@ -1613,8 +1613,9 @@ FULLPAGE my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit', 'vi' => 'Save and View', 'dv' => 'Discard Edits and View', - 'un' => 'undo', - 'ed' => 'Edit'); + 'un' => 'Undo', + 'ed' => 'Edit', + 'ew' => 'Edit with Daxe'); my $spelllink = &Apache::lonhtmlcommon::spelllink('xmledit','filecont'); my $textarea_events = &Apache::edit::element_change_detection(); my $form_events = &Apache::edit::form_change_detection(); @@ -1622,7 +1623,7 @@ FULLPAGE if ($filetype eq 'html') { $htmlerror=&verify_html($filecontents); if ($htmlerror) { - $htmlerror=''.$htmlerror.''; + $htmlerror=(' 'x3).' '.$htmlerror.''; } if (&Apache::lonhtmlcommon::htmlareabrowser()) { unless ($textareaclass) { @@ -1630,8 +1631,8 @@ FULLPAGE } } } - my ($undo,%onclick); - foreach my $item ('discard','undo') { + my ($undo,$daxebutton,%onclick); + foreach my $item ('discard','undo','daxe') { $onclick{$item} = 'onclick="still_ask=true;setmode(this.form,'."'$item'".')"'; } foreach my $item ('saveedit','saveview') { @@ -1642,6 +1643,13 @@ FULLPAGE $onclick{'undo'}.' />'."\n"; } $initialize .= &setmode_javascript(); + if ($filetype eq 'html') { + my %editors = &Apache::loncommon::permitted_editors(); + if ($editors{'daxe'}) { + $daxebutton = ''."\n"; + } + } my $editfooter=(< @@ -1660,7 +1668,7 @@ $initialize
- $undo $htmlerror $deps_button $dragmath_button + $undo $deps_button $daxebutton $dragmath_button $htmlerror

$spelllink @@ -1694,15 +1702,67 @@ ENDSCRIPT } sub seteditor_javascript { + my ($is_course_doc,$is_supp,$supp_path,$supp_title) = @_; + my $symb; + if ($is_course_doc) { + if (!$is_supp) { + ($symb) = &Apache::lonnet::whichuser(); + if ($symb) { + $symb = &escape($symb); + } + } + } return <<"ENDSCRIPT";