--- loncom/xml/londefdef.pm	2004/12/29 11:39:25	1.249
+++ loncom/xml/londefdef.pm	2005/02/09 15:56:45	1.254
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.249 2004/12/29 11:39:25 foxr Exp $
+# $Id: londefdef.pm,v 1.254 2005/02/09 15:56:45 www 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}'.
@@ -1463,7 +1460,9 @@ sub start_a {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
-	$currentstring .= $token->[4];
+	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
+					    undef,1);
+	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
     } elsif ($target eq 'tex') {
 	my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
 	my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
@@ -2446,7 +2445,7 @@ sub start_img {
 
     if ($target eq 'web') {
 	if ($ENV{'browser.imagesuppress'} ne 'on') {
-	    $currentstring.= $token->[4];
+	    $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
 	} else {
 	    my $alttag= &Apache::lonxml::get_param
 		('alt',$parstack,$safeeval,undef,1);
@@ -2543,7 +2542,7 @@ sub start_img {
 		if ($latex_rendering eq "parpic") { 
 		    $currentstring = '\parpic[l]{'.$currentstring.'}';
 		} else {    	                                 # parbox rendering
-		    $currentstring = '\newline'."\n".'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
+		    $currentstring = "\n".'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
 		}
 	    } elsif ($align eq "right")  {   
 		if ($latex_rendering eq "parpic") {
@@ -2668,7 +2667,10 @@ sub start_applet {
     my $currentstring = '';
     if ($target eq 'web') {
 	if ($ENV{'browser.appletsuppress'} ne 'on') {
-	    $currentstring = $token->[4];
+	    $currentstring = &Apache::lonenc::encrypt_ref($token,
+							  {'code'=>$code,
+							   'archive'=>$archive}
+							  );
 	} else {
 	    my $alttag= &Apache::lonxml::get_param('alt',$parstack,
 						   $safeeval,undef,1);
@@ -2711,7 +2713,7 @@ sub start_embed {
     my $currentstring = '';
     if ($target eq 'web') {
 	if ($ENV{'browser.embedsuppress'} ne 'on') {
-	    $currentstring = $token->[4];
+	    $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
 	} else {
 	    my $alttag=&Apache::lonxml::get_param
 		('alt',$parstack,$safeeval,undef,1);
@@ -2747,7 +2749,16 @@ sub start_param {
 	&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
     my $currentstring = '';
     if ($target eq 'web') {
-	$currentstring = $token->[4];     
+	my %toconvert;
+	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+	if ($src) { $toconvert{'src'}= $src; }
+	my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval,
+					    undef,1);
+	if ($name=~/^cabbase$/i) {
+	    $toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack,
+							   $safeeval,undef,1);
+	}
+	$currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert);
     } elsif ($target eq 'tex') {
     } 
     return $currentstring;
@@ -3782,18 +3793,26 @@ sub image_size {
     my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
 					   undef,1);
     if ($TeXwidth ne '') {  
+	my $old_width_param=$width_param;
 	if ($TeXwidth=~/(\d+)\s*\%/) {
 	    $width_param = $1*$ENV{'form.textwidth'}/100;
 	} else { 
 	    $width_param = $TeXwidth;
 	}
+	$height_param=$TeXwidth/$old_width_param*$height_param;
     } elsif ($TeXheight ne '') {
 	$height_param = $TeXheight;
 	$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 ($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 ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}}
     return ($height_param, $width_param);
 }