--- loncom/xml/londefdef.pm	2016/08/10 00:29:06	1.456.2.1
+++ loncom/xml/londefdef.pm	2024/09/04 18:31:28	1.456.2.6.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.456.2.1 2016/08/10 00:29:06 raeburn Exp $
+# $Id: londefdef.pm,v 1.456.2.6.2.5 2024/09/04 18:31:28 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -50,7 +50,7 @@ use Apache::lonlocal;
 use Apache::loncommon();
 use Apache::Constants qw(:common);
 use File::Basename;
-use LONCAPA();
+use LONCAPA;
 # use Data::Dumper;
 
 BEGIN {
@@ -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]);
@@ -347,7 +367,7 @@ sub start_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='<title>';
@@ -592,6 +612,9 @@ sub start_body {
             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,
@@ -626,9 +649,10 @@ sub start_body {
 
 sub edit_controls {
     my ($nochgview) = @_;
-    my $result .= '
+    my ($is_course_doc,$is_supp,$supp_path,$supp_title); 
+    my $result = '
 <form method="post" action="">
-<div class="LC_edit_problem_header">';
+<div class="LC_edit_problem_header">'."\n";
     unless ($nochgview) {
         $result .= '
 <div class="LC_edit_problem_header_row1">'.
@@ -637,7 +661,21 @@ sub edit_controls {
 </div>';
     }
     $result .= '
-<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />';
+<div>
+<input type="hidden" name="editmode" value="" />
+<input type="button" name="editordefault" accesskey="e" value="'.&mt('Edit').
+'" onclick="seteditmode(this.form,'."'edit'".');" />'."\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($uri);
+            if ($editors{'daxe'}) {
+                my $daxeurl = '/daxepage'.$uri;
+                $result .= '<input type="button" name="editordaxe" value="'.&mt('Edit with Daxe').
+                           '" onclick="seteditmode(this.form,'."'daxe'".');" />'."\n";
+            }
+        }
+    }
     if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
         my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
         if ($url =~ /\.html?$/i) {
@@ -645,11 +683,19 @@ sub edit_controls {
             if ($env{'request.course.id'}) {
                 $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
                 $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                if ($url =~ m{^\Q/uploaded/$cdom/$cnum/\E(supplemental|docs)/}) {
+                    if ($1 eq 'supplemental') {
+                        $is_supp = 1;
+                    }
+                    $is_course_doc = 1;
+                }
                 if ($env{'request.filename'} =~ m{/userfiles/supplemental/default|\d+/}) {
-                    if (&Apache::lonnet::is_course_upload($env{'request.filename'},
-                                                          $cnum,$cdom)) {
+                    my $fn=&Apache::lonnet::declutter($env{'request.filename'});
+                    if (&Apache::lonnet::is_course_upload($fn,$cnum,$cdom)) {
                         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                                                 ['folderpath','title']);
+                        $supp_path = &escape(&HTML::Entities::decode($Apache::lonnet::env{'form.folderpath'}));
+                        $supp_title = &escape(&HTML::Entities::decode($Apache::lonnet::env{'form.title'}));
                     }
                 }
             }
@@ -677,7 +723,9 @@ sub edit_controls {
 </div>
 </form>
 ';
-    return $result;
+    my $setedit_js = &Apache::lonxml::seteditor_javascript($is_course_doc,$is_supp,
+                                                           $supp_path,$supp_title);
+    return $setedit_js."\n".$result;
 }
 
 sub end_body {
@@ -812,7 +860,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') {
@@ -3247,12 +3295,12 @@ sub end_externallink {
     return $currentstring;
 }
 
-#-- <blankspace heigth="">
+#-- <blankspace height="">
 sub start_blankspace {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = &end_p();	# closes off any unclosed <p>
     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;
@@ -4258,10 +4306,10 @@ sub resize_image {
 	    $height_param=$TeXwidth/$old_width_param*$height_param;
 	}
     } elsif ($TeXheight) {
-	$height_param = $TeXheight;
 	if ($height_param) {
 	    $width_param  = $TeXheight/$height_param*$width_param;
 	}
+	$height_param = $TeXheight;
     } elsif ($width) {
 	my $old_width_param=$width_param;
 	$width_param = $width*$scaling;
@@ -4552,40 +4600,34 @@ sub latex_header {
 	($mode eq 'batchmode')) {$currentstring .='\batchmode';} 
     $currentstring .= '\newcommand{\keephidden}[1]{}'.
 	'\renewcommand{\deg}{$^{\circ}$}'.
-	'\usepackage{multirow}'.
-	'\usepackage{longtable}'.
-	'\usepackage{textcomp}'.
-	'\usepackage{makeidx}'.
-	'\usepackage[dvips]{graphicx}'.
-	'\usepackage{wrapfig}'.
-	'\usepackage{picins}'.
+	'\usepackage{multirow}'."\n".
+	'\usepackage{longtable}'."\n".
+	'\usepackage{textcomp}'."\n".
+	'\usepackage{makeidx}'."\n".
+	'\usepackage[dvips]{graphicx}'."\n".
+	'\usepackage{wrapfig}'."\n".
+	'\usepackage{picins}'."\n".
 	'\usepackage[T1]{fontenc}'."\n".
 	'\usepackage{lmodern}'."\n".
 	'\usepackage[postscript]{ucs}'."\n".
 	'\usepackage[utf8x]{inputenc}'."\n".
-	'\usepackage{pifont}' ."\n".
+	'\usepackage{pifont}'."\n".
 	'\usepackage{latexsym}'."\n".
-	'\usepackage{epsfig}'.
-	"\\usepackage{xtab}\n".
-	"\\usepackage{tabularx}\n".
-	"\\usepackage{booktabs}\n".
-	"\\usepackage{array}\n".
-	"\\usepackage{colortbl}\n".
-	"\\usepackage{xcolor}\n".
-	'\usepackage{calc}'.
-	'\usepackage{amsmath}'.
-	'\usepackage{soul}'.
-	'\usepackage{amssymb}'.
-	'\usepackage{amsfonts}'.
-	'\usepackage{amsthm}'.
-	'\usepackage{amscd}'
-        .'\usepackage{picins}\usepackage{calc}'."\n". # From lonprintout.pm
-	'\usepackage[T1]{fontenc}'."\n".
-	'\usepackage{lmodern}'."\n".
-	'\usepackage[postscript]{ucs}'."\n".
-	'\usepackage[utf8x]{inputenc}'."\n".
-	'\usepackage{pifont}'  . "\n";
-	
+	'\usepackage{epsfig}'."\n".
+	'\usepackage{xtab}'."\n".
+	'\usepackage{tabularx}'."\n".
+	'\usepackage{booktabs}'."\n".
+	'\usepackage{array}'."\n".
+	'\usepackage{colortbl}'."\n".
+	'\usepackage{xcolor}'."\n".
+	'\usepackage{calc}'."\n".
+	'\usepackage{amsmath}'."\n".
+	'\usepackage{soul}'."\n".
+	'\usepackage{amssymb}'."\n".
+	'\usepackage{amsfonts}'."\n".
+	'\usepackage{amsthm}'."\n".
+	'\usepackage{amscd}'."\n".
+	'\usepackage{actuarialangle}'."\n";
     if($env{'form.pdfFormFields'} eq 'yes') {
 	$currentstring .= '\usepackage{hyperref}'.
 	    '\usepackage{eforms}'.