--- loncom/xml/londefdef.pm	2005/02/07 20:15:11	1.252
+++ loncom/xml/londefdef.pm	2005/04/06 06:08:13	1.255.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.252 2005/02/07 20:15:11 matthew Exp $
+# $Id: londefdef.pm,v 1.255.2.1 2005/04/06 06:08:13 matthew Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -36,10 +36,6 @@
 # The C source of the Code may not be distributed by the Licensee
 # to any other parties under any circumstances.
 #
-#
-# last modified 06/26/00 by Alexander Sakharuk
-# 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer
-# 01/18 Alex Sakharuk
 
 package Apache::londefdef; 
 
@@ -156,7 +152,8 @@ sub start_html {
     } elsif ($target eq 'tex') {
 	@Apache::londefdef::table = ();
 	$currentstring .= '\documentclass[letterpaper]{article}';
-	if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';} 
+	if (($ENV{'form.latex_type'}=~'batchmode') ||
+            (!$ENV{'request.role.adv'})) {$currentstring .='\batchmode';} 
 	$currentstring .= '\newcommand{\keephidden}[1]{}'.
                           '\renewcommand{\deg}{$^{\circ}$}'.
                           '\usepackage{longtable}'.
@@ -2511,8 +2508,13 @@ sub start_img {
 	    if (-e $newsrc) {
 		#eps counterpart for image exist 
 		if ($path) {
+		    my $size;
+		    if ($width_param)  { $size.='width='.$width_param.' mm,'; }
+		    if ($height_param) { $size.='height='.$height_param.' mm]'; }
+		    $size='['.$size;
+		    $size=~s/,$/]/; 
 		    $currentstring .= '\graphicspath{{'.$path.'}}'
-			             .'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$file.'} ';
+			             .'\includegraphics'.$size.'{'.$file.'} ';
 		}
 	    } else {
 		#there is no eps counterpart for image - check for ps one
@@ -2545,7 +2547,8 @@ sub start_img {
 		if ($latex_rendering eq "parpic") { 
 		    $currentstring = '\parpic[l]{'.$currentstring.'}';
 		} else {    	                                 # parbox rendering
-		    $currentstring = '\newline'."\n".'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
+		    $currentstring = "\\strut\\newline\n".
+			'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
 		}
 	    } elsif ($align eq "right")  {   
 		if ($latex_rendering eq "parpic") {
@@ -3802,19 +3805,29 @@ sub image_size {
 	} else { 
 	    $width_param = $TeXwidth;
 	}
-	$height_param=$TeXwidth/$old_width_param*$height_param;
+	if ($TeXheight) {
+	    $height_param = $TeXheight;
+	} elsif ($old_width_param) {
+	    $height_param=$TeXwidth/$old_width_param*$height_param;
+	}
     } elsif ($TeXheight ne '') {
 	$height_param = $TeXheight;
-	$width_param  = $TeXheight/$height_param*$width_param;
+	if ($height_param) {
+	    $width_param  = $TeXheight/$height_param*$width_param;
+	}
     } elsif ($width ne '') {
 	my $old_width_param=$width_param;
 	$width_param = $width*$scaling;      
-        $height_param=$width_param/$old_width_param*$height_param;
+	if ($old_width_param) {
+            $height_param=$width_param/$old_width_param*$height_param;
+	}
     }
     if ($width_param > $ENV{'form.textwidth'}) {
         my $old_width_param=$width_param;
 	$width_param =0.95*$ENV{'form.textwidth'};
-        $height_param=$width_param/$old_width_param*$height_param;
+	if ($old_width_param) {
+            $height_param=$width_param/$old_width_param*$height_param;
+	}
     }
     return ($height_param, $width_param);
 }