--- loncom/xml/londefdef.pm	2024/07/03 22:44:22	1.456.2.7
+++ loncom/xml/londefdef.pm	2016/08/09 23:43:38	1.460
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.456.2.7 2024/07/03 22:44:22 raeburn Exp $
+# $Id: londefdef.pm,v 1.460 2016/08/09 23:43:38 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -98,19 +98,7 @@ sub start_m {
             # 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>'));
-            }
+            &Apache::lonxml::warning(&mt("Missing \$ in <m>."));
         }
 	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
 	if ($eval eq 'on') {
@@ -658,6 +646,12 @@ sub edit_controls {
     }
     $result .= '
 <div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />';
+    if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+        my $uri = $env{'request.uri'};
+        my $daxeurl = '/daxepage'.$uri;
+        $result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '.
+                  'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />';
+    }
     if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
         my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
         if ($url =~ /\.html?$/i) {
@@ -832,7 +826,7 @@ sub end_h1 {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	my $post='\vskip 0 mm ';
-	my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1));
+	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
 	if ($align eq 'center') {
 	    $post='\end{center}';
 	} elsif ($align eq 'left') {
@@ -2878,8 +2872,8 @@ sub start_img {
         my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
 	$currentstring .=&Apache::edit::tag_start($target,$token);
 	$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
-	    &Apache::edit::browse('src',undef,'alt',$only).' '.
-	    &Apache::edit::search('src',undef,'alt').'<br />';
+                         &Apache::edit::browse_or_search('src',undef,'alt',$only,undef,1).
+                         '<br />';
 	$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
 	$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
 	$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />';
@@ -2901,17 +2895,19 @@ sub start_img {
 	my $src=    &Apache::lonxml::get_param('src',$parstack,$safeeval);
 	my $width=  &Apache::lonxml::get_param('width',$parstack,$safeeval);
 	my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
-
+        my $element = &Apache::edit::get_element('src'); 
+        my $text;
         if ($token->[2]{'src'}=~/\$/) {
-           $currentstring.=&mt('Variable image source');
+           $text = &mt('Variable image source');
         } elsif ($token->[2]{'src'}=~/\S/) {
 	   $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
 	   if ($width) { $currentstring.=' width="'.$width.'" '; }
 	   if ($height) { $currentstring.=' height="'.$height.'" '; }
-	   $currentstring .= ' />';
+	   $currentstring .= ' id="previewimg_'.$element.'" />';
         } else {
-           $currentstring.=&mt("No image source specified");
+           $text = &mt("No image source specified");
         }
+        $currentstring .= ' <span id="showimg_'.$element.'">'.$text.'</span>';
     } elsif ($target eq 'modified') {
 	my ($osrc,$owidth,$oheight)=
 	    ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
@@ -3267,12 +3263,12 @@ sub end_externallink {
     return $currentstring;
 }
 
-#-- <blankspace height="">
+#-- <blankspace heigth="">
 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('height',$parstack,$safeeval,undef,1);
+	my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
 	$currentstring .= '\vskip '.$howmuch.' ';
     }
     return $currentstring;
@@ -4278,10 +4274,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;
@@ -4572,34 +4568,40 @@ sub latex_header {
 	($mode eq 'batchmode')) {$currentstring .='\batchmode';} 
     $currentstring .= '\newcommand{\keephidden}[1]{}'.
 	'\renewcommand{\deg}{$^{\circ}$}'.
-	'\usepackage{multirow}'."\n".
-	'\usepackage{longtable}'."\n".
-	'\usepackage{textcomp}'."\n".
-	'\usepackage{makeidx}'."\n".
-	'\usepackage[dvips]{graphicx}'."\n".
-	'\usepackage{wrapfig}'."\n".
-	'\usepackage{picins}'."\n".
+	'\usepackage{multirow}'.
+	'\usepackage{longtable}'.
+	'\usepackage{textcomp}'.
+	'\usepackage{makeidx}'.
+	'\usepackage[dvips]{graphicx}'.
+	'\usepackage{wrapfig}'.
+	'\usepackage{picins}'.
 	'\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}'."\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";
+	'\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";
+	
     if($env{'form.pdfFormFields'} eq 'yes') {
 	$currentstring .= '\usepackage{hyperref}'.
 	    '\usepackage{eforms}'.