--- loncom/xml/lonxml.pm	2014/06/21 23:36:05	1.548
+++ loncom/xml/lonxml.pm	2023/07/13 19:38:43	1.561
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.548 2014/06/21 23:36:05 raeburn Exp $
+# $Id: lonxml.pm,v 1.561 2023/07/13 19:38:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,6 +69,8 @@ use Safe();
 use Safe::Hole();
 use Math::Cephes();
 use Math::Random();
+use Math::Calculus::Expression();
+use Number::FormatEng();
 use Opcode();
 use POSIX qw(strftime);
 use Time::HiRes qw( gettimeofday tv_interval );
@@ -229,11 +231,10 @@ sub xmlend {
 }
 
 sub printalltags {
-  my $temp;
-  foreach $temp (sort keys %Apache::lonxml::alltags) {
-    &Apache::lonxml::debug("$temp -- ".
-		  join(',',@{ $Apache::lonxml::alltags{$temp} }));
-  }
+    foreach my $temp (sort(keys(%Apache::lonxml::alltags))) {
+        &Apache::lonxml::debug("$temp -- ".
+                               join(',',@{ $Apache::lonxml::alltags{$temp} }));
+    }
 }
 
 sub xmlparse {
@@ -346,9 +347,9 @@ sub latex_special_symbols {
     } else {
 	$string=~s/\\/\\ensuremath{\\backslash}/g;
 	$string=~s/\\\%|\%/\\\%/g;
-	$string=~s/\\{|{/\\{/g;
+	$string=~s/\\\{|\{/\\{/g;
 	$string=~s/\\}|}/\\}/g;
-	$string=~s/\\ensuremath\\{\\backslash\\}/\\ensuremath{\\backslash}/g;
+	$string=~s/\\ensuremath\\\{\\backslash\\}/\\ensuremath{\\backslash}/g;
 	$string=~s/\\\$|\$/\\\$/g;
 	$string=~s/\\\_|\_/\\\_/g;
         $string=~s/([^\\]|^)(\~|\^)/$1\\$2\\strut /g;
@@ -369,6 +370,8 @@ sub inner_xmlparse {
   my $result;
   my $token;
   my $dontpop=0;
+  my $lastdontpop;
+  my $lastendtag;
   my $startredirection = $Apache::lonxml::redirection;
   while ( $#$pars > -1 ) {
     while ($token = $$pars['-1']->get_token) {
@@ -464,17 +467,29 @@ sub inner_xmlparse {
       }
       $result = '';
 
-      if ($token->[0] eq 'E' && !$dontpop) {
-	&end_tag($stack,$parstack,$token);
+      if ($token->[0] eq 'E') {
+          if ($dontpop) {
+              $lastdontpop = $token; 
+          } else {
+              $lastendtag = $token->[1];
+              &end_tag($stack,$parstack,$token);
+          }
       }
       $dontpop=0;
-    }	
+    }
     if ($#$pars > -1) {
 	pop @$pars;
 	pop @Apache::lonxml::pwd;
     }
   }
 
+  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);
+       }
+   }
+
   # if ($target eq 'meta') {
   #   $finaloutput.=&endredirection;
   # }
@@ -806,6 +821,9 @@ sub init_safespace {
   $safehole->wrap(\&Apache::functionplotresponse::fpr_objectcoords,$safeeval,'&fpr_objectcoords');
   $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorlength,$safeeval,'&fpr_vectorlength');
   $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorangle,$safeeval,'&fpr_vectorangle');
+  $safehole->wrap(\&Math::Calculus::Expression::math_calculus_expression,$safeeval,'&math_calculus_expression');
+  $safehole->wrap(\&Number::FormatEng::format_eng,$safeeval,'&number_format_eng');
+  $safehole->wrap(\&Number::FormatEng::format_pref,$safeeval,'&number_format_pref');
 
 #  use Data::Dumper;
 #  $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper');
@@ -814,7 +832,10 @@ sub init_safespace {
   $safeeval->permit("require");
   $safeinit .= ';$external::target="'.$target.'";';
   &Apache::run::run($safeinit,$safeeval);
-  &initialize_rndseed($safeeval);
+  my $rawrndseed = &initialize_rndseed($safeeval);
+  if ($target eq 'grade') {
+      $Apache::lonhomework::rawrndseed = $rawrndseed;
+  }
 }
 
 sub clean_safespace {
@@ -853,6 +874,7 @@ sub initialize_rndseed {
     my $safeinit = '$external::randomseed="'.$rndseed.'";';
     &Apache::lonxml::debug("Setting rndseed to $rndseed");
     &Apache::run::run($safeinit,$safeeval);
+    return $rndseed;
 }
 
 sub default_homework_load {
@@ -974,7 +996,7 @@ sub decreasedepth {
 sub get_id {
     my ($parstack,$safeeval)=@_;
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
-    if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\d\s[:punct:]])/) {
+    if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\s\-])/) {
 	&error(&mt('ID [_1] contains invalid characters. IDs are only allowed to contain letters, numbers, spaces and -','"<tt>'.$id.'</tt>"'));
     }
     if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
@@ -1327,7 +1349,7 @@ sub extlink {
     if (!$exact) {
 	$res=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$res);
     }
-    push(@Apache::lonxml::extlinks,$res)	 
+    push(@Apache::lonxml::extlinks,$res);
 }
 
 sub writeallows {
@@ -1457,13 +1479,15 @@ SIMPLECONTENT
 
 sub verify_html {
     my ($filecontents)=@_;
-    my ($is_html,$is_xml);
+    my ($is_html,$is_xml,$is_physnet);
     if ($filecontents =~/(?:\<|\&lt\;)\?xml[^\<]*\?(?:\>|\&gt\;)/is) {
         $is_xml = 1;
     } elsif ($filecontents =~/(?:\<|\&lt\;)html(?:\s+[^\<]+|\s*)(?:\>|\&gt\;)/is) {
         $is_html = 1;
+    } elsif ($filecontents =~/(?:\<|\&lt\;)physnet[^\<]*(?:\>|\&gt\;)/is) {
+        $is_physnet = 1;
     }
-    unless ($is_xml || $is_html) {
+    unless ($is_xml || $is_html || $is_physnet) {
         return &mt('File does not have [_1] or [_2] starting tag','&lt;html&gt;','&lt;?xml ?&gt;');
     }
     if ($is_html) {
@@ -1509,7 +1533,6 @@ sub renderingoptions {
                (''        => '',
                 'tth'     => 'tth (TeX to HTML)',
                 'MathJax' => 'MathJax',
-  		'jsMath'  => 'jsMath',
                 'mimetex' => 'mimetex (Convert to Images)')}).
      '</span>';
     return $output;
@@ -1622,11 +1645,11 @@ $initialize
         $xml_help
       </td></tr>
     </table>
-    <div class="LC_edit_problem_discards">
+    <div>
       <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
       $undo $htmlerror $deps_button $dragmath_button
     </div>
-    <div class="LC_edit_problem_saves">
+    <div style="float:right">
       <input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
       <input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
     </div>
@@ -1751,6 +1774,7 @@ sub handler {
             }
 	}
     }
+    my $inhibit_menu;
     my %mystyle;
     my $result = '';
     my $filecontents=&Apache::lonnet::getfile($file);
@@ -1808,8 +1832,15 @@ ENDNOTFOUND
 	    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 						    ['rawmode']);
 	    if ($env{'form.rawmode'}) { $result = $filecontents; }
