--- loncom/xml/londefdef.pm	2005/03/31 15:54:33	1.265
+++ loncom/xml/londefdef.pm	2006/03/29 22:54:10	1.302.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.265 2005/03/31 15:54:33 albertel Exp $
+# $Id: londefdef.pm,v 1.302.2.4 2006/03/29 22:54:10 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -39,7 +39,7 @@
 
 package Apache::londefdef; 
 
-use Apache::lonnet();
+use Apache::lonnet;
 use strict;
 use Apache::lonxml;
 use Apache::File();
@@ -47,7 +47,8 @@ use Image::Magick;
 use Apache::lonmenu();
 use Apache::lonmeta();
 use Apache::Constants qw(:common);
-
+use File::Basename;
+# use Data::Dumper;
 
 BEGIN {
 
@@ -55,6 +56,21 @@ BEGIN {
 
 }
 
+#
+#   Dumps all elements of the table structure.
+#   Need this 'cause evidently when given an array, Data::Dumper only seems
+#   to dump element 0.
+#
+#sub debug_dump_table {
+#    my $lastrow = $#Apache::londefdef::table;
+#    &Apache::lonnet::logthis("Dumping table:  Last row index: $lastrow");
+#    my $row;
+#    for ($row =0; $row <= $lastrow; $row++ ) {
+#	my $text = Dumper($Apache::londefdef::table[$row]);
+#	&Apache::lonnet::logthis("table [ $row ]".$text);
+#
+#    }
+#}
 sub initialize_londefdef {
     $Apache::londefdef::TD_redirection=0;
     @Apache::londefdef::table = ();
@@ -90,7 +106,8 @@ sub start_m {
 	    $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
 	    #&Apache::lonxml::debug("M is evaulated to:$inside:");
 	}
-	$currentstring = &Apache::lontexconvert::converted(\$inside);
+	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
+	$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
 	if ($Apache::lontexconvert::errorstring) {
 	    &Apache::lonxml::warning("tth error: ".
 				     $Apache::lontexconvert::errorstring);
@@ -108,8 +125,8 @@ sub start_m {
 	# detect simple math mode entry exits, and convert them
         # to use \ensuremath
 	if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
-	    $currentstring=~s/^\$//;
-	    $currentstring=~s/\$$//;
+	    $currentstring=~s/^(\s*)\$/$1/;
+	    $currentstring=~s/\$(\s*)$/$1/;
 	    $currentstring='\ensuremath{'.$currentstring.'}';
 	}
 	$Apache::lonxml::post_evaluate=0;
@@ -127,12 +144,13 @@ sub end_m {
 }
 
 sub start_tthoption {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $result;
-    if ($target eq 'web') {
-	my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser);
+    if ($target eq 'web' || $target eq 'webgrade') {
+	my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser,
+						   $style);
 	$inside=~s/^\s*//;
-	if ($ENV{'browser.mathml'}) {
+	if ($env{'browser.mathml'}) {
 	    &tth::ttmoptions($inside);
 	} else {
 	    &tth::tthoptions($inside);
@@ -151,20 +169,21 @@ sub end_tthoption {
 sub start_html {
     my ($target,$token) = @_;
     my $currentstring = '';
-    my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};
+    my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
     &Apache::lontexconvert::init_tth();
-    if ($target eq 'web' || $target eq 'edit') {
+    if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
 	$currentstring = &Apache::lonxml::xmlbegin();
     } elsif ($target eq 'tex') {
 	$currentstring .= '\documentclass[letterpaper]{article}';
-	if (($ENV{'form.latex_type'}=~'batchmode') ||
-            (!$ENV{'request.role.adv'})) {$currentstring .='\batchmode';} 
+	if (($env{'form.latex_type'}=~'batchmode') ||
+            (!$env{'request.role.adv'})) {$currentstring .='\batchmode';} 
 	$currentstring .= '\newcommand{\keephidden}[1]{}'.
                           '\renewcommand{\deg}{$^{\circ}$}'.
                           '\usepackage{longtable}'.
                           '\usepackage{textcomp}'.
                           '\usepackage{makeidx}'.
                           '\usepackage[dvips]{graphicx}'.
+			  '\usepackage{wrapfig}'.
 			  '\usepackage{picins}'.
                           '\usepackage{epsfig}'.
                           '\usepackage{calc}'.
@@ -201,7 +220,7 @@ sub start_head {
 sub end_head {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web' && $ENV{'request.state'} eq 'published') {
+    if ($target eq 'web' && $env{'request.state'} eq 'published') {
 	$currentstring = &Apache::lonmenu::registerurl(undef,$target).
 	    $token->[2];    
     } 
@@ -212,7 +231,7 @@ sub end_head {
 sub start_map {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -221,7 +240,7 @@ sub start_map {
 sub end_map {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -231,7 +250,7 @@ sub end_map {
 sub start_select {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     }  elsif ($target eq 'tex') {
 	$Apache::londefdef::select=0;
@@ -242,7 +261,7 @@ sub start_select {
 sub end_select {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -252,7 +271,7 @@ sub end_select {
 sub start_option {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::select++;
@@ -268,7 +287,7 @@ sub start_option {
 sub end_option {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     }  elsif ($target eq 'tex') {
 	$currentstring='}';
@@ -280,7 +299,7 @@ sub end_option {
 sub start_input {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -289,7 +308,7 @@ sub start_input {
 sub end_input {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -299,7 +318,7 @@ sub end_input {
 sub start_textarea {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -308,7 +327,7 @@ sub start_textarea {
 sub end_textarea {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -318,7 +337,7 @@ sub end_textarea {
 sub start_form {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -327,7 +346,7 @@ sub start_form {
 sub end_form {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -366,13 +385,13 @@ sub end_title {
 
 #-- <meta> tag (end tag forbidden)
 sub start_meta {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	my $args='';
 	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
 	if ($args eq '') {
-	    &Apache::lonxml::get_all_text("/meta",$parser);
+	    &Apache::lonxml::get_all_text("/meta",$parser,$style);
 	} else {
 	    $currentstring = $token->[4];
 	}
@@ -417,7 +436,7 @@ sub start_meta {
 sub end_meta {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	my $args='';
 	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
 	if ($args ne '') {
@@ -435,7 +454,7 @@ sub end_meta {
 
 # accessrule
 sub start_accessrule {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $currentstring = '';
     my $eff=&Apache::lonxml::get_param
 	('effect',$parstack,$safeeval,undef,1);
@@ -454,7 +473,7 @@ sub start_accessrule {
 	my $args='';
 	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
 	if ($args eq '') {
-	    &Apache::lonxml::get_all_text("/accessrule",$parser);
+	    &Apache::lonxml::get_all_text("/accessrule",$parser,$style);
 	} else {
 	    $currentstring = $token->[4];
 	}
@@ -489,15 +508,15 @@ sub start_body {
 	    return '';
 	}
 	if (!$Apache::lonxml::registered && 
-	    $ENV{'request.state'} eq 'published') {
+	    $env{'request.state'} eq 'published') {
 	    $currentstring.='<head>'.
 		&Apache::lonmenu::registerurl(undef,$target).'</head>';
 	}
 # Accessibility
-	if ($ENV{'browser.imagesuppress'} eq 'on') {
+	if ($env{'browser.imagesuppress'} eq 'on') {
 	    delete($token->[2]->{'background'});
 	}
-	if ($ENV{'browser.fontenhance'} eq 'on') {
+	if ($env{'browser.fontenhance'} eq 'on') {
 	    my $style='';
 	    foreach my $key (keys(%{$token->[2]})) {
 		if ($key =~ /^style$/i) {
@@ -507,7 +526,7 @@ sub start_body {
 	    }
 	    $token->[2]->{'style'}=$style.'; font-size: x-large;';
 	}
-	if ($ENV{'browser.blackwhite'} eq 'on') {
+	if ($env{'browser.blackwhite'} eq 'on') {
 	    delete($token->[2]->{'font'});
 	    delete($token->[2]->{'link'});
 	    delete($token->[2]->{'alink'});
@@ -534,23 +553,25 @@ sub start_body {
 	$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
 	    ';'.$onUnload;
 	
-	if ($ENV{'request.state'} ne 'construct') {
-	    $currentstring .= '<'.$token->[1];
-	}
+	$currentstring .= '<'.$token->[1];
 	foreach (keys %{$token->[2]}) {
 	    $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
 	}
-	if ($ENV{'request.state'} ne 'construct') {
-	    $currentstring.='>';
-	}
-	if ($ENV{'request.state'} ne 'published') {
-	    my $remote=($ENV{'environment.remote'} ne 'off');
-	    $currentstring=&Apache::loncommon::bodytag(undef,undef,
-						       $currentstring,$remote);
+	$currentstring.='>';
+	&Apache::lontexconvert::jsMath_reset();
+	if ($env{'environment.texengine'} eq 'jsMath') {
+	    $currentstring.=&Apache::lontexconvert::jsMath_header();
+	}
+	if ($env{'request.state'} ne 'published') {
+	    if ($env{'environment.remote'} eq 'off') {
+		$currentstring.= 
+		    &Apache::lonmenu::constspaceform().
+		    &Apache::lonmenu::menubuttons(1,'web',1);
+	    }
 	    $currentstring.=(<<EDITBUTTON);
-		<form method="post">
-		<input type="submit" name="editmode" accesskey="e" value="Edit" />
-		</form>
+<form method="post">
+<input type="submit" name="editmode" accesskey="e" value="Edit" />
+</form>
 EDITBUTTON
 	} else {
 	    $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
@@ -564,46 +585,57 @@ EDITBUTTON
 
 sub end_body {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
+    my $currentstring = &end_p();	# Close off unclosed <p>
     if ($target eq 'web') {
-	$currentstring = &Apache::lonxml::xmlend($target,$parser);
+	$currentstring .= &Apache::lonxml::xmlend($target,$parser);
     } elsif ($target eq 'tex') {
-	$currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';  
+	$currentstring .= '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';  
     } 
     return $currentstring;
 }
 
+# \begin{center} causes a new paragprah spacing that looks odd inside 
+# of a table cell
+sub center_correction { return '\vspace*{-6 mm}'; }
 #-- <center> tag (end tag required)
 sub start_center {
-    my ($target,$token) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[4];     
+    my ($target,$token,$tagstack) = @_;
+    my $currentstring = &end_p();	# Close off any prior para.
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[4];     
     } elsif ($target eq 'tex') {
-	$currentstring = '\begin{center}';  
+	if (&is_inside_of($tagstack, "table")) {
+	    $currentstring .= &center_correction();
+	}
+	$currentstring .= '\begin{center}';  
     }
     return $currentstring;
 }
 
 sub end_center {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\end{center}';  
+	if (&is_inside_of($tagstack, "table")) {
+	    #$currentstring .= &center_correction();
+	}
     }
     return $currentstring;
 }
 
 #-- <b> tag (end tag required)
+#      NOTE: In TeX mode disables internal <p>
 sub start_b {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	$currentstring = '\textbf{';  
+	&disable_para();
+	$currentstring .= '\textbf{';  
     } 
     return $currentstring;
 }
@@ -611,21 +643,24 @@ sub start_b {
 sub end_b {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
-	$currentstring = '}';  
+	&enable_para();
+	$currentstring = '}';
     } 
     return $currentstring;
 }
 
 #-- <strong> tag (end tag required)
+#    NOTE: in TeX mode disables internal <p>
 sub start_strong {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
+	&disable_para();
 	$currentstring = '\textbf{';  
     } 
     return $currentstring;
@@ -634,9 +669,10 @@ sub start_strong {
 sub end_strong {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {	
+    if ($target eq 'web' || $target eq 'webgrade') {	
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
+	&enable_para();
 	$currentstring = '}';  
     }
     return $currentstring;
@@ -645,8 +681,8 @@ sub end_strong {
 #-- <h1> tag (end tag required)
 sub start_h1 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
+    my $currentstring = &end_p();	# Close off any prior para.
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $pre;
@@ -660,9 +696,9 @@ sub start_h1 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } elsif ($target eq 'meta') {
-	$currentstring='<subject>';
+	$currentstring.='<subject>';
 	&start_output($target);
     }
     return $currentstring;
@@ -671,7 +707,7 @@ sub start_h1 {
 sub end_h1 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	my $post='\vskip 0 mm ';
@@ -694,8 +730,8 @@ sub end_h1 {
 #-- <h2> tag
 sub start_h2 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
+    my $currentstring = &end_p();	# Close off any prior para.
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $pre;
@@ -709,7 +745,7 @@ sub start_h2 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -717,7 +753,7 @@ sub start_h2 {
 sub end_h2 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	my $post='\vskip 0 mm ';
@@ -737,8 +773,8 @@ sub end_h2 {
 #-- <h3> tag
 sub start_h3 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
+    my $currentstring = &end_p();	# Close off any prior para.
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $pre;
@@ -752,7 +788,7 @@ sub start_h3 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -760,7 +796,7 @@ sub start_h3 {
 sub end_h3 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	my $post='\vskip 0 mm ';
@@ -780,8 +816,8 @@ sub end_h3 {
 #-- <h4> tag
 sub start_h4 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
+    my $currentstring = &end_p();	# Close off any prior para.
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $pre;
@@ -795,7 +831,7 @@ sub start_h4 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -803,7 +839,7 @@ sub start_h4 {
 sub end_h4 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	my $post='\vskip 0 mm ';
@@ -823,8 +859,8 @@ sub end_h4 {
 #-- <h5> tag
 sub start_h5 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
+    my $currentstring = &end_p();	# Close off any prior paras.
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $pre;
@@ -838,7 +874,7 @@ sub start_h5 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -846,7 +882,7 @@ sub start_h5 {
 sub end_h5 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	my $post='\vskip 0 mm ';
@@ -866,8 +902,8 @@ sub end_h5 {
 #-- <h6> tag
 sub start_h6 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
+    my $currentstring = &end_p();	# Close off any prior paras.
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $pre;
@@ -881,7 +917,7 @@ sub start_h6 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
     } 
     return $currentstring;
 }
@@ -889,7 +925,7 @@ sub start_h6 {
 sub end_h6 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	my $post='\vskip 0 mm ';
@@ -910,7 +946,7 @@ sub end_h6 {
 sub start_cite {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\textit{';
@@ -921,7 +957,7 @@ sub start_cite {
 sub end_cite {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -933,7 +969,7 @@ sub end_cite {
 sub start_i {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\textit{';
@@ -944,7 +980,7 @@ sub start_i {
 sub end_i {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -956,7 +992,7 @@ sub end_i {
 sub start_address {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\textit{';
@@ -967,7 +1003,7 @@ sub start_address {
 sub end_address {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -979,7 +1015,7 @@ sub end_address {
 sub start_dfn {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\textit{';
@@ -990,7 +1026,7 @@ sub start_dfn {
 sub end_dfn {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -1002,7 +1038,7 @@ sub end_dfn {
 sub start_tt {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\texttt{';
@@ -1013,7 +1049,7 @@ sub start_tt {
 sub end_tt {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -1025,7 +1061,7 @@ sub end_tt {
 sub start_kbd {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\texttt{';
@@ -1036,7 +1072,7 @@ sub start_kbd {
 sub end_kbd {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -1048,7 +1084,7 @@ sub end_kbd {
 sub start_code {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\texttt{';
@@ -1059,7 +1095,7 @@ sub start_code {
 sub end_code {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -1071,7 +1107,7 @@ sub end_code {
 sub start_em {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\emph{';
@@ -1082,7 +1118,7 @@ sub start_em {
 sub end_em {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -1094,7 +1130,7 @@ sub end_em {
 sub start_q {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\emph{';
@@ -1105,7 +1141,7 @@ sub start_q {
 sub end_q {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -1113,61 +1149,96 @@ sub end_q {
     return $currentstring;
 }
 
+#  <p> is a bit strange since it does not require a closing </p>
+#  However in latex, we must often output closing stuff to end
+#  environments and {}'s etc.  Therefore we do all the work
+#  of figuring out the ending strings in the start tag processing,
+#  and provide a mechanism to output the stop text external
+#  to tag processing.
+#
+{
+
+    my $closing_string = '';		# String required to close <p>
+
+#   Some tags are <p> fragile meaning that <p> inside of them
+#   does not work within TeX mode.  This is managed via the 
+#   counter below:
+#
+
+    my $para_disabled = 0;
+
+sub disable_para {
+    $para_disabled++;
+}
+sub enable_para {
+    $para_disabled--;
+}
+
+
 #-- <p> tag (end tag optional)
 #optional attribute - align="center|left|right"
 sub start_p {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= &end_p();	# close off prior para if in progress.
 	$currentstring .= $token->[4];
-    } elsif ($target eq 'tex') {
+	if (! ($currentstring =~ /\//)) {
+	    $closing_string = '</p>'; # Deal correctly with <p /> e.g.
+	}
+    } elsif ($target eq 'tex' && !$para_disabled) {
+	$currentstring .= &end_p();	# close off prior para if in progress.
 	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
 	if ($align eq 'center') {
-	    $currentstring='\begin{center}\par';
+	    $currentstring .='\begin{center}\par';
+	    $closing_string = '\end{center}';
+	    if (&is_inside_of($tagstack, "table")) {
+		$currentstring = &center_correction().$currentstring;
+		#$closing_string .= &center_correction();
+	    }
 	} elsif ($align eq 'right') {
-	    $currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{';
+	    $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
+	    $closing_string= '}}';
 	} elsif ($align eq 'left') {
-	    $currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{';
+	    $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{\rlap{';
+	    $closing_string = '}\hfill}';
 	} else {
-            $currentstring='\par ';
+            $currentstring.='\par ';
+	    $closing_string = '\strut\\\\\strut ';
         }
-	my $signal=1;#<p> does not work inside <b>...</b> 
-	foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}
-	if (!$signal) {$currentstring = '';}
-	}
+
     }
     return $currentstring;
 }
-
+#
+#  End paragraph processing just requires that we output the
+#  closing string that was saved and blank it.
 sub end_p {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring .= $token->[2];
-    } elsif ($target eq 'tex') {
-	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
-	if (not defined $align) {
-	    $currentstring.='\strut\\\\\strut ';
-	} elsif ($align eq 'center') {		
-	    $currentstring .= '\end{center}';
-	} elsif ($align eq 'right') {
-	    $currentstring .= '}}';
-	} elsif ($align eq 'left') {
-	    $currentstring .= '}\hfill}';
-	} 
+    #  Note only 'tex' mode uses disable_para and enable_para
+    #  so we don't need to know the target in the check below:
+
+    if (!$para_disabled) {
+	my $current_string = $closing_string;
+	$closing_string = '';	# Not in a para anymore.
+	return $current_string;
+    } else {
+	return '';
     }
-    return $currentstring;
-}
 
+}
+}
 #-- <br> tag (end tag forbidden)
 sub start_br {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my @tempo=@$tagstack;
 	my $signal=0;
+	#  Not going to factor this to is_inside_of since that would require
+        #  multiple stack traversals.
+	#
 	for (my $i=$#tempo;$i>=0;$i--) {
 	    if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') ||
                 ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul') ||
@@ -1188,7 +1259,7 @@ sub start_br {
 sub end_br {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     }
     return $currentstring;
@@ -1198,7 +1269,7 @@ sub end_br {
 sub start_big {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '{\large ';
@@ -1209,7 +1280,7 @@ sub start_big {
 sub end_big {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -1221,7 +1292,7 @@ sub end_big {
 sub start_small {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '{\footnotesize ';
@@ -1232,7 +1303,7 @@ sub start_small {
 sub end_small {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
@@ -1244,7 +1315,7 @@ sub end_small {
 sub start_basefont {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
@@ -1258,7 +1329,7 @@ sub start_basefont {
 sub end_basefont {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
@@ -1273,11 +1344,11 @@ sub end_basefont {
 sub start_font {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
 	if ($face!~/symbol/i) {
-	    if (($ENV{'browser.fontenhance'} eq 'on') || 
-		($ENV{'browser.blackwhite'} eq 'on')) { return ''; }
+	    if (($env{'browser.fontenhance'} eq 'on') || 
+		($env{'browser.blackwhite'} eq 'on')) { return ''; }
 	}
 	$currentstring = $token->[4];     
     }  elsif ($target eq 'tex') {
@@ -1292,7 +1363,7 @@ sub start_font {
 sub end_font {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     }  elsif ($target eq 'tex') {
 	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
@@ -1307,7 +1378,7 @@ sub end_font {
 sub start_strike {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	&Apache::lonxml::startredirection();
@@ -1318,7 +1389,7 @@ sub start_strike {
 sub end_strike {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring=&Apache::lonxml::endredirection();
@@ -1333,7 +1404,7 @@ sub end_strike {
 sub start_s {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	&Apache::lonxml::startredirection();
@@ -1344,7 +1415,7 @@ sub start_s {
 sub end_s {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring=&Apache::lonxml::endredirection();
@@ -1359,7 +1430,7 @@ sub end_s {
 sub start_sub {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\ensuremath{_{';
@@ -1370,7 +1441,7 @@ sub start_sub {
 sub end_sub {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}}';
@@ -1382,7 +1453,7 @@ sub end_sub {
 sub start_sup {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\ensuremath{^{';
@@ -1393,7 +1464,7 @@ sub start_sup {
 sub end_sup {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}}';
@@ -1404,8 +1475,8 @@ sub end_sup {
 #-- <hr> tag (end tag forbidden)
 sub start_hr {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
+    my $currentstring = &end_p();	# End enclosing para.
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
@@ -1435,36 +1506,77 @@ sub start_hr {
 sub end_hr {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     }
     return $currentstring;
 }
 
 #-- <div> tag (end tag required)
+{
+
+#  Since div can be nested, the stack below is used
+#  in 'tex' mode to store the ending strings
+#  for the div stack.
+
+    my @div_end_stack;
+
 sub start_div {
-    my ($target,$token) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
+    my ($target,$token, $tagstack, $parstack, $parser, $safeeval) = @_;
+    my $currentstring = &end_p();	# Close enclosing para.
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } 
+    if ($target eq 'tex') {
+	# 4 possible alignments: left, right, center, and -missing-.
+
+	my $endstring = '';
+
+	my $align = lc(&Apache::lonxml::get_param('align', $parstack,
+						  $safeeval, undef, 1));
+	if ($align eq 'center') {
+	    $currentstring .= '\begin{center}';
+	    $endstring      = '\end{center}';
+	    if (&is_inside_of($tagstack, "table")) {
+		$currentstring = &center_correction().$currentstring;
+		#$endstring .= &center_correction();
+	    }
+	}
+	elsif ($align eq 'right') {
+	    $currentstring .= '\begin{flushright}';
+	    $endstring     .= '\end{flushright}';
+	} elsif ($align eq 'left') {
+	    $currentstring .= '\begin{flushleft}';
+	    $endstring     = '\end{flushleft}';
+	} else {
+	
+	}
+	$currentstring .= "\n";   # For human readability.
+	$endstring       = "\n$endstring\n"; # For human readability
+	push(@div_end_stack, $endstring);
+    }
     return $currentstring;
 }
 
 sub end_div {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
-    } 
+    }
+    if ($target eq 'tex') {
+	my $endstring = pop @div_end_stack;
+	$currentstring .= $endstring;
+    }
     return $currentstring;
 }
+}
 
 #-- <a> tag (end tag required)
 sub start_a {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
 					    undef,1);
 	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
@@ -1486,7 +1598,7 @@ sub start_a {
 sub end_a {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     }
     return $currentstring;
@@ -1496,7 +1608,7 @@ sub end_a {
 sub start_li {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
@@ -1526,9 +1638,9 @@ sub start_li {
 
 sub end_li {
     my ($target,$token) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[2];     
+    my $currentstring = &end_p();	# In case there's a <p> in the <li>
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[2];     
     } 
     return $currentstring;
 }
@@ -1537,7 +1649,7 @@ sub end_li {
 sub start_u {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	&Apache::lonxml::startredirection();
@@ -1548,7 +1660,7 @@ sub start_u {
 sub end_u {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring=&Apache::lonxml::endredirection();
@@ -1562,9 +1674,9 @@ sub end_u {
 #-- <ul> tag (end tag required)
 sub start_ul {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[4];     
+    my $currentstring = &end_p();	# Close off enclosing list.
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[4];     
     } elsif ($target eq 'tex') {
 	my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
 	$Apache::londefdef::list_index=0;
@@ -1592,7 +1704,7 @@ sub start_ul {
 sub end_ul {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'.
@@ -1607,7 +1719,7 @@ sub end_ul {
 sub start_menu {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$currentstring = " \\begin{itemize} ";  
@@ -1618,7 +1730,7 @@ sub start_menu {
 sub end_menu {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = " \\end{itemize}";  
@@ -1629,11 +1741,11 @@ sub end_menu {
 #-- <dir> tag (end tag required)
 sub start_dir {
     my ($target,$token) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[4];     
+    my $currentstring = &end_p();	# In case there's a <p> prior to the list.
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[4];     
     } elsif ($target eq 'tex') {
-	$currentstring = " \\begin{itemize} ";  
+	$currentstring .= " \\begin{itemize} ";  
     } 
     return $currentstring;
 }
@@ -1641,7 +1753,7 @@ sub start_dir {
 sub end_dir {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = " \\end{itemize}";  
@@ -1652,9 +1764,9 @@ sub end_dir {
 #-- <ol> tag (end tag required)
 sub start_ol {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[4];     
+    my $currentstring = &end_p();	# In case there's a <p> prior to the list.
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[4];     
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::list_index=0;
 	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
@@ -1692,7 +1804,7 @@ sub start_ol {
 sub end_ol {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'.
@@ -1706,11 +1818,11 @@ sub end_ol {
 #-- <dl> tag (end tag required)
 sub start_dl {
     my ($target,$token) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[4];     
+    my $currentstring = &end_p();	# In case there's a <p> unclosed prior to the list.
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[4];     
     } elsif ($target eq 'tex') {
-	$currentstring = '\begin{description}';
+	$currentstring .= '\begin{description}';
 	$Apache::londefdef::DL++;
 	push(@Apache::londefdef::description,[]);
 	$Apache::londefdef::DD[$Apache::londefdef::DL]=0;
@@ -1723,7 +1835,7 @@ sub start_dl {
 sub end_dl {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
@@ -1745,7 +1857,7 @@ sub end_dl {
 sub start_dt {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring='';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
@@ -1760,7 +1872,7 @@ sub start_dt {
 sub end_dt {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } elsif ($target eq 'tex') {
 	if ($Apache::londefdef::DT[-1]) {
@@ -1783,7 +1895,7 @@ sub item_cleanup {
 sub start_dd {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
@@ -1802,7 +1914,7 @@ sub start_dd {
 sub end_dd {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     }  elsif ($target eq 'tex') {
 	$Apache::londefdef::description[-1]->[-1].=
@@ -1813,19 +1925,25 @@ sub end_dd {
 }
 
 #-- <table> tag (end tag required)
+#       <table> also ends any prior <p> that is not closed.
+#               but, unless I allow <p>'s to nest, that's the
+#               only way I could think of to allow <p> in 
+#               <tr> <th> bodies
+#
 #list of supported attributes: border,width,TeXwidth
 sub start_table {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my ($textwidth,$currentstring)=('','');
-    if ($target eq 'web') {
-	$currentstring = $token->[4];     
+    my $textwidth = '';
+    my $currentstring = &end_p();
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[4];     
     } elsif ($target eq 'tex') {
 	my $aa = {};
 	push @Apache::londefdef::table, $aa; 
 	$Apache::londefdef::table[-1]{'row_number'} = -1;
         #maximum table's width (default coincides with text line length)
 	if ($#Apache::londefdef::table==0) {
-	    $textwidth=&recalc($ENV{'form.textwidth'}); #result is always in mm
+	    $textwidth=&recalc($env{'form.textwidth'}); #result is always in mm
 	    $textwidth=~/(\d+\.?\d*)/;
 	    $textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame
 	} else {
@@ -1840,24 +1958,30 @@ sub start_table {
 		}
 	    }
 	}
+
+	# width either comes forced from the TeXwidth or the width parameters.
+	# in either case it can be a percentage or absolute width.
+	# in the width case we ignore absolute width 
 	my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
-	if (not defined $TeXwidth) {
-	    my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);
-	    if ($htmlwidth=~/%/) {
-                $Apache::londefdef::table[-1]{'percent'}=1;
-		$htmlwidth=~/(\d+)/;
-		$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;;
-	    } else {
-		$Apache::londefdef::table[-1]{'width'}=$textwidth;
+	if (!defined($TeXwidth)) {
+	    my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,
+						       $safeeval,undef,1);
+	    if ($htmlwidth =~ /%/) {
+		$TeXwidth = $htmlwidth;
+	    } else { 
+		$TeXwidth = $textwidth;
 	    }
-	} elsif ($TeXwidth=~/%/) {
+	} else {
+	    $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1;
+	}
+	if ($TeXwidth=~/%/) {
 	    $Apache::londefdef::table[-1]{'percent'}=1;
 	    $TeXwidth=~/(\d+)/;
             $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
 	} else {
-	    $Apache::londefdef::table[-1]{'forcetablewidth'}=1;
 	    $Apache::londefdef::table[-1]{'width'}=$TeXwidth;
 	}        
+
         #table's border
 	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); 
         my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
@@ -1872,7 +1996,9 @@ sub start_table {
 	    $Apache::londefdef::table[-1]{'vvinc'} = '';
 	}
 	if ($#Apache::londefdef::table==0) {
-	    $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}';
+	    #    Note that \newline seems to destroy the alignment envs.
+	    # $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}';
+	    $Apache::londefdef::table[-1]{'output'}='\strut'.'\\\\'."\n".'\strut\setlength{\tabcolsep}{1 mm}';
 	}
 	$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';
         $Apache::londefdef::table[-1]{'TeXlen'}=[];
@@ -1882,21 +2008,24 @@ sub start_table {
         $Apache::londefdef::table[-1]{'minlen'}=[];
         $Apache::londefdef::table[-1]{'content'}=[];
         $Apache::londefdef::table[-1]{'align'}=[];
-        $currentstring='\keephidden{NEW TABLE ENTRY}';
-   }
+        $currentstring.='\keephidden{NEW TABLE ENTRY}';
+
+
+    }
     return $currentstring;
 }
  
 sub end_table {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	my $inmemory = '';
 	my $output = '';
 	my $WARNING='';
         #width of columns from TeXwidth attributes
+
 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
 	    for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
 		if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {
@@ -2081,13 +2210,13 @@ sub end_table {
 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
 	    for (my $jn=0;$jn<=$#fwidth;$jn++) {
 		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-		    $output.='\vspace*{-6 mm}\begin{center}';
+		    $output.=&center_correction().'\begin{center}';
 		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
 		    $output.=' \hfill \llap{'
 		}
 		$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
 		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-		    $output.='\end{center}\vspace*{-6 mm}';
+		    $output.='\end{center}';#.&center_correction();
 		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
 		    $output.='} ';
 		}
@@ -2095,9 +2224,37 @@ sub end_table {
 	    }
 	    $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
 	}
-	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
+	# Note that \newline destroys alignment env's produced  by e.g. <div>
+	# $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
+	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut'.'\\\\'."\n".'\strut ';
 	if ($#Apache::londefdef::table > 0) {	    
 	    my $inmemory = $Apache::londefdef::table[-1]{'output'};
+	    # Figure out max/and min width  by summing us and then
+	    # apply that to the current column of the table we nest in
+	    # if it's larger than the current width or the current width
+	    # is undefined.
+	    #
+	    my $min_nested_width = 0;
+	    my $max_nested_width = 0;
+	    for (my $col = 0; $col <= $Apache::londefdef::table[-1]{'counter_columns'}; $col++) {
+		$min_nested_width +=  $min_len[$col];
+		$max_nested_width +=  $max_len[$col];
+		
+	    }
+	    # Fudge in an extra 5 mm for borders etc:
+	    
+	    $min_nested_width += 5;
+	    $max_nested_width += 5;
+
+	    my $outer_column = $Apache::londefdef::table[-2]{'counter_columns'};
+	    my $outer_row    = $Apache::londefdef::table[-2]{'row_number'};
+	    if ($min_nested_width > $Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column]) {
+		$Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column] = $min_nested_width;
+	    }
+	    if ($max_nested_width > $Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column]) {
+		$Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column] = $max_nested_width;
+	    }
+
 	    pop @Apache::londefdef::table;
 	    push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;
 	} else {
@@ -2113,7 +2270,7 @@ sub end_table {
 sub start_tr {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::table[-1]{'row_number'}++;
@@ -2124,6 +2281,10 @@ sub start_tr {
 	    push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';
 	}
 	push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
+	#
+	#  Need to save the number of table columns to preserve the max # columns.
+	#
+	$Apache::londefdef::table[-1]{'prior_columns'}   = $Apache::londefdef::table[-1]{'counter_columns'};
 	$Apache::londefdef::table[-1]{'counter_columns'} = -1;
 	push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];
 	push @ {$Apache::londefdef::table[-1]{'objectlen'}}, [];
@@ -2136,13 +2297,21 @@ sub start_tr {
         
 sub end_tr {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[2];     
+    my $currentstring = &end_p();	# Close any pending <p> in the row.
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[2];     
     } elsif ($target eq 'tex') {
 	if ($Apache::londefdef::TD_redirection) {
 	    &end_td_tex($parstack,$parser,$safeeval);    
 	}
+	# Counter columns must be the maximum number of columns seen
+	# in the table so far so:
+	if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) {
+	    $Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'};
+	}
+
+
+	
     }
     return $currentstring;
 }
@@ -2151,7 +2320,7 @@ sub end_tr {
 sub start_td {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::TD_redirection = 1;
@@ -2275,17 +2444,26 @@ sub end_td_tex {
 	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
 	}        
     }
-	for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {         
-	    $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
-	}
+    # Substitute all of the tables nested in this cell in their appropriate places.
+
+
+    my $nested_count = $#{$Apache::londefdef::table[-1]{'include'}}; # This one is constant...
+    for (my $in=0; $in<=$nested_count; $in++) {    
+	my $nested = shift @{$Apache::londefdef::table[-1]{'include'}};
+	$nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/;
+	# $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
+	$data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/;
+
+    }
+    # Should be be killing off the 'include' elements as they're used up?
     push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
-    return'';
+    return '';
 }
 
 sub end_td {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
         $Apache::londefdef::TD_redirection =0;
@@ -2298,7 +2476,7 @@ sub end_td {
 sub start_th {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::TD_redirection = 1;
@@ -2413,9 +2591,9 @@ sub end_th_tex {
 
 sub end_th {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[2];     
+    my $currentstring = &end_p();	# Close any open <p> in the row.
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[2];     
     } elsif ($target eq 'tex') {
         $Apache::londefdef::TD_redirection =0;
 	&end_th_tex($parstack,$parser,$safeeval);
@@ -2435,21 +2613,23 @@ sub end_th {
 #         (Note there seems to also be support for this as a % of page size)
 #      
 sub start_img {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
 					 undef,1);
-    if (not $src and ($target eq 'web' or $target eq 'tex')) { 
-	my $inside = &Apache::lonxml::get_all_text("/img",$parser);
+    if (! $src && 
+	($target eq 'web' || $target eq 'webgrade' || $target eq 'tex')
+	) { 
+	my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);
 	return '';
     }
-    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
+    &Apache::lonxml::extlink($src);
     my $currentstring = '';
     my $scaling = .3;
 
    # Render unto browsers that which are the browser's...
 
-    if ($target eq 'web') {
-	if ($ENV{'browser.imagesuppress'} ne 'on') {
+    if ($target eq 'web' || $target eq 'webgrade') {
+	if ($env{'browser.imagesuppress'} ne 'on') {
 	    $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
 	} else {
 	    my $alttag= &Apache::lonxml::get_param
@@ -2475,7 +2655,12 @@ sub start_img {
 						  $safeeval,
 						  undef,1));
 	if(!$align) {
-	    $align = "bottom";	# This is html's default so it's ours too.
+	    # disabled for now see BUG#4535
+	    if (&is_inside_of($tagstack, "table")) {
+		$align = "top";      # Force top of image to top of table cell 
+	    } else {
+		$align = "bottom";	# This is html's default so it's ours too.
+	    }
 	}
 	#
 	&Apache::lonxml::debug("Alignemnt = $align");
@@ -2492,24 +2677,30 @@ sub start_img {
 							    undef,0);
 	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
 	if(!$latex_rendering) {
-	    $latex_rendering = "parbox";
+	    $latex_rendering = "texwrap";
 	}
 	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
 
 	#if original gif/jpg/png file exist do following:
+	my $origsrc=$src;
 	my ($path,$file) = &get_eps_image($src);
 	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	&Apache::lonxml::debug("path = $path file = $file src = $src");
 	if (-e $src) {
 	    &Apache::lonxml::debug("$src exists");
 	    my ($height_param,$width_param)=
-		&image_size($src,0.3,$parstack,$safeeval);
+		&image_size($origsrc,0.3,$parstack,$safeeval);
 	    my $destpath = $path;
 	    $destpath    =~ s/ /\_/g; # Spaces in path cause LaTex to vomit.
 	    my $destfile = $file;
 	    $destfile    =~ s/ /\_/g;
+	    my $size;
+	    if ($width_param)  { $size.='width='.$width_param.' mm,'; }
+	    if ($height_param) { $size.='height='.$height_param.' mm]'; }
+	    $size='['.$size;
+	    $size=~s/,$/]/; 
 	    $currentstring .= '\graphicspath{{'.$destpath.'}}'
-		.'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$destfile.'} ';
+		.'\includegraphics'.$size.'{'.$destfile.'} ';
 
 	    #    If there's an alignment specification we need to honor it here.
 	    #    For the horizontal alignments, we will also honor the
@@ -2527,16 +2718,17 @@ sub start_img {
 	    } elsif ($align eq "left")   { 
 		if ($latex_rendering eq "parpic") { 
 		    $currentstring = '\parpic[l]{'.$currentstring.'}';
-		} else {    	                                 # parbox rendering
-		    $currentstring = "\\strut\\newline\n".
-			'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
+		} else {    	                                 # wrapfig render
+		    $currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}'
+			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
 		}
 	    } elsif ($align eq "right")  {   
 		if ($latex_rendering eq "parpic") {
 		    $currentstring = '\parpic[r]{'.$currentstring.'}';
-		} else {	                                 # parbox rendering. 
-		    $currentstring = '\parbox{'.$width_param.'mm}{\begin{flushright}'
-			             .$currentstring.'\end{flushright}} \newline'."\n";
+		} else {	                                 # wrapfig rendering
+		    $currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}'
+			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
+
 		}
 	    } else {		# Bottom is also default.
 		# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
@@ -2628,7 +2820,7 @@ sub start_img {
 sub end_img {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring = '';
@@ -2641,15 +2833,13 @@ sub start_applet {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     
     my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,undef,1);
-    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$code;
-    
+    &Apache::lonxml::extlink($code);
     my $archive=&Apache::lonxml::get_param('archive',$parstack,$safeeval,
 					   undef,1);
-    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$archive;
-    
+    &Apache::lonxml::extlink($archive);
     my $currentstring = '';
-    if ($target eq 'web') {
-	if ($ENV{'browser.appletsuppress'} ne 'on') {
+    if ($target eq 'web' || $target eq 'webgrade') {
+	if ($env{'browser.appletsuppress'} ne 'on') {
 	    $currentstring = &Apache::lonenc::encrypt_ref($token,
 							  {'code'=>$code,
 							   'archive'=>$archive}
@@ -2681,7 +2871,7 @@ sub start_applet {
 sub end_applet {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
     } 
@@ -2692,10 +2882,10 @@ sub end_applet {
 sub start_embed {    
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
-    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
+    &Apache::lonxml::extlink($src);
     my $currentstring = '';
-    if ($target eq 'web') {
-	if ($ENV{'browser.embedsuppress'} ne 'on') {
+    if ($target eq 'web' || $target eq 'webgrade') {
+	if ($env{'browser.embedsuppress'} ne 'on') {
 	    $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
 	} else {
 	    my $alttag=&Apache::lonxml::get_param
@@ -2713,7 +2903,7 @@ sub start_embed {
 sub end_embed {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {  
     } 
@@ -2723,15 +2913,17 @@ sub end_embed {
 #-- <param> tag (end tag forbidden)
 sub start_param {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    if (&Apache::lonxml::get_param
-	('name',$parstack,$safeeval,undef,1)=~/^cabbase$/i) {
-	$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
-	    &Apache::lonxml::get_param('value',$parstack,$safeeval,undef,1);
-    }   
-    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
-	&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+    if (&Apache::lonxml::get_param('name',$parstack,
+				   $safeeval,undef,1)=~/^cabbase$/i) {
+	my $value=&Apache::lonxml::get_param('value',$parstack,
+					     $safeeval,undef,1);
+	&Apache::lonxml::extlink($value);
+    } 
+  
+    my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+    &Apache::lonxml::extlink($src);
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	my %toconvert;
 	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
 	if ($src) { $toconvert{'src'}= $src; }
@@ -2750,7 +2942,7 @@ sub start_param {
 sub end_param {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
     } 
@@ -2761,9 +2953,8 @@ sub end_param {
 sub start_allow {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
-    $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
-	&Apache::lonnet::clutter($src);
+    &Apache::lonxml::extlink($src);
+
     if ($target eq 'tex') { &image_replication($src); }
     my $result;
     if ($target eq 'edit') {
@@ -2788,10 +2979,10 @@ sub end_allow {
 #-- <frameset>
 sub start_frameset {
     my ($target,$token) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') { 
+    my $currentstring = '';	# Close any pending para.
+    if ($target eq 'web' || $target eq 'webgrade') { 
 	if (!$Apache::lonxml::registered &&
-	    $ENV{'request.state'} eq 'published') {
+	    $env{'request.state'} eq 'published') {
 	    $currentstring.='<head>'.
 		&Apache::lonmenu::registerurl(undef,$target).'</head>';
 	}
@@ -2825,7 +3016,7 @@ sub start_frameset {
 sub end_frameset {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];
     }
     return $currentstring;
@@ -2835,7 +3026,7 @@ sub end_frameset {
 sub start_xmp {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\begin{verbatim}';
@@ -2846,7 +3037,7 @@ sub start_xmp {
 sub end_xmp {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\end{verbatim}';
@@ -2857,8 +3048,8 @@ sub end_xmp {
 #-- <pre> (end tag required)
 sub start_pre {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
+    my $currentstring = &end_p();	# close off pending <p>
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\begin{verbatim}';
@@ -2869,7 +3060,7 @@ sub start_pre {
 sub end_pre {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\end{verbatim}';
@@ -2881,7 +3072,7 @@ sub end_pre {
 sub start_insert {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
 	$currentstring .= '<b>'.$display.'</b>';;
     }
@@ -2891,7 +3082,7 @@ sub start_insert {
 sub end_insert {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= '';
     }
     return $currentstring;
@@ -2901,7 +3092,7 @@ sub end_insert {
 sub start_externallink {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
 	$currentstring .= '<b>'.$display.'</b>';;
     }
@@ -2911,7 +3102,7 @@ sub start_externallink {
 sub end_externallink {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= '';
     }
     return $currentstring;
@@ -2920,7 +3111,7 @@ sub end_externallink {
 #-- <blankspace heigth="">
 sub start_blankspace {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
+    my $currentstring = &end_p();	# closes off any unclosed <p>
     if ($target eq 'tex') {
 	my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
 	$currentstring .= '\vskip '.$howmuch.' ';
@@ -2941,7 +3132,7 @@ sub end_blankspace {
 sub start_abbr {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -2950,7 +3141,7 @@ sub start_abbr {
 sub end_abbr {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -2960,7 +3151,7 @@ sub end_abbr {
 sub start_acronym {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -2969,7 +3160,7 @@ sub start_acronym {
 sub end_acronym {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -2979,7 +3170,7 @@ sub end_acronym {
 sub start_area {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -2988,7 +3179,7 @@ sub start_area {
 sub end_area {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -2998,7 +3189,7 @@ sub end_area {
 sub start_base {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     }
     return $currentstring;
@@ -3007,7 +3198,7 @@ sub start_base {
 sub end_base {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3017,7 +3208,7 @@ sub end_base {
 sub start_bdo {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3026,7 +3217,7 @@ sub start_bdo {
 sub end_bdo {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3036,7 +3227,7 @@ sub end_bdo {
 sub start_bgsound {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3045,7 +3236,7 @@ sub start_bgsound {
 sub end_bgsound {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3055,7 +3246,7 @@ sub end_bgsound {
 sub start_blink {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3064,7 +3255,7 @@ sub start_blink {
 sub end_blink {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3073,9 +3264,9 @@ sub end_blink {
 #-- <blockquote> tag (end tag required)
 sub start_blockquote {
     my ($target,$token) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[4];     
+    my $currentstring = &end_p();	# Close any unclosed <p>
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[4];     
     } 
     return $currentstring;
 }
@@ -3083,7 +3274,7 @@ sub start_blockquote {
 sub end_blockquote {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3093,7 +3284,7 @@ sub end_blockquote {
 sub start_button {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3102,7 +3293,7 @@ sub start_button {
 sub end_button {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3112,7 +3303,7 @@ sub end_button {
 sub start_caption {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3121,7 +3312,7 @@ sub start_caption {
 sub end_caption {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3131,7 +3322,7 @@ sub end_caption {
 sub start_col {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3140,7 +3331,7 @@ sub start_col {
 sub end_col {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3150,7 +3341,7 @@ sub end_col {
 sub start_colgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3159,7 +3350,7 @@ sub start_colgroup {
 sub end_colgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3169,7 +3360,7 @@ sub end_colgroup {
 sub start_del {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3178,7 +3369,7 @@ sub start_del {
 sub end_del {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3188,7 +3379,7 @@ sub end_del {
 sub start_fieldset {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3197,7 +3388,7 @@ sub start_fieldset {
 sub end_fieldset {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3207,7 +3398,7 @@ sub end_fieldset {
 sub start_frame {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3216,7 +3407,7 @@ sub start_frame {
 sub end_frame {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3226,7 +3417,7 @@ sub end_frame {
 sub start_iframe {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3235,7 +3426,7 @@ sub start_iframe {
 sub end_iframe {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3245,7 +3436,7 @@ sub end_iframe {
 sub start_ins {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3254,7 +3445,7 @@ sub start_ins {
 sub end_ins {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3264,7 +3455,7 @@ sub end_ins {
 sub start_isindex {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3273,7 +3464,7 @@ sub start_isindex {
 sub end_isindex {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3283,7 +3474,7 @@ sub end_isindex {
 sub start_keygen {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3292,7 +3483,7 @@ sub start_keygen {
 sub end_keygen {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3302,7 +3493,7 @@ sub end_keygen {
 sub start_label {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3311,7 +3502,7 @@ sub start_label {
 sub end_label {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3321,7 +3512,7 @@ sub end_label {
 sub start_layer {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3330,7 +3521,7 @@ sub start_layer {
 sub end_layer {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3340,7 +3531,7 @@ sub end_layer {
 sub start_legend {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3349,7 +3540,7 @@ sub start_legend {
 sub end_legend {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3357,9 +3548,12 @@ sub end_legend {
 
 #-- <link> tag (end tag forbidden)
 sub start_link {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
+	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
+					    undef,1);
+	&Apache::lonxml::extlink($href);
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3368,7 +3562,7 @@ sub start_link {
 sub end_link {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3378,7 +3572,7 @@ sub end_link {
 sub start_marquee {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3387,7 +3581,7 @@ sub start_marquee {
 sub end_marquee {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3396,9 +3590,9 @@ sub end_marquee {
 #-- <multicol> tag (end tag required)
 sub start_multicol {
     my ($target,$token) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[4];     
+    my $currentstring = &end_p();	# Close any pending <p>
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[4];     
     } 
     return $currentstring;
 }
@@ -3406,7 +3600,7 @@ sub start_multicol {
 sub end_multicol {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3416,7 +3610,7 @@ sub end_multicol {
 sub start_nobr {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     }  elsif ($target eq 'tex') {
 	$currentstring='\mbox{';
@@ -3427,7 +3621,7 @@ sub start_nobr {
 sub end_nobr {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     }   elsif ($target eq 'tex') {
 	$currentstring='}';
@@ -3439,7 +3633,7 @@ sub end_nobr {
 sub start_noembed {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3448,7 +3642,7 @@ sub start_noembed {
 sub end_noembed {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3458,7 +3652,7 @@ sub end_noembed {
 sub start_noframes {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3467,7 +3661,7 @@ sub start_noframes {
 sub end_noframes {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3477,7 +3671,7 @@ sub end_noframes {
 sub start_nolayer {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3486,7 +3680,7 @@ sub start_nolayer {
 sub end_nolayer {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3496,7 +3690,7 @@ sub end_nolayer {
 sub start_noscript {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3505,7 +3699,7 @@ sub start_noscript {
 sub end_noscript {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3515,7 +3709,7 @@ sub end_noscript {
 sub start_object {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3524,7 +3718,7 @@ sub start_object {
 sub end_object {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3534,7 +3728,7 @@ sub end_object {
 sub start_optgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3543,7 +3737,7 @@ sub start_optgroup {
 sub end_optgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3553,7 +3747,7 @@ sub end_optgroup {
 sub start_samp {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$currentstring='\texttt{';
@@ -3564,7 +3758,7 @@ sub start_samp {
 sub end_samp {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } elsif ($target eq 'tex') {
 	$currentstring='}';
@@ -3576,7 +3770,7 @@ sub end_samp {
 sub start_server {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3585,7 +3779,7 @@ sub start_server {
 sub end_server {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3594,9 +3788,9 @@ sub end_server {
 #-- <spacer> tag (end tag forbidden)
 sub start_spacer {
     my ($target,$token) = @_;
-    my $currentstring = '';
-    if ($target eq 'web') {
-	$currentstring = $token->[4];     
+    my $currentstring = &end_p();	# Close off any open <p> tag.
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring .= $token->[4];     
     } 
     return $currentstring;
 }
@@ -3604,7 +3798,7 @@ sub start_spacer {
 sub end_spacer {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3614,7 +3808,7 @@ sub end_spacer {
 sub start_span {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3623,7 +3817,7 @@ sub start_span {
 sub end_span {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3633,7 +3827,7 @@ sub end_span {
 sub start_tbody {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3642,7 +3836,7 @@ sub start_tbody {
 sub end_tbody {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3652,7 +3846,7 @@ sub end_tbody {
 sub start_tfoot {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3661,7 +3855,7 @@ sub start_tfoot {
 sub end_tfoot {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3671,7 +3865,7 @@ sub end_tfoot {
 sub start_thead {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3680,7 +3874,7 @@ sub start_thead {
 sub end_thead {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3690,7 +3884,7 @@ sub end_thead {
 sub start_var {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\textit{'; 
@@ -3701,7 +3895,7 @@ sub start_var {
 sub end_var {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring = '}'; 
@@ -3713,7 +3907,7 @@ sub end_var {
 sub start_wbr {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -3722,7 +3916,7 @@ sub start_wbr {
 sub end_wbr {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];    
     } 
     return $currentstring;
@@ -3731,7 +3925,7 @@ sub end_wbr {
 #-- <hideweboutput> tag
 sub start_hideweboutput {
     my ($target,$token) = @_;
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	&Apache::lonxml::startredirection();     
     } 
     return '';
@@ -3740,7 +3934,7 @@ sub start_hideweboutput {
 sub end_hideweboutput {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = &Apache::lonxml::endredirection();    
     } 
     return '';
@@ -3760,21 +3954,36 @@ sub image_replication {
     }
     return '';
 }
+#
+#   Get correct sizing parameter for an image given
+#   it's initial ht. and wid.  This allows sizing of
+#   images that are generated on-the-fly (e.g. gnuplot)
+#   as well as serving as a utility for image_size.
+# 
+#  Parameter:
+#        height_param
+#        width_param    - Initial picture dimensions.
+#        scaling        - A scale factor.
+#        parstack,      - the current stack of tag attributes 
+#                         from the xml parser
+#        safeeval,      - pointer to the safespace
+#        depth,         - from what level in the stack to look for attributes
+#                         (assumes -1 if unspecified)
+#        cis            - look for attrubutes case insensitively
+#                         (assumes false)
+#
+# Returns:
+#   height, width   - new dimensions.
+#
+sub resize_image {
+    my ($height_param, $width_param, $scaling,
+	$parstack, $safeeval, $depth, $cis) = @_;
 
-sub image_size {
-    my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
+    # First apply the scaling...
+
+    $height_param = $height_param * $scaling;
+    $width_param  = $width_param  * $scaling;
 
-    #size of image from gif/jpg/jpeg/png 
-    my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-    if (-e $ressrc) {
-	$src = $ressrc;
-    }
-    my $image = Image::Magick->new;
-    my $current_figure = $image->Read($src);
-    my $width_param = $image->Get('width') * $scaling;;
-    my $height_param = $image->Get('height') * $scaling;
-    &Apache::lonxml::debug("Image magick says: $src :  Height = $height_param width = $width_param");
-    undef($image);
     #do we have any specified LaTeX size of the picture?
     my $toget='TeXwidth'; 
     if ($cis) { 
@@ -3791,24 +4000,57 @@ sub image_size {
     if ($TeXwidth) { 
 	my $old_width_param=$width_param;
 	if ($TeXwidth=~/(\d+)\s*\%/) {
-	    $width_param = $1*$ENV{'form.textwidth'}/100;
+	    $width_param = $1*$env{'form.textwidth'}/100;
 	} 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) {
 	$height_param = $TeXheight;
-	$width_param  = $TeXheight/$height_param*$width_param;
+	if ($height_param) {
+	    $width_param  = $TeXheight/$height_param*$width_param;
+	}
     } elsif ($width) {
 	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'}) {
+    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;
+	$width_param =0.95*$env{'form.textwidth'};
+	if ($old_width_param) {
+	    $height_param=$width_param/$old_width_param*$height_param;
+	}
+    }
+
+    return ($height_param, $width_param);
+}
+
+sub image_size {
+    my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
+
+    #size of image from gif/jpg/jpeg/png 
+    my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+    if (-e $ressrc) {
+	$src = $ressrc;
     }
+    my $image = Image::Magick->new;
+    my $current_figure = $image->Read($src);
+    my $width_param = $image->Get('width');
+    my $height_param = $image->Get('height');
+    &Apache::lonxml::debug("Image magick says: $src :  Height = $height_param width = $width_param");
+    undef($image);
+
+    ($height_param, $width_param) = &resize_image($height_param, $width_param,
+						  $scaling, $parstack, $safeeval, 
+						  $depth, $cis);
+
     return ($height_param, $width_param);
 }
 
@@ -3827,10 +4069,18 @@ sub image_height {
 sub get_eps_image {
     my ($src)=@_;
     my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src);
-    &Apache::lonxml::debug("get_eps_image: Original image: $orig_src<BR />");
+
+    # In order to prevent the substitution of the alt text, we need to
+    # be sure the orig_src file is on system now so:
+
+    if (! -e $orig_src) {
+	&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
+    }
+    &Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
+    my ($spath, $sname, $sext) = fileparse($src, qr/\.(gif|png|jpg|jpeg)/i);
     $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-    &Apache::lonxml::debug("Filelocation gives; $src <BR />");
+    &Apache::lonxml::debug("Filelocation gives: $src");
     if (! -e $src) {
 	&Apache::lonxml::debug("$src does not exist");
 	if (&Apache::lonnet::repcopy($src) ne 'ok' ) {
@@ -3838,22 +4088,27 @@ sub get_eps_image {
 	    #if replication failed try to find ps file
 	    $src=~s/\.eps$/\.ps/;
 	    &Apache::lonxml::debug("Now looking for $src");
-	    #if no ps file try to replicate it
-	    if (not -e $src &&
-		&Apache::lonnet::repcopy($src) ne 'ok') {
+	    #if no ps file try to replicate it.
+	    my $didrepcopy = &Apache::lonnet::repcopy($src);
+	    &Apache::lonxml::debug("repcopy of $src ... $didrepcopy");
+	    if ( (not -e $src) ||
+		($didrepcopy ne 'ok')) {
 		&Apache::lonxml::debug("Failed to find or replicate $src");
 
 		#if replication failed try to produce eps file dynamically
 		$src=~s/\.ps$/\.eps/;
 		my $temp_file;
-		open(FILE,">>/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat");
+		open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
 		my $newsrc=$orig_src;
 		$newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
-		&Apache::lonxml::debug("queueing $newsrc for dynamic eps production. <BR/>");
+		&Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");
 		print FILE "$newsrc\n";
 		close FILE;
 		$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
 		$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
+		if ($sext ne "") {	 # Put the ext. back in to uniquify.
+		    $src =~ s/\.eps$/$sext.eps/;
+		}
 	    }
 	}
     }
@@ -3864,7 +4119,7 @@ sub get_eps_image {
 
 sub eps_generation {
     my ($src,$file,$width_param) = @_;	     
-    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
+    my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
     my $temp_file = Apache::File->new('>>'.$filename); 
     print $temp_file "$src\n";
     my $newsrc = $src;
@@ -3893,7 +4148,11 @@ sub file_path {
     } 
     return $file,$path;
 }
-
+#  Converts a measurement in to mm from any of 
+#  the other valid LaTeX units of measure.
+#  If the units of measure are missing from the 
+#  parameter, it is assumed to be in and returned
+#  with mm units of measure
 sub recalc {
     my $argument = shift;
     if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';}
@@ -3938,6 +4197,26 @@ sub LATEX_length {
 }
 
 
+# is_inside_of $tagstack $tag
+#    This sub returns true if the current state of Xml processing
+#    is inside of the tag.   
+# Parameters:
+#     tagstack   - The tagstack from the parser.
+#     tag        - The tag (without the <>'s.).
+# Sample usage:
+#     if (is_inside_of($tagstack "table")) {
+#          # I'm in a table....
+#      }
+sub is_inside_of {
+    my ($tagstack, $tag) = @_;
+    my @stack = @$tagstack;
+    for (my $i = ($#stack - 1); $i >= 0; $i--) {
+	if ($stack[$i] eq $tag) {
+	    return 1;
+	}
+    }
+    return 0;
+}
 
 
 1;