--- loncom/xml/lonxml.pm	2015/04/06 16:27:12	1.553
+++ loncom/xml/lonxml.pm	2023/11/28 02:39:01	1.566
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.553 2015/04/06 16:27:12 raeburn Exp $
+# $Id: lonxml.pm,v 1.566 2023/11/28 02:39:01 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 );
@@ -345,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;
@@ -819,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');
@@ -991,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; }
@@ -1528,7 +1533,6 @@ sub renderingoptions {
                (''        => '',
                 'tth'     => 'tth (TeX to HTML)',
                 'MathJax' => 'MathJax',
-  		'jsMath'  => 'jsMath',
                 'mimetex' => 'mimetex (Convert to Images)')}).
      '</span>';
     return $output;
@@ -1626,14 +1630,23 @@ FULLPAGE
               }
           }
       }
-      my $undo;
+      my ($undo,%onclick);
+      foreach my $item ('discard','undo') {
+          $onclick{$item} = 'onclick="still_ask=true;setmode(this.form,'."'$item'".')"';
+      }
+      foreach my $item ('saveedit','saveview') {
+          $onclick{$item} = 'onclick="is_submit=true;setmode(this.form,'."'$item'".')"';
+      }
       unless ($uri =~ m{^/uploaded/}) {
-          $undo = '<input type="submit" name="Undo" accesskey="u" value="'.$lt{'un'}.'" />'."\n";
+          $undo = '<input type="button" name="Undo" accesskey="u" value="'.$lt{'un'}.'" '.
+                  $onclick{'undo'}.' />'."\n";
       }
+      $initialize .= &setmode_javascript();
       my $editfooter=(<<ENDFOOTER);
 $initialize
 <a name="editsection" />
 <form $form_events method="post" name="xmledit" action="$action">
+  <input type="hidden" name="problemmode" value="edit" />
   <div class="LC_edit_problem_editxml_header">
     <table class="LC_edit_problem_header_title"><tr><td>
         $filename
@@ -1641,13 +1654,13 @@ $initialize
         $xml_help
       </td></tr>
     </table>
-    <div class="LC_edit_problem_discards">
-      <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
-      $undo $htmlerror $deps_button $dragmath_button
+    <div style="float:right">
+      <input type="button" name="savethisfile" accesskey="s" value="$lt{'st'}" $onclick{'saveedit'} />
+      <input type="button" name="viewmode" accesskey="v" value="$lt{'vi'}" $onclick{'saveview'} />
     </div>
-    <div class="LC_edit_problem_saves">
-      <input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
-      <input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
+    <div>
+      <input type="button" name="discardview" accesskey="d" value="$lt{'dv'}" $onclick{'discard'} />
+      $undo $htmlerror $deps_button $dragmath_button
     </div>
   </div>
   <textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont" $textareaclass>$filecontents</textarea><br />$spelllink
@@ -1657,7 +1670,45 @@ $initialize
   </div>
 </form>
 ENDFOOTER
-      return ($editfooter,$add_to_onload,$add_to_onresize);;
+      return ($editfooter,$add_to_onload,$add_to_onresize);
+}
+
+sub setmode_javascript {
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function setmode(form,probmode) {
+    if (probmode == 'daxe') {
+        var url = new URL(document.location.href);
+        window.location = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+    } else {
+        var initial = form.problemmode.value;
+        form.problemmode.value = probmode;
+        form.submit();
+        form.problemmode.value = initial;
+    }
+}
+// ]]>
+</script>
+ENDSCRIPT
+}
+
+sub seteditor_javascript {
+    return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function seteditmode(form,editor) {
+    if (editor == 'daxe') {
+        var url = new URL(document.location.href);
+        window.location = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+    } else {
+        form.editmode.value = editor;
+        form.submit();
+    }
+}
+// ]]>
+</script>
+ENDSCRIPT
 }
 
 sub get_target {
@@ -1762,11 +1813,13 @@ sub handler {
 # Edit action? Save file.
 #
     if (!($env{'request.state'} eq 'published')) {
-	if ($env{'form.savethisfile'} || $env{'form.viewmode'} || $env{'form.Undo'}) {
+        if (($env{'form.problemmode'} eq 'saveedit') ||
+            ($env{'form.problemmode'} eq 'saveview') ||
+            ($env{'form.problemmode'} eq 'undo')) {
 	    my $html_file=&Apache::lonnet::getfile($file);
 	    my $error = &Apache::lonhomework::handle_save_or_undo($request, \$html_file, \$env{'form.filecont'});
-            if ($env{'form.savethisfile'}) {
-                $env{'form.editmode'}='Edit'; #force edit mode
+            if ($env{'form.problemmode'} eq 'saveedit') {
+                $env{'form.editmode'}='edit'; #force edit mode
             }
 	}
     }
@@ -1795,7 +1848,7 @@ ENDNOTFOUND
             } elsif ($filetype ne 'css' && $filetype ne 'txt' && $filetype ne 'tex') {
 		$filecontents=&createnewhtml();
 	    }
-	    $env{'form.editmode'}='Edit'; #force edit mode
+	    $env{'form.editmode'}='edit'; #force edit mode
 	}
     } else {
 	unless ($env{'request.state'} eq 'published') {
@@ -1807,7 +1860,9 @@ ENDNOTFOUND
             &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 						    ['editmode']);
 	}
-	if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) {
+        if ((!$env{'form.editmode'}) ||
+            ($env{'form.problemmode'} eq 'saveview') ||
+            ($env{'form.problemmode'} eq 'discard')) {
             if ($filetype eq 'html' || $filetype eq 'sty') {
 	        &Apache::structuretags::reset_problem_globals();
 	        $result = &Apache::lonxml::xmlparse($request,$target,
@@ -1853,8 +1908,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 {
@@ -1875,8 +1939,9 @@ ENDNOTFOUND
 # Edit action? Insert editing commands
 #
     unless (($env{'request.state'} eq 'published') || ($inhibit_menu)) {
-	if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
-	{
+        if (($env{'form.editmode'}) &&
+            (!($env{'form.problemmode'} eq 'saveview')) &&
+            (!($env{'form.problemmode'} eq 'discard'))) {
             my ($displayfile,$url,$symb,$itemtitle,$action);
 	    $displayfile=$request->uri;
             if ($request->uri =~ m{^/uploaded/}) {
@@ -1915,9 +1980,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(
@@ -2273,7 +2347,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;