--- loncom/xml/lonxml.pm	2016/08/09 23:43:39	1.556
+++ loncom/xml/lonxml.pm	2023/11/27 23:24:05	1.564
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.556 2016/08/09 23:43:39 raeburn Exp $
+# $Id: lonxml.pm,v 1.564 2023/11/27 23:24:05 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 );
@@ -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; }
@@ -1659,6 +1664,44 @@ ENDFOOTER
       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 {
   my $viewgrades=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
   if ( $env{'request.state'} eq 'published') {
@@ -1852,8 +1895,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 {
@@ -1914,9 +1966,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(
@@ -2272,7 +2333,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;