+            if (($env{'request.state'} eq 'construct') &&
+                (($filetype eq 'css') || ($filetype eq 'js')) && ($ENV{'HTTP_REFERER'})) {
+                if ($ENV{'HTTP_REFERER'} =~ m{^https?\://[^\/]+/priv/$LONCAPA::match_domain/$LONCAPA::match_username/[^\?]+\.(x?html?|swf)(|\?)[^\?]*$}) {
+                    $inhibit_menu = 1;
+                }
+            }
             if (($filetype ne 'html') && 
-                (!$env{'form.return_only_error_and_warning_counts'})) {
+                (!$env{'form.return_only_error_and_warning_counts'}) &&
+                (!$inhibit_menu)) {
                 my $nochgview = 1;
                 my $controls = '';
                     if ($env{'request.state'} eq 'construct') {
@@ -1826,8 +1857,17 @@ ENDNOTFOUND
                 }
                 my $brcrum;
                 if ($env{'request.state'} eq 'construct') {
-                    $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                                'text' => 'Authoring Space'},
+                    my $text = 'Authoring Space';
+                    my $href = &Apache::loncommon::authorspace($request->uri);
+                    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';
+                        }
+                    }
+                    $brcrum = [{'href' => $href,
+                                'text' => $text,
                                {'href' => '',
                                 'text' => $breadcrumbtext}];
                 } else {
@@ -1847,7 +1887,7 @@ ENDNOTFOUND
 #
 # Edit action? Insert editing commands
 #
-    unless ($env{'request.state'} eq 'published') {
+    unless (($env{'request.state'} eq 'published') || ($inhibit_menu)) {
 	if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
 	{
             my ($displayfile,$url,$symb,$itemtitle,$action);
@@ -1888,9 +1928,18 @@ ENDNOTFOUND
                     'onload'       => $add_to_onload,   });
             my $header;
             if ($env{'request.state'} eq 'construct') {
+                my $text = 'Authoring Space';
+                my $href = &Apache::loncommon::authorspace($request->uri);
+                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';
+                    }
+                }
                 $options{'bread_crumbs'} = [{
-                            'href' => &Apache::loncommon::authorspace($request->uri),
-                            'text' => 'Authoring Space'},
+                            'href' => $href,
+                            'text' => $text},
                            {'href' => '',
                             'text' => $breadcrumbtext}];
                 $header = &Apache::loncommon::head_subbox(
@@ -2046,7 +2095,7 @@ sub error {
 	    my $declutter=&Apache::lonnet::declutter($env{'request.filename'});
             my $baseurl = &Apache::lonnet::clutter($declutter);
 	    my @userlist;
-	    foreach (keys %users) {
+	    foreach (keys(%users)) {
 		my ($user,$domain) = split(/:/, $_);
 		push(@userlist,"$user:$domain");
 		my $key=$declutter.'_'.$user.'_'.$domain;
@@ -2246,7 +2295,7 @@ sub register_insert {
 
 sub dump_insertlist {
     my ($ext) = @_;
-    open(XML,">/tmp/insertlist.xml.$ext");
+    open(XML,">","/tmp/insertlist.xml.$ext");
     print XML ("<insertlist>");
     my $i=0;