--- loncom/xml/londefdef.pm	2006/09/19 10:57:11	1.337
+++ loncom/xml/londefdef.pm	2023/11/28 04:48:14	1.474
@@ -1,8 +1,8 @@
 # The LearningOnline Network with CAPA
-# Tags Default Definition Module 
+# Tags Default Definition Module
+#
+# $Id: londefdef.pm,v 1.474 2023/11/28 04:48:14 raeburn Exp $
 #
-# $Id: londefdef.pm,v 1.337 2006/09/19 10:57:11 foxr Exp $
-# 
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,51 +25,41 @@
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
-## Copyright for TtHfunc and TtMfunc by Ian Hutchinson. 
-# TtHfunc and TtMfunc (the "Code") may be compiled and linked into 
-# binary executable programs or libraries distributed by the 
-# Michigan State University (the "Licensee"), but any binaries so 
+## Copyright for TtHfunc and TtMfunc by Ian Hutchinson.
+# TtHfunc and TtMfunc (the "Code") may be compiled and linked into
+# binary executable programs or libraries distributed by the
+# Michigan State University (the "Licensee"), but any binaries so
 # distributed are hereby licensed only for use in the context
-# of a program or computational system for which the Licensee is the 
-# primary author or distributor, and which performs substantial 
+# of a program or computational system for which the Licensee is the
+# primary author or distributor, and which performs substantial
 # additional tasks beyond the translation of (La)TeX into HTML.
 # The C source of the Code may not be distributed by the Licensee
 # to any other parties under any circumstances.
 #
 
-package Apache::londefdef; 
+package Apache::londefdef;
 
 use Apache::lonnet;
 use strict;
 use Apache::lonxml;
-use Apache::File();
+use Apache::lontable;
 use Image::Magick;
 use Apache::lonmenu();
 use Apache::lonmeta();
+use Apache::lonlocal;
+use Apache::loncommon();
 use Apache::Constants qw(:common);
 use File::Basename;
+use LONCAPA();
 # use Data::Dumper;
 
 BEGIN {
 
-    &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr','hideweboutput'));
+    &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','style','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr','hideweboutput'));
 
 }
 
-#
-#   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 = ();
@@ -102,16 +92,36 @@ sub start_m {
     my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
     if ($target eq 'web' || $target eq 'analyze') {
 	&Apache::lonxml::debug("M is starting with:$inside:");
+        if (!($inside =~ /^\s*\$.*\$\s*$/ || $inside =~ /^\s*\\[([].*\\[)\]]\s*$/)) {
+            # Non-math LaTeX will not be rendered correctly with MathJax
+            # and it should be avoided anyway.
+            # On top of that, MathJax will render math without $, but
+            # it will fail with tth. This is worth a warning.
+            # (even though some people might just use latex for printing)
+            &Apache::lonxml::warning(&mt('Missing $ in [_1].','&lt;m&gt;'));
+        } elsif (($env{'browser.type'} eq 'safari') && ($env{'form.editxmltext'}) &&
+                 (($env{'form.problemmode'} eq 'view') || ($env{'form.problemmode'} eq 'discard'))) {
+            my $delimiter;
+            if ($inside =~ /\$$/) {
+                $delimiter = '$';
+            } elsif ($inside =~ /\\([)\]])$/) {
+                $delimiter = $1;
+            }
+            if ($delimiter) {
+                &Apache::lonxml::warning(&mt('Insert a space between [_1] and [_2].',
+                                             $delimiter,'&lt;/m&gt;'));
+            }
+        }
 	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
 	if ($eval eq 'on') {
 	    $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
-	    #&Apache::lonxml::debug("M is evaulated to:$inside:");
+	    #&Apache::lonxml::debug("M is evaluated to:$inside:");
 	}
 	my $tex = $inside;
 	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
 	$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
 	if ($Apache::lontexconvert::errorstring) {
-	    my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occured while attempting to convert this TeX: <pre>';
+	    my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occurred while attempting to convert this TeX: <pre>';
 	    $tex = &HTML::Entities::encode($tex,'<>&"');
 	    my ($linenumber) =
 		($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
@@ -127,6 +137,7 @@ sub start_m {
 	#&Apache::lonxml::debug("M is ends with:$currentstring:");
 	$Apache::lonxml::post_evaluate=0;
     } elsif ($target eq 'tex') {
+
 	$currentstring = $inside;
 	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
 	if ($eval eq 'on') {
@@ -134,11 +145,13 @@ sub start_m {
 	}
 	if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
 	# detect simple math mode entry exits, and convert them
-        # to use \ensuremath
-	if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
-	    $currentstring=~s/^(\s*)\$/$1/;
-	    $currentstring=~s/\$(\s*)$/$1/;
-	    $currentstring='\ensuremath{'.$currentstring.'}';
+        # to use \ensuremath ... unless there's a \verb inside.
+	if (! ($currentstring=~/\\verb/)) {
+	    if ($currentstring=~/^\s*\$[^\$].*\$\s*$/) {
+		$currentstring=~s/^(\s*)\$/$1/;
+		$currentstring=~s/\$(\s*)$/$1/;
+		$currentstring='\ensuremath{'.$currentstring.'}';
+	    }
 	}
 	$Apache::lonxml::post_evaluate=0;
     }
@@ -181,30 +194,10 @@ sub start_html {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
-	# start_body() takes care of emitting the <html> 
+	# start_body() takes care of emitting the <html>
     } elsif ($target eq 'tex') {
-	$currentstring .= 
-	    '\documentclass[letterpaper,twoside]{article}\raggedbottom';
-	if (($env{'form.latex_type'}=~'batchmode') ||
-            (!$env{'request.role.adv'})) {$currentstring .='\batchmode';} 
-	$currentstring .= '\newcommand{\keephidden}[1]{}'.
-                          '\renewcommand{\deg}{$^{\circ}$}'.
-			  '\usepackage{multirow}'.
-                          '\usepackage{longtable}'.
-                          '\usepackage{textcomp}'.
-                          '\usepackage{makeidx}'.
-                          '\usepackage[dvips]{graphicx}'.
-			  '\usepackage{wrapfig}'.
-			  '\usepackage{picins}'.
-                          '\usepackage{epsfig}'.
-                          '\usepackage{calc}'.
-                          '\usepackage{amsmath}'.
-                          '\usepackage{amssymb}'.
-                          '\usepackage{amsfonts}'.
-                          '\usepackage{amsthm}'.
-                          '\usepackage{amscd}'.
-                          '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
-                          '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
+
+	$currentstring .= &latex_header();
     }
     return $currentstring;
 }
@@ -224,7 +217,7 @@ sub start_head {
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
 	&Apache::lonxml::startredirection();
-    } 
+    }
     return $currentstring;
 }
 
@@ -237,7 +230,7 @@ sub end_head {
 	if ($Apache::lonxml::redirection) {
 	    $Apache::londefdef::head = &Apache::lonxml::endredirection();
 	}
-    } 
+    }
     return $currentstring;
 }
 
@@ -246,8 +239,8 @@ sub start_map {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -255,8 +248,8 @@ sub end_map {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -265,7 +258,7 @@ sub start_select {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     }  elsif ($target eq 'tex') {
 	$Apache::londefdef::select=0;
     }
@@ -276,8 +269,8 @@ sub end_select {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -286,7 +279,7 @@ sub start_option {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::select++;
 	if ($Apache::londefdef::select == 1) {
@@ -302,7 +295,7 @@ sub end_option {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
+	$currentstring = $token->[2];
     }  elsif ($target eq 'tex') {
 	$currentstring='}';
     }
@@ -314,8 +307,8 @@ sub start_input {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -323,8 +316,8 @@ sub end_input {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -333,8 +326,8 @@ sub start_textarea {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -342,8 +335,8 @@ sub end_textarea {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -352,8 +345,8 @@ sub start_form {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -361,8 +354,8 @@ sub end_form {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -371,10 +364,10 @@ sub start_title {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$Apache::londefdef::title = 
+	$Apache::londefdef::title =
 	    &Apache::lonxml::get_all_text('/title',$parser,$style);
     } elsif ($target eq 'tex') {
-	$currentstring .= '\keephidden{Title of the document:  ' 
+	$currentstring .= '\keephidden{Title of the document:  ';
     }
     if ($target eq 'meta') {
 	$currentstring='<title>';
@@ -390,11 +383,11 @@ sub end_title {
 	# start_title takes care of swallowing the title
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    }  
+    }
     if ($target eq 'meta') {
 	&end_output($target);
 	$currentstring='</title>';
-    } 
+    }
     return $currentstring;
 }
 
@@ -410,6 +403,9 @@ sub start_meta {
 	} else {
 	    $currentstring = $token->[4];
 	}
+        if ($env{'form.grade_imsexport'}) {
+            $currentstring = '';
+        }
     } elsif ($target eq 'meta') {
 	unless (&Apache::lonxml::get_param
 		('http-equiv',$parstack,$safeeval,undef,1)) {
@@ -444,6 +440,16 @@ sub start_meta {
 	if ((not defined $content) && (not defined $name)) {
 	    &Apache::lonxml::startredirection();
 	}
+    } elsif ($target eq 'edit') {
+	$currentstring .= &Apache::edit::tag_start($target,$token);
+	$currentstring .= &Apache::edit::text_arg('Name:','name',$token,30);
+	$currentstring .= &Apache::edit::text_arg('Content:','content',$token,70);
+	$currentstring .= &Apache::edit::end_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag =
+	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+					'name','content');
+	if ($constructtag) { $currentstring = &Apache::edit::rebuild_tag($token); }
     }
     return $currentstring;
 }
@@ -467,23 +473,64 @@ sub end_meta {
     return $currentstring;
 }
 
+sub insert_meta {
+    return '
+    <meta />';
+}
+
+#-- <start> tag
+sub start_style {
+	my ($target, $token, $tagstack, $parstack, $parser, $safeeval, $style) = @_;
+	my $currentstring = '';
+
+	if ($target eq 'tex') {
+		Apache::lonxml::startredirection();
+	} else {
+		$currentstring = $token->[4];
+	}
+	
+	return $currentstring;
+}
+
+sub end_style {
+	my ($target, $token, $tagstack, $parstack, $parser, $safeeval) = @_;
+	my $currentstring = '';
+
+	if ($target eq 'tex') {
+		Apache::lonxml::endredirection();
+	} else {
+		$currentstring = $token->[2];
+	}
+	return $currentstring;
+}
+
 # accessrule
 sub start_accessrule {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $currentstring = '';
-    my $eff=&Apache::lonxml::get_param
-	('effect',$parstack,$safeeval,undef,1);
-    my $realm=&Apache::lonxml::get_param
-	('realm',$parstack,$safeeval,undef,1);
-    my $role=&Apache::lonxml::get_param
-	('role',$parstack,$safeeval,undef,1);
-    $realm=~s/\s+//g;
-    $realm=~s/\//\_/g;
-    $realm=~s/^\_//;
-    $realm=~s/\W/\;/g;
-    $role=~s/\s+//g;
-    $role=~s/\//\_/g;
-    $role=~s/\W/\;/g;
+    my $eff  =&Apache::lonxml::get_param('effect',$parstack,$safeeval,undef,1);
+    my $realm=&Apache::lonxml::get_param('realm', $parstack,$safeeval,undef,1);
+    my $role =&Apache::lonxml::get_param('role',  $parstack,$safeeval,undef,1);
+    my $type =&Apache::lonxml::get_param('type',  $parstack,$safeeval,undef,1);
+
+    my ($dom,$crs,$sec,$separator);
+    if ($type eq 'user') {
+	($dom,$crs,$sec)=split(m{/},$realm);
+	$crs = &LONCAPA::clean_username($crs);
+	$separator = '/';
+    } else {
+	($dom,$crs,$sec)=split(/\_/,$realm);
+	$crs = &LONCAPA::clean_courseid($crs);
+	$separator = '_';
+    }
+    $dom = &LONCAPA::clean_domain($dom);
+
+    $sec =~s/\W//;
+    $realm = $dom;
+    if ($crs =~ /\S/) { $realm .= $separator.$crs; }
+    if ($sec =~ /\S/) { $realm .= $separator.$sec; }
+    $role=~s/\W//g;
+
     if ($target eq 'web') {
 	my $args='';
 	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
@@ -494,7 +541,7 @@ sub start_accessrule {
 	}
     }
     if ($target eq 'meta') {
-	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.'</rule>';
+	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.':'.$type.'</rule>';
     }
     return $currentstring;
 }
@@ -508,10 +555,21 @@ sub end_accessrule {
 	if ($args ne '') {
 	    $currentstring = $token->[4];
 	}
-    } 
+    }
     return $currentstring;
 }
 
+sub generate_css_links {
+    my $links;
+    my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
+    if ($css_href =~ /\S/) {
+	&Apache::lonxml::extlink($css_href);
+	$links .=
+	    '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
+    }
+    return $links;
+}
+
 #-- <body> tag (end tag required)
 sub start_body {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
@@ -526,45 +584,164 @@ sub start_body {
 	if (&is_inside_of($tagstack, "head")) {
 	    &end_head(@_);
 	}
-	$currentstring = 
-	    &Apache::loncommon::start_page($Apache::londefdef::title,
-					   $Apache::londefdef::head,
-					   {'add_entries'    => $token->[2],
-					    'no_title'       => 1,
-					    'force_register' => 1});
+	
+	my $extra_head = &generate_css_links();
 
-	if ($env{'request.state'} ne 'published') {
-	    $currentstring.=&Apache::lonmenu::constspaceform();
-	    $currentstring.=(<<EDITBUTTON);
-<form method="post">
-<input type="submit" name="editmode" accesskey="e" value="Edit" />
-</form>
-<br />
-EDITBUTTON
-	}
-	$currentstring.=&Apache::lonxml::message_location();
+    # Breadcrumbs
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    if ($env{'request.state'} eq 'construct') {
+        my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+        my $text = 'Authoring Space';
+        my $href = &Apache::loncommon::authorspace($url);
+        if ($env{'request.course.id'}) {
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            if ($href eq "/priv/$cdom/$cnum/") {
+                $text = 'Course Authoring Space';
+            }
+        }
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            'text'  => $text,
+            'href'  => $href,
+        });
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            'text'  => 'HTML Editor',
+            'href'  => '',
+        });
+        # breadcrumbs (and tools) will be created
+        # in start_page->bodytag->innerregister
+    } else {
+        # FIXME Where are we?
+    }
+
+        my $args = {'add_entries'    => $token->[2],
+                    'force_register' => 1,};
+        if ($target eq 'web') {
+            $args->{'print_suppress'} = 1;
+            if ($env{'request.use_absolute'}) {
+                $args->{'use_absolute'} = $env{'request.use_absolute'};
+            }
+            if ($env{'form.only_body'}) {
+                $args->{'only_body'} = 1;
+            }
+        }
+	$currentstring =
+	    &Apache::loncommon::start_page($Apache::londefdef::title,
+					   $Apache::londefdef::head
+					      .$extra_head,$args);
+        my $header = '';
+        if ($env{'request.state'} ne 'published' &&
+            $env{'request.state'} ne 'construct') {
+            $header=&Apache::lonmenu::constspaceform();
+        }
+        if ($env{'request.state'} ne 'published') {
+            unless ($env{'form.inhibitmenu'} eq 'yes') {
+                $header.=&edit_controls();
+            }
+        }
+        if ($env{'request.state'} eq 'construct') {
+            unless ($env{'form.inhibitmenu'} eq 'yes') {
+                $currentstring.=&Apache::loncommon::head_subbox(
+                                    &Apache::loncommon::CSTR_pageheader()
+                                   .$header);
+            }
+        } elsif ($env{'request.state'} eq 'edit') {
+            $currentstring.=&Apache::loncommon::head_subbox($header);
+        }
+        $currentstring.=&Apache::lonxml::message_location();
     } elsif ($target eq 'tex') {
-	$currentstring = '\begin{document}';  
-    } 
+        $currentstring = '';   #  '\begin{document}' is in header.
+    }
+
     return $currentstring;
 }
 
+sub edit_controls {
+    my ($nochgview) = @_;
+    my $result = &Apache::lonxml::seteditor_javascript().' 
+<form method="post" action="">
+<div class="LC_edit_problem_header">'."\n";
+    unless ($nochgview) {
+        $result .= '
+<div class="LC_edit_problem_header_row1">'.
+&Apache::lonxml::renderingoptions().'
+<input type="submit" name="changeproblemmode" value="'.&mt('Change View').'" />
+</div>';
+    }
+    $result .= '
+<div>
+<input type="hidden" name="editmode" value="" />
+<input type="button" name="editordefault" accesskey="e" value="'.&mt('Edit').
+'" onclick="seteditmode(this.form,'."'edit'".');" />'."\n";
+    if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+        my $uri = $env{'request.uri'};
+        if ($uri =~ /\.(xml|html|htm|xhtml|xhtm)$/) {
+            my %editors = &Apache::loncommon::permitted_editors();
+            if ($editors{'daxe'}) {
+                my $daxeurl = '/daxepage'.$uri;
+                $result .= '<input type="button" name="editordaxe" value="'.&mt('Edit with Daxe').
+                           '" onclick="seteditmode(this.form,'."'daxe'".');" />'."\n";
+            }
+        }
+    }
+    if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
+        my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+        if ($url =~ /\.html?$/i) {
+            my ($cdom,$cnum);
+            if ($env{'request.course.id'}) {
+                $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                if ($env{'request.filename'} =~ m{/userfiles/supplemental/default|\d+/}) {
+                    if (&Apache::lonnet::is_course_upload($env{'request.filename'},
+                                                          $cnum,$cdom)) {
+                        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                                                ['folderpath','title']);
+                    }
+                }
+            }
+            my ($symb,$itemtitle,$displayfile,$caller);
+            if ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}) {
+                $itemtitle = &mt('Syllabus');
+                $caller = "/public/$cdom/$cnum/syllabus";
+            } else {
+                $caller = $url;
+                ($symb,$itemtitle,$displayfile) =
+                    &Apache::lonxml::get_courseupload_hierarchy($url,
+                                                                $env{'form.folderpath'},
+                                                                $env{'form.title'});
+            }
+            if (($symb ne '') || ($env{'httpref.'.$url} ne '') ||
+                ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/})) {
+                  $result .= ('&nbsp;' x 3).
+                             &Apache::lonhtmlcommon::dependencies_button()."\n".
+                             &Apache::lonhtmlcommon::dependencycheck_js($symb,
+                                 $itemtitle,$url,$env{'form.folderpath'},$caller)."\n";
+            }
+        }
+    }
+    $result .= '</div>
+</div>
+</form>
+';
+    return $result;
+}
+
 sub end_body {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = &end_p();	# Close off unclosed <p>
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= &Apache::loncommon::end_page({'discussion' => 1});
     } 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 
+# \begin{center} causes a new paragprah spacing that looks odd inside
 # of a table cell.  Same at the end of a \center but with a slightly
 # larger space .. hence center_correction and center_end_correction.
 #
-sub center_correction { return '\vspace*{-6 mm}'; } 
+sub center_correction { return '\vspace*{-6 mm}'; }
 sub center_end_correction { return '\vspace*{-7 mm}'; }
 
 #-- <center> tag (end tag required)
@@ -572,12 +749,12 @@ sub start_center {
     my ($target,$token,$tagstack) = @_;
     my $currentstring = &end_p();	# Close off any prior para.
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[4];     
+	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	if (&is_inside_of($tagstack, "table")) {
 	    $currentstring .= &center_correction();
 	}
-	$currentstring .= '\begin{center}';  
+	$currentstring .= '\begin{center}';
     }
     return $currentstring;
 }
@@ -586,9 +763,9 @@ sub end_center {
     my ($target,$token,$tagstack) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring = '\end{center}';  
+	$currentstring = '\end{center}';
 	if (&is_inside_of($tagstack, "table")) {
 	    $currentstring .= &center_end_correction();
 	}
@@ -602,11 +779,11 @@ sub start_b {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	&disable_para();
-	$currentstring .= '\textbf{';  
-    } 
+	$currentstring .= '\textbf{';
+    }
     return $currentstring;
 }
 
@@ -614,11 +791,11 @@ sub end_b {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
 	&enable_para();
 	$currentstring = '}';
-    } 
+    }
     return $currentstring;
 }
 
@@ -628,11 +805,11 @@ sub start_strong {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	&disable_para();
-	$currentstring = '\textbf{';  
-    } 
+	$currentstring = '\textbf{';
+    }
     return $currentstring;
 }
 
@@ -640,10 +817,10 @@ sub end_strong {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {	
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
 	&enable_para();
-	$currentstring = '}';  
+	$currentstring = '}';
     }
     return $currentstring;
 }
@@ -666,7 +843,7 @@ sub start_h1 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
     } elsif ($target eq 'meta') {
 	$currentstring.='<subject>';
 	&start_output($target);
@@ -681,7 +858,7 @@ sub end_h1 {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	my $post='\vskip 0 mm ';
-	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
+	my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1));
 	if ($align eq 'center') {
 	    $post='\end{center}';
 	} elsif ($align eq 'left') {
@@ -693,7 +870,7 @@ sub end_h1 {
     } elsif ($target eq 'meta') {
 	&end_output($target);
 	$currentstring='</subject>';
-    } 
+    }
     return $currentstring;
 }
 
@@ -715,8 +892,8 @@ sub start_h2 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
-    } 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+    }
     return $currentstring;
 }
 
@@ -736,7 +913,7 @@ sub end_h2 {
 	    $post='}'.'\vskip 0 mm ';
 	}
 	$currentstring .= '}}'.$post;
-    } 
+    }
     return $currentstring;
 }
 
@@ -758,8 +935,8 @@ sub start_h3 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
-    } 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+    }
     return $currentstring;
 }
 
@@ -779,7 +956,7 @@ sub end_h3 {
 	    $post='}'.'\vskip 0 mm ';
 	}
 	$currentstring .= '}}'.$post;
-    } 
+    }
     return $currentstring;
 }
 
@@ -801,8 +978,8 @@ sub start_h4 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
-    } 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+    }
     return $currentstring;
 }
 
@@ -822,7 +999,7 @@ sub end_h4 {
 	    $post='}'.'\vskip 0 mm ';
 	}
 	$currentstring .= '}}'.$post;
-    } 
+    }
     return $currentstring;
 }
 
@@ -844,8 +1021,8 @@ sub start_h5 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
-    } 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+    }
     return $currentstring;
 }
 
@@ -865,7 +1042,7 @@ sub end_h5 {
 	    $post='}'.'\vskip 0 mm ';
 	}
 	$currentstring .= '}}'.$post;
-    } 
+    }
     return $currentstring;
 }
 
@@ -887,8 +1064,8 @@ sub start_h6 {
 	}
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
 	if (not defined $TeXsize) {$TeXsize="large";}
-	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; 
-    } 
+	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+    }
     return $currentstring;
 }
 
@@ -908,7 +1085,7 @@ sub end_h6 {
 	    $post='}'.'\vskip 0 mm ';
 	}
 	$currentstring .= '}}'.$post;
-    } 
+    }
     return $currentstring;
 }
 
@@ -954,7 +1131,7 @@ sub end_i {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } 
+    }
     return $currentstring;
 }
 
@@ -989,7 +1166,7 @@ sub start_dfn {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\textit{';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1058,7 +1235,7 @@ sub start_code {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\texttt{';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1069,7 +1246,7 @@ sub end_code {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1092,7 +1269,7 @@ sub end_em {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1115,7 +1292,7 @@ sub end_q {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1131,7 +1308,7 @@ sub end_q {
     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 
+#   does not work within TeX mode.  This is managed via the
 #   counter below:
 #
 
@@ -1160,6 +1337,10 @@ sub start_p {
 
 	$currentstring .= &end_p();	# close off prior para if in progress.
 	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
+	if (!defined $align) {
+          # check inline CSS
+          $align = &get_css_property('text-align',$parstack,$safeeval);
+        }
 	if ($align eq 'center') {
 	    $currentstring .='\begin{center}\par ';
 	    $closing_string = '\end{center}';
@@ -1167,13 +1348,13 @@ sub start_p {
 		$currentstring = &center_correction().$currentstring;
 	    }
 	} elsif ($align eq 'right') {
-	    $currentstring.="\n".'{\flushright ';
+	    $currentstring.="\n".'\begin{flushright}';
 #	    $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
-	    $closing_string= "}\n";
+	    $closing_string= '\end{flushright}'."\n";
 	} elsif ($align eq 'left') {
-	    $currentstring.= "\n".'{\flushleft ';
+	    $currentstring.= "\n".'\begin{flushleft}';
 #	    $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{{';
-	    $closing_string = "}\n";
+	    $closing_string = '\end{flushleft}'."\n";
 	} else {
             $currentstring.='\par ';
 	    if (&is_inside_of($tagstack, 'table')) {
@@ -1224,11 +1405,10 @@ sub start_br {
 		$signal = 1;
 	    }
 	}
-	if ($signal eq 1) {
-	    $currentstring .= ' \vskip 0 mm ';
-	} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
+	if ($signal != 1) {
 	    $currentstring .= '\strut \\\\ \strut ';
 	}
+
     }
     return $currentstring;
 }
@@ -1250,7 +1430,7 @@ sub start_big {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '{\large ';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1293,7 +1473,7 @@ sub start_basefont {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
 	if (defined $basesize) {
@@ -1307,7 +1487,7 @@ sub end_basefont {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
 	if (defined $basesize) {
@@ -1323,11 +1503,7 @@ sub start_font {
     my $currentstring = '';
     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 ''; }
-	}
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     }  elsif ($target eq 'tex') {
 	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
 	if (defined $fontsize) {
@@ -1341,7 +1517,7 @@ sub end_font {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
+	$currentstring = $token->[2];
     }  elsif ($target eq 'tex') {
 	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
 	if (defined $fontsize) {
@@ -1350,7 +1526,7 @@ sub end_font {
     }
     return $currentstring;
 }
- 
+
 #-- <strike> tag (end tag required)
 sub start_strike {
     my ($target,$token) = @_;
@@ -1359,7 +1535,7 @@ sub start_strike {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	&Apache::lonxml::startredirection();
-    } 
+    }
     return $currentstring;
 }
 
@@ -1370,8 +1546,8 @@ sub end_strike {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring=&Apache::lonxml::endredirection();
-	$currentstring=~s/(\S)(\s+)(\S)/$1\}$2\\underline\{$3/g; 
-	$currentstring=~s/^\s*(\S)/\\underline\{$1/; 
+	$currentstring=~s/(\S)(\s+)(\S)/$1\}$2\\underline\{$3/g;
+	$currentstring=~s/^\s*(\S)/\\underline\{$1/;
 	$currentstring=~s/(\S)\s*$/$1\}/;
     }
     return $currentstring;
@@ -1385,7 +1561,7 @@ sub start_s {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	&Apache::lonxml::startredirection();
-    } 
+    }
     return $currentstring;
 }
 
@@ -1410,8 +1586,8 @@ sub start_sub {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\ensuremath{_{';
-    } 
+	$currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{';
+    }
     return $currentstring;
 }
 
@@ -1433,8 +1609,8 @@ sub start_sup {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\ensuremath{^{';
-    } 
+	$currentstring .= '\raisebox{\smallskipamount}{\scriptsize{';
+    }
     return $currentstring;
 }
 
@@ -1456,6 +1632,27 @@ sub start_hr {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
+
+	# <hr /> can't be inside of <sup><sub> thank you LaTeX.
+	#
+	my $restart_sub = 0;
+	my $restart_sup = 0;
+
+	# Since <sub> and <sup> are simple tags it's ok to turn off/on
+	# using the start_ stop_ functions.. those tags only care about
+	# $target.
+
+	if (&is_inside_of($tagstack, "sub")) {
+	    $restart_sub = 1;
+	    $currentstring .= &end_sub($target, $token, $tagstack,
+				       $parstack, $parser, $safeeval);
+	}
+	if (&is_inside_of($tagstack, "sup")) {
+	    $restart_sup = 1;
+	    $currentstring .= &end_sup($target, $token, $tagstack,
+				       $parstack, $parser, $safeeval);
+	}	
+
 	my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
 	if (defined $LaTeXwidth) {
 	    if ($LaTeXwidth=~/^%/) {
@@ -1476,7 +1673,17 @@ sub start_hr {
 	}
 	$currentstring .= ' \vskip 0 mm \noindent\makebox['.$LaTeXwidth.']{'.$pre.'\makebox['.
                                     $LaTeXwidth.'][b]{\hrulefill}'.$post.'}\vskip 0 mm ';
-    } 
+	# Turn stuff back on that we can't be inside of.
+
+	if ($restart_sub) {
+	    $currentstring .= &start_sub($target, $token, $tagstack,
+					$parstack, $parser, $safeeval);
+	}
+	if ($restart_sup) {
+	    $currentstring .= &start_sup($target, $token, $tagstack,
+					 $parstack, $parser, $safeeval);
+	}	
+    }
     return $currentstring;
 }
 
@@ -1503,9 +1710,12 @@ sub start_div {
     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-.
+        # If inside a table row, we must let the table logic
+	# do the alignment, however.
+	#
 
 	my $endstring = '';
 
@@ -1516,6 +1726,7 @@ sub start_div {
 	    $endstring      = '\end{center}';
 	    if (&is_inside_of($tagstack, "table")) {
 		$currentstring = &center_correction().$currentstring;
+		$endstring    .= &center_end_correction();
 	    }
 	}
 	elsif ($align eq 'right') {
@@ -1556,17 +1767,35 @@ sub start_a {
 	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
 					    undef,1);
 	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
-    } elsif ($target eq 'tex') {
-	my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
-	my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
-	if ($a=~/\S/) {
-	    $a=~s/([^\\])%/$1\\\%/g;
-	    $currentstring .= '\ref{URI: '.$a.'}';
-	} elsif ($b=~/\S/) {
-	    $currentstring .= '\ref{Anchor: '.$b.'}';
-	} else {
-	    $currentstring.='';
-	}
+        if ($href =~ /\S/) {
+            if ($href !~ m{^https?://}) {
+                my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+                my $linkurl;
+                if ($href =~ m{^/uploaded/}) {
+                    $linkurl = $href;
+                } elsif ($href =~ m{^[^/]}) {
+                    my $path = $url;
+                    $path  =~ s{[^/]*$}{};
+                    $linkurl = $path.$href;
+                }
+                if ($linkurl =~ m{^/uploaded/}) {
+                    if (!&Apache::lonnet::allowed('bre',$linkurl)) {
+                        if (&Apache::lonnet::is_on_map($url)) {
+                            &Apache::lonxml::extlink($linkurl);
+                        } elsif ($env{'request.course.id'}) {
+                            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                            if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/(docs|supplemental)/)}) {
+                                my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum);
+                                if ($cleanhref) {
+                                    &Apache::lonxml::extlink($cleanhref);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
     return $currentstring;
 }
@@ -1577,6 +1806,28 @@ sub end_a {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring .= $token->[2];
     }
+    if ($target eq 'tex') {
+	my $href =
+	    &Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
+	my $name =
+	    &Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
+        my $uriprint =
+            &Apache::lonxml::get_param('uriprint',$parstack,$safeeval,undef,1);
+        my $anchorprint =
+            &Apache::lonxml::get_param('anchorprint',$parstack,$safeeval,undef,1);
+	if (($href =~ /\S/) && ($uriprint=~/^on|uriprint|yes|1$/i)) {
+	    $href =~ s/([^\\])%/$1\\\%/g;
+	    # Substitute special symbols... and allow line breaks at each /
+	    #
+	    $href = &Apache::lonxml::latex_special_symbols($href);
+	    $href =~ s/\//\/\\-/g;              # Map / to /\- to allow hyphenation.
+	    $currentstring .= ' ({\tt URI:'.$href.'})';
+	} elsif (($name =~ /\S/) && ($anchorprint=~/^on|anchorprint|yes|1$/i)) {
+	    $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
+	} else {
+	    $currentstring.='';
+	}	
+    }
     return $currentstring;
 }
 
@@ -1585,11 +1836,11 @@ sub start_li {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
 	my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0);
-	#FIXME need to support types i and I 
+	#FIXME need to support types i and I
 	if ($type=~/disc/) {
 	    $currentstring .= ' \item[$\bullet$] ';
 	} elsif ($type=~/circle/) {
@@ -1606,7 +1857,7 @@ sub start_li {
 	    $currentstring .= ' \item['.$value.'] ';
 	} else {
 	    $currentstring .= ' \item ';
-	}  
+	}
 	$Apache::londefdef::list_index++;
     }
     return $currentstring;
@@ -1616,8 +1867,8 @@ sub end_li {
     my ($target,$token) = @_;
     my $currentstring = &end_p();	# In case there's a <p> in the <li>
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[2];     
-    } 
+	$currentstring .= $token->[2];
+    }
     return $currentstring;
 }
 
@@ -1629,7 +1880,7 @@ sub start_u {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	&Apache::lonxml::startredirection();
-    } 
+    }
     return $currentstring;
 }
 
@@ -1652,28 +1903,28 @@ sub start_ul {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = &end_p();	# Close off enclosing list.
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[4];     
+	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
 	$Apache::londefdef::list_index=0;
 	if ($TeXtype eq 'disc') {
 	    $currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'.
-                              '\renewcommand{\labelitemii}{$\bullet$}'. 
+                              '\renewcommand{\labelitemii}{$\bullet$}'.
                               '\renewcommand{\labelitemiii}{$\bullet$}'.
                               '\renewcommand{\labelitemiv}{$\bullet$}';
 	} elsif ($TeXtype eq 'circle') {
 	    $currentstring .= '\renewcommand{\labelitemi}{$\circ$}'.
-                              '\renewcommand{\labelitemii}{$\circ$}'. 
+                              '\renewcommand{\labelitemii}{$\circ$}'.
                               '\renewcommand{\labelitemiii}{$\circ$}'.
                               '\renewcommand{\labelitemiv}{$\circ$}';
 	} elsif ($TeXtype eq 'square') {
 	    $currentstring .= '\renewcommand{\labelitemi}{$\diamond$}'.
-                              '\renewcommand{\labelitemii}{$\diamond$}'. 
+                              '\renewcommand{\labelitemii}{$\diamond$}'.
                               '\renewcommand{\labelitemiii}{$\diamond$}'.
                               '\renewcommand{\labelitemiv}{$\diamond$}';
 	}
-	$currentstring .= '\strut \begin{itemize}';  
-    } 
+	$currentstring .= '\strut \begin{itemize}';
+    }
     return $currentstring;
 }
 
@@ -1681,13 +1932,13 @@ sub end_ul {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'.
-                               '\renewcommand{\labelitemii}{$\bullet$}'. 
+                               '\renewcommand{\labelitemii}{$\bullet$}'.
                                '\renewcommand{\labelitemiii}{$\bullet$}'.
-                               '\renewcommand{\labelitemiv}{$\bullet$}\strut ';  
-    } 
+                               '\renewcommand{\labelitemiv}{$\bullet$}\strut ';
+    }
     return $currentstring;
 }
 
@@ -1696,10 +1947,10 @@ sub start_menu {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring = " \\begin{itemize} ";  
-    } 
+	$currentstring = " \\begin{itemize} ";
+    }
     return $currentstring;
 }
 
@@ -1707,10 +1958,10 @@ sub end_menu {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring = " \\end{itemize}";  
-    } 
+	$currentstring = " \\end{itemize}";
+    }
     return $currentstring;
 }
 
@@ -1719,10 +1970,10 @@ sub start_dir {
     my ($target,$token) = @_;
     my $currentstring = &end_p();	# In case there's a <p> prior to the list.
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[4];     
+	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= " \\begin{itemize} ";  
-    } 
+	$currentstring .= " \\begin{itemize} ";
+    }
     return $currentstring;
 }
 
@@ -1730,10 +1981,10 @@ sub end_dir {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring = " \\end{itemize}";  
-    } 
+	$currentstring = " \\end{itemize}";
+    }
     return $currentstring;
 }
 
@@ -1742,18 +1993,18 @@ sub start_ol {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = &end_p();	# In case there's a <p> prior to the list.
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[4];     
+	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::list_index=0;
 	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
 	if ($type eq '1') {
 	    $currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'.
-                              '\renewcommand{\labelenumii}{\arabic{enumii}.}'. 
+                              '\renewcommand{\labelenumii}{\arabic{enumii}.}'.
                               '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
                               '\renewcommand{\labelenumiv}{\arabic{enumiv}.}';
 	} elsif ($type eq 'A') {
 	    $currentstring .= '\renewcommand{\labelenumi}{\Alph{enumi}.}'.
-                              '\renewcommand{\labelenumii}{\Alph{enumii}.}'. 
+                              '\renewcommand{\labelenumii}{\Alph{enumii}.}'.
                               '\renewcommand{\labelenumiii}{\Alph{enumiii}.}'.
                               '\renewcommand{\labelenumiv}{\Alph{enumiv}.}';
 	} elsif ($type eq 'a') {
@@ -1772,8 +2023,8 @@ sub start_ol {
                               '\renewcommand{\labelenumiii}{\Roman{enumiii}.}'.
                               '\renewcommand{\labelenumiv}{\Roman{enumiv}.}';
 	}
-	$currentstring .= '\strut \begin{enumerate}';  
-    } 
+	$currentstring .= '\strut \begin{enumerate}';
+    }
     return $currentstring;
 }
 
@@ -1781,13 +2032,13 @@ sub end_ol {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'.
                                         '\renewcommand{\labelenumii}{\arabic{enumii}.}'.
                                         '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
-                                        '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut ';  
-    } 
+                                        '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut ';
+    }
     return $currentstring;
 }
 
@@ -1796,7 +2047,7 @@ sub start_dl {
     my ($target,$token) = @_;
     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];     
+	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\begin{description}';
 	$Apache::londefdef::DL++;
@@ -1804,7 +2055,7 @@ sub start_dl {
 	$Apache::londefdef::DD[$Apache::londefdef::DL]=0;
 	$Apache::londefdef::DT[$Apache::londefdef::DL]=0;
 	$Apache::londefdef::seenDT[$Apache::londefdef::DL]=0;
-    } 
+    }
     return $currentstring;
 }
 
@@ -1812,7 +2063,7 @@ sub end_dl {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
 	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
 	if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
@@ -1820,12 +2071,12 @@ sub end_dl {
 	    $currentstring.=' '.$element.' ';
 	}
 	pop(@Apache::londefdef::description);
-	$currentstring.='\end{description}';  
+	$currentstring.='\end{description}';
 	delete($Apache::londefdef::DD[$Apache::londefdef::DL]);
 	delete($Apache::londefdef::DT[$Apache::londefdef::DL]);
 	delete($Apache::londefdef::seenDT[$Apache::londefdef::DL]);
 	$Apache::londefdef::DL--;
-    } 
+    }
     return $currentstring;
 }
 
@@ -1834,14 +2085,14 @@ sub start_dt {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring='';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
 	if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
 	&Apache::lonxml::startredirection();
 	$Apache::londefdef::DT[-1]++;
 	$Apache::londefdef::seenDT[-1]=1;
-    } 
+    }
     return $currentstring;
 }
 
@@ -1849,21 +2100,21 @@ sub end_dt {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
 	if ($Apache::londefdef::DT[-1]) {
 	    my $data=&item_cleanup();
 	    push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm');
 	    $Apache::londefdef::DT[-1]--;
 	}
-    } 
+    }
     return $currentstring;
 }
 
 sub item_cleanup {
     my $item=&Apache::lonxml::endredirection();
-    $item=~s/\\begin{center}//g;
-    $item=~s/\\end{center}//g;
+    $item=~s/\\begin\{center}//g;
+    $item=~s/\\end\{center}//g;
     return $item;
 }
 
@@ -1872,7 +2123,7 @@ sub start_dd {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
 	if ($Apache::londefdef::DD[-1]) { &end_dd(@_);}
@@ -1883,7 +2134,7 @@ sub start_dd {
 	$Apache::londefdef::description[-1]->[-1].=' \strut ';
 	$Apache::londefdef::DD[-1]++;
 	&Apache::lonxml::startredirection();
-    } 
+    }
     return $currentstring;
 }
 
@@ -1891,7 +2142,7 @@ sub end_dd {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
+	$currentstring = $token->[2];
     }  elsif ($target eq 'tex') {
 	$Apache::londefdef::description[-1]->[-1].=
 	    &Apache::lonxml::endredirection().' \vskip 0mm ';
@@ -1903,453 +2154,100 @@ 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 
+#               only way I could think of to allow <p> in
 #               <tr> <th> bodies
 #
-#list of supported attributes: border,width,TeXwidth
+#list of supported attributes: border,width,TeXwidth,TeXtheme
+#                              align
 sub start_table {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $textwidth = '';
     my $currentstring = &end_p();
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[4];     
+	$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=~/(\d+\.?\d*)/;
-	    $textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame
-	} else {
-	    if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) {
-		#the maximum width of nested table is determined by LATeX width of parent cell
-		$textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]; 
-	    } else {
-              #try to use all space not used before (minus 5% for LaTeX table internal) - rather silly
-		$textwidth=$Apache::londefdef::table[-2]{'width'};
-		for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) {
-		    $textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i];
-		}
+	&disable_para();	# Can't have paras in a table.
+
+	#  Get the parameters that we can do something about:
+
+	my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0);
+	my $width  = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0);
+	my $theme  = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0);
+	my $align  = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0);
+	my $cell_border = &Apache::lonxml::get_param('rules', $parstack, $safeeval, undef, 0);
+
+	# The only thing that needs any figuring out is the width.. and then only if it is
+	# a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm
+	#
+
+	my $table = new Apache::lontable();
+	if ((defined $border) && ($border > 0)) {
+	#    &Apache::lonnet::logthis("Turning on table borders: $border");
+	    $table->table_border(1);
+	    if (!defined $cell_border) {
+		$table->cell_border(1); # Default for rules is all if rules not defined.
 	    }
 	}
 
-	# 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 (!defined($TeXwidth)) {
-	    my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,
-						       $safeeval,undef,1);
-	    if ($htmlwidth =~ /%/) {
-		$TeXwidth = $htmlwidth;
-	    } else { 
-		$TeXwidth = $textwidth;
+	if ((defined $cell_border)) {
+	    if ($cell_border eq 'all') {
+		$table->cell_border(1);
+	    } elsif ($cell_border eq 'rows') {
+		$table->cell_border(2);
+	    } elsif ($cell_border eq 'cols') {
+		$table->cell_border(3);
+	    } elsif($cell_border eq 'groups') {
+		$table->cell_border(4);
+	    } else {
+		$table->cell_border(0);
 	    }
-	} 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]{'width'}=$TeXwidth;
+	if (defined $theme) {
+	    $table->theme($theme);
 	}
-        #  In the end, however the table width cannot be wider than $textwidth...
-	
-	if ($Apache::londefdef::table[-1]{'width'} > $textwidth) {
-	    $Apache::londefdef::table[-1]{'width'} = $textwidth;
+	if (defined $align) {
+	    $table->alignment($align);
 	}
 
-        #table's border
-	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); 
-        my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
-	unless (defined $border) { $border = 0; }
-	if ($border) { 
-	    $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
-	    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
-	    $Apache::londefdef::table[-1]{'vvinc'} = '|';
-	} else {
-	    $Apache::londefdef::table[-1]{'hinc'} = ''; 
-	    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
-	    $Apache::londefdef::table[-1]{'vvinc'} = '';
+	# Missing width is most of page width
+
+	if (!(defined $width)) {
+	    $width = '70%';
 	}
-	if ($#Apache::londefdef::table==0) {
-	    #    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}';
+
+	# If a percentage, need to calculate what this means in terms of
+	# page width:
+	
+	if ($width =~ /%$/) {
+	    my $textwidth = &recalc($env{'form.textwidth'});  # Page width in mm.
+	    $width =~ s/%//;
+	    $width = $width * $textwidth / 100.0;
+	    $width .= " mm";
+	    $table->width($width);
 	}
-	$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';
-        $Apache::londefdef::table[-1]{'TeXlen'}=[];
-        $Apache::londefdef::table[-1]{'objectlen'}=[];
-        $Apache::londefdef::table[-1]{'objectsignal'}=[];
-        $Apache::londefdef::table[-1]{'maxlen'}=[];
-        $Apache::londefdef::table[-1]{'minlen'}=[];
-        $Apache::londefdef::table[-1]{'content'}=[];
-        $Apache::londefdef::table[-1]{'align'}=[];
-        $currentstring.='\keephidden{NEW TABLE ENTRY}';
 
+	push(@Apache::londefdef::table, $table);
+        $currentstring.=' \keephidden{NEW TABLE ENTRY}';
 
     }
     return $currentstring;
 }
- 
+
 sub end_table {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$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]) {
-		    $Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]=$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn];
-		}	
-	    }
-	}
-        #free space and number of empty columns
-	my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0);
-	if ($#Apache::londefdef::table ne 0) {$available_space=0.9*$available_space;} 
-	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
-	    if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) {
-		$empty_columns++;
-	    } else {
-		$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];
-	    }
-	}
-        #boundaries for contents columns
-	my @min_len=();#columns can not be narrower 
-	my @max_len=();#maximum length of column
-	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
-		my ($localmin,$localmax)=(0,0);
-		for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
-		    if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) {
-			$localmin=$Apache::londefdef::table[-1]{'minlen'}[$in][$jn];
-		    }
-		    if ($localmax<$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn]) {
-			$localmax=$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn];
-		    }
-		}
-		push @min_len, $localmin;
-		push @max_len, $localmax;
-	}
-	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
-	    my $localmin=0,;
-	    for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
-		if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {
-		    $localmin=$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn];
-		}
-	    }
-	    if ($max_len[$jn]<$localmin) {
-		$max_len[$jn]=$localmin;
-	    	$Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
-	    }#object size is bigger
-	    if ($min_len[$jn]<$localmin) {
-		$min_len[$jn]=$localmin;
-		$Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
-	    }#object size is bigger
-	    if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) {
-		$min_len[$jn]=0;
-		$max_len[$jn]=0;
-	    }
-	}
-       #final adjustment of column width
-	my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
-	my @adjust=();
-        #step 1. adjustment by maximum value
-	my $space_neeeded=0;
-	for (my $jn=0;$jn<=$#max_len;$jn++) {
-	    $space_neeeded=$space_neeeded+$max_len[$jn];
-	}
-	if ($space_neeeded<=$available_space) {
-	    for (my $jn=0;$jn<=$#max_len;$jn++) {
-		if ($fwidth[$jn]==0) {
-		    $fwidth[$jn]=$max_len[$jn];
-		}
-	    }
-	} else {
-        #step 2. adjustment by minimum value (estimation)
-	    $space_neeeded=0;
-	    for (my $jn=0;$jn<=$#min_len;$jn++) {
-		$space_neeeded+=$min_len[$jn];
-	    }
-	    if ($space_neeeded>$available_space) {
-		$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
-		for (my $jn=0;$jn<=$#max_len;$jn++) {
-		    if ($fwidth[$jn]==0) {
-			$fwidth[$jn]=$min_len[$jn];
-		    }
-		}
-		#check if we have objects which can be scaled
-		my $how_many_to_scale=0;
-		my @to_scale=();
-		for (my $jn=0;$jn<=$#max_len;$jn++) {
-		    if ($Apache::londefdef::table[-1]{'objectsignal'}[$jn] eq '1') {
-			$how_many_to_scale++;
-			push @to_scale, $jn;
-		    }
-		}
-		if ($how_many_to_scale>0) {
-		    my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale;
-		    foreach my $jn (@to_scale) {
-			for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
-			    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/;
-			    if ($1 ne '') {
-				my $current_length=&recalc($1);
-				$current_length=~/(\d+\.?\d*)/;
-				$current_length=$current_length-$space_to_adjust;
-				$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/width=$current_length mm/;
-			    }
-			    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/\[(\d+\.?\d*)\s*mm\]/;
-			    if ($1 ne '') {
-				my $current_length=$1;
-				$current_length=$current_length-$space_to_adjust;
-				$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/\[(\d+\.?\d*)\s*mm\]/\[$current_length mm\]/;
-			    }				
-			}
-			$fwidth[$jn]=$fwidth[$jn]-$space_to_adjust;
-		    }
-		}
-	    } else {
-	      #step 3. adjustment over minimal + corrections
-		my $enlarge_coef=$available_space/$space_neeeded;
-		my $acsessive=0;
-		for (my $jn=0;$jn<=$#min_len;$jn++) {
-		    $adjust[$jn]=$min_len[$jn]*$enlarge_coef;
-		    if ($adjust[$jn]>$max_len[$jn]) {
-			$fwidth[$jn]=$max_len[$jn];
-			$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];
-			$adjust[$jn]=0;
-		    }
-		}
-		if ($acsessive>0) {
-		#we have an excess of space and can redistribute it
-		    my $notempty_columns=0;
-		    for (my $jn=0;$jn<=$#min_len;$jn++) {
-			if ($adjust[$jn]!=0) {
-			    $notempty_columns++;
-			}
-		    }
-		    my $per_column=$acsessive/$notempty_columns;
-		    for (my $jn=0;$jn<=$#min_len;$jn++) {
-			if ($adjust[$jn]!=0) {
-			    $adjust[$jn]+=$per_column;
-			    $fwidth[$jn]=$adjust[$jn];
-			}
-		    }
-		} else {
-		    for (my $jn=0;$jn<=$#min_len;$jn++) {
-			$fwidth[$jn]=$adjust[$jn];
-		    }
-		}
-	    }
-	}
-        #use all available width if it is defined in % or as TeXwidth
-        if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) {
-	    my $current=0; 
-	    for (my $i=0;$i<=$#fwidth;$i++) {  
-		$current+=$fwidth[$i];
-	    }
-	    my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
-	    for (my $i=0;$i<=$#fwidth;$i++) {  
-		$fwidth[$i]*=$coef;
-	    }
-	}
-        #removing of empty columns if allowed
-        my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
-	if ($permission eq 'yes') {
-	    my @cleaned_table=();
-            my @cleaned_header=();
-	    my $colind=0;
-	    for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
-		if ($fwidth[$jn]!=0) {
-		    #we need to copy column
-		    for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
-			$cleaned_table[$in][$colind]=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
-			$cleaned_header[$colind]=$fwidth[$jn];
-		    }
-		    $colind++;
-		}
-	    }
-	    $Apache::londefdef::table[-1]{'content'}=\@cleaned_table;
-	    @fwidth=@cleaned_header;
-	}
-	#construct header of the table
-	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
-	for (my $in=0;$in<=$#fwidth;$in++) {
-	    $header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'};
-	}
-	$header_of_table .= '}';
-	#fill the table
-	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
-	    my $have_rowspan = 0;
-	    for (my $jn=0;$jn<=$#fwidth;$jn++) {
-
-		#-----------------------------------------------------------
-                #   I think this order of doing things will ensure that
-		#   single rowspan, columspan and combined row/colspans will
-                #   work correctly.  LaTeX is delicate here.
-		#    RF.
-
-		# Start a rowspan if necessary:
-
-		my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
-		my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn];
-		#
-		#  Do the appropriate magic if this has a colspan
-		# 
-
-		if ($colspan > 1) {
-		    my $spanwidth = 0;
-		    for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
-			$spanwidth += $fwidth[$spancol];
-		    }
-		    $output .= '\multicolumn{'.
-			$colspan
-			."}";
-		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-			$output .= '{|c|}{';
-		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
-			$output .= '{|r|}{';
-		    }
-		    else {
-			$output .= "{|p{$spanwidth mm}|}{";
-		    }
-			
-		}
-
-		# Rowspan... if colspan is 1, and there's an alignment we'll need
-		# to kick in a multicolumn in order to get the alignment spec.
-		# this must precede the multirow or LaTex gets quite upset.
-		# Naturally if colspan > 1 we've already done that above ^
-		#
-		my $multirow_aligned = 0;
-		if ($rowspan > 1) {
-		    if ($colspan == 1) {
-			if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-			    $output .= '\multicolumn{1}{|c|}{';
-			    $multirow_aligned = 1;
-			} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
-			    $output .= '\multicolumn{1}{|r|}{';
-			    $multirow_aligned = 1;
-			}
-		    }
-		    $have_rowspan++;
-		    $output .= '\multirow{'.$rowspan.'}[0]{*}{';
-		    #
-		    # If we did not throw in a multicolumn to align, then add 
-		    # an extra {
-		    # so we close correctly without having to keep additional state
-		    # around
-		    #
-		    if (!$multirow_aligned) {
-			$output .= '{';
-		    }
-		}
-		if (($rowspan eq '^') || ($rowspan eq '_')) {
-		    $have_rowspan++;
-		}
-		#--------------------------------------------------------------
-
-
-		# For right and center alignment of single cells.
-		# we are going to use a multicolumn with a span of 1 to specify alignment.
-		#
-		if ($colspan == 1  && $rowspan == 1) {
-		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-			$output .= '\multicolumn{1}{|c|}{';
-		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
-			$output .= '\multicolumn{1}{|r|}{';
-		    }
-		}
-
-		$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
-
-		if (($colspan == 1 && $rowspan == 1)   &&
-		    (($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') ||
-		     ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r'))) {
-		    $output .= '}';
-		}
-
-		# Close off any open multirow:
-		
-		if ($rowspan > 1) {
-		    $output .= '}}';
-		}
-		#  Close off the colspan...
-		#
-		if ($colspan > 1)  {
-		    $output .= '}';
-		    $jn += $colspan-1; # Adjust for number of rows really left.
-		}
-                if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}
-	    }
-	    #  If have_rowspan > 0, and borders are on, then 
-	    #  we need to do more than put an \hline at the bottom of row.
-	    #  we need to do the appropriate \cline to ensure that
-	    #  the spanned rows don't have \hlines through them.
-
-	    if (($Apache::londefdef::table[-1]{'hinc'} =~ /\\hline/) && $have_rowspan) {
-		$output .= ' \\\\ ';
-		for (my $jn=0; $jn<=$#fwidth;$jn++) {
-		    my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
-		    if ($rowspan ne "^") {
-			if (($rowspan <= 1) || ($rowspan eq '_')) {
-			    my $column = $jn+1;
-			    $output .= '\cline{'.$column.'-'.$column.'} ';
-			}
-		    }
-		}
-
-	    } else {
-		$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
-	    }
-	}
-	# 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 {
-	    $currentstring .= $Apache::londefdef::table[-1]{'output'};
-	    pop @Apache::londefdef::table;
-	    undef @Apache::londefdef::table;
-	}
+	
+	
+	my $table = pop(@Apache::londefdef::table);
+	my $t     = $table->generate();
+	# &Apache::lonnet::logthis("Generating string");
+	$currentstring = $t->generate_string();
+	# &Apache::lonnet::logthis("Generated: $currentstring");
+	&enable_para();
+	
     }
     return $currentstring;
 }
@@ -2359,8 +2257,21 @@ sub start_tr {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
+
+	my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1);
+	$Apache::londefdef::table[-1]->start_row();
+	
+	if ($align ne '') {
+	    $Apache::londefdef::table[-1]->configure_row({default_halign => $align});
+	}
+
+	#---------------------------------------------------------------
+	# Old table code.
+	#---------------------------------------------------------------
+
+	if (0) {
 	$Apache::londefdef::table[-1]{'row_number'}++;
 	my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
 	if ($alignchar ne '') {
@@ -2379,25 +2290,39 @@ sub start_tr {
 	push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];
 	push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
 	push @ {$Apache::londefdef::table[-1]{'content'}}, [];
-    } 
+    }
+    }
     return $currentstring;
 }
-        
+
 sub end_tr {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = &end_p();	# Close any pending <p> in the row.
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[2];     
+	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
+
+	# In case the user is missing a </td> or </th> tag:
+
 	if ($Apache::londefdef::TD_redirection) {
-	    &end_td_tex($parstack,$parser,$safeeval);    
+	    &end_td_tex($parstack,$parser,$safeeval);
+	}
+	$Apache::londefdef::table[-1]->end_row();
+
+	#-----------------------------------------------
+	# Old table code
+	#-----------------------------------------------
+
+	if (0) {
+	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'};
 	}
-
+    }
 
 	
     }
@@ -2409,17 +2334,17 @@ sub start_td {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::TD_redirection = 1;
 	&tag_check('tr','td',$tagstack,$parstack,$parser,$safeeval);
-    } 
+    }
     return $currentstring;
-}   
-    
+}
+
 sub tag_check {
     my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my @ar=@$parstack; 
+    my @ar=@$parstack;
     for (my $i=$#ar-1;$i>=0;$i--) {
 	if (lc($$tagstack[$i]) eq $good_tag) {
 	    &start_td_tex($parstack,$parser,$safeeval);
@@ -2433,9 +2358,59 @@ sub tag_check {
     }
     return '';
 }
- 
+
+#
+#  Factor out cell configuration hash generation:
+#
+
+sub cell_config_hash {
+    my ($align, $rowspan, $colspan, $width) = @_;
+    if ($rowspan ne '') {
+        $rowspan =~ s/^\s+|\s+$//g;
+    }
+    if ($colspan ne '') {
+        $colspan =~ s/^\s+|\s+$//g;
+    }
+    my %config;
+    if ($align ne '') {
+	$config{'halign'} = $align;
+    }
+    if (($colspan =~ /^\d+$/) && ($colspan > 0)) {
+	$config{'colspan'} = $colspan;
+    }
+    if (($rowspan =~ /^\d+$/) && ($rowspan > 0)) {
+	$config{'rowspan'} = $rowspan;
+    }
+    if ($width ne '') {
+	$config{'width'} = $width;
+    }
+    return \%config;
+}
+
 sub start_td_tex {
     my ($parstack,$parser,$safeeval) = @_;
+
+    # At this stage, an empty cell is created with the
+    # appropriate rowspan/colspan and alignment
+    # attributes, but empty of text.  end_td_tex will
+    # fetch the contents from the recursive parse and
+    # fill the cell with them:
+    my $align   = &Apache::lonxml::get_param('align', $parstack, $safeeval);
+    my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval);
+    my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval);
+    my $width   = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval);
+    my $config = &cell_config_hash($align, $rowspan, $colspan, $width);
+
+    my $table = $Apache::londefdef::table[-1];
+    $table->add_cell('', $config);
+
+
+    #------------------------------------------------
+    #  Old table code.
+    #------------------------------------------------
+
+    if (0) {
+
     my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
     if ($alignchar eq '') {
 	$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];
@@ -2448,14 +2423,25 @@ sub start_td_tex {
 	$current_length=~/(\d+\.?\d*)/;
 	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;
     }
+    }
     &Apache::lonxml::startredirection();
     return '';
 }
 
 sub end_td_tex {
+
+    my $text = &Apache::lonxml::endredirection();
+    my $table = $Apache::londefdef::table[-1];
+    $table->append_cell_text($text);
+
+    #-------------------------------------------------
+    # Old table code
+    #-------------------------------------------------
+
+    if (0) {
     my ($parstack,$parser,$safeeval) = @_;
     my $current_row    = $Apache::londefdef::table[-1]{'row_number'};
-    my $current_column = $Apache::londefdef::table[-1]{'counter_columns'}; 
+    my $current_column = $Apache::londefdef::table[-1]{'counter_columns'};
     my $data = &Apache::lonxml::endredirection();
 
     #  The rowspan array of the table indicates which cells are part of a span.
@@ -2465,14 +2451,14 @@ sub end_td_tex {
     #  If this and subsequent cells are part of a rowspan, we must
     #  push along the row until we find one that is not.
 
-    while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column]) 
+    while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column])
 	   && ($Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] =~ /[\^\_]/)) {
 	# Part of a span.
 	push @ {$Apache::londefdef::table[-1]{'content'}[-1]}, '';
 	$current_column++;
     }
     $Apache::londefdef::table[-1]{'counter_columns'} = $current_column;
-   
+
 
     # Get the column and row spans.
     # Colspan can be done via \multicolumn if I can figure out the data structs.
@@ -2501,9 +2487,11 @@ sub end_td_tex {
 
     my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
     if (defined $TeXwidth) {		
-	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	for (my $c = 0; $c < $colspan; $c++) {
+	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	}
     } else {
 	if (($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) or ($data=~m/\[(\d+\.?\d*)\s*mm\]/)) {
 	    my $garbage_data=$data;
@@ -2519,10 +2507,12 @@ sub end_td_tex {
 		if ($fwidth<$current_length) {$fwidth=$current_length;}
 		$garbage_data=~s/\[(\d+\.?\d*)\s*mm\]//;
 	    }
-	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
-	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    for (my $c = 0; $c < $colspan; $c++) {
+		push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
+		push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    }
 	} elsif ($data=~/\\parbox\{\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*\s*\}/ or $data=~/\\epsfxsize\s*=\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*/) {
 	    my $garbage_data=$data;
 	    my $fwidth=0;
@@ -2538,13 +2528,15 @@ sub end_td_tex {
 		if ($fwidth<$1) {$fwidth=$1;}
 		$garbage_data=~s/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
 	    }
-	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
-	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    $data=~s/\\\\\s*$//; 
-	} else {  
-	    $data=~s/^\s+(\S.*)/$1/; 
+	    for (my $c = 0; $c < $colspan; $c++) {
+		push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
+		push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+	    }
+	    $data=~s/\\\\\s*$//;
+	} else {
+	    $data=~s/^\s+(\S.*)/$1/;
 	    $data=~s/(.*\S)\s+$/$1/;
 	    $data=~s/(\s)+/$1/;
 	    my ($current_length,$min_length)=(0,0);
@@ -2569,17 +2561,19 @@ sub end_td_tex {
 			if ($min_length<$lengthword) {$min_length=$lengthword;}
 		    }
 	    }
-	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;
-	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
-	}        
+	    for (my $c = 0; $c < $colspan; $c++) {
+		push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+		push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;
+		push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
+	    }
+	}
     }
     # 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++) {    
+    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]/;
@@ -2609,7 +2603,7 @@ sub end_td_tex {
 	
     }
 
-
+    }
 
     return '';
 }
@@ -2618,7 +2612,7 @@ sub end_td {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
         $Apache::londefdef::TD_redirection =0;
 	&end_td_tex($parstack,$parser,$safeeval);
@@ -2631,17 +2625,17 @@ sub start_th {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::TD_redirection = 1;
 	&tagg_check('tr','th',$tagstack,$parstack,$parser,$safeeval);
-    } 
+    }
     return $currentstring;
-}   
-    
+}
+
 sub tagg_check {
     my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my @ar=@$parstack; 
+    my @ar=@$parstack;
     for (my $i=$#ar-1;$i>=0;$i--) {
 	if (lc($$tagstack[$i]) eq $good_tag) {
 	    &start_th_tex($parstack,$parser,$safeeval);
@@ -2655,9 +2649,27 @@ sub tagg_check {
     }
     return '';
 }
- 
+
 sub start_th_tex {
     my ($parstack,$parser,$safeeval) = @_;
+
+    my $alignment = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef,1);
+    my $rowspan  =  &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1);
+    my $colspan  =  &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1);
+
+    my $config   = cell_config_hash($alignment, $rowspan, $colspan);
+    my $table    = $Apache::londefdef::table[-1];
+    $table->add_cell('\textbf{', $config);
+
+    #-------------------------------------------------------------------------------------
+    #
+    #  Old table code.
+    #
+    #--------------------------------------------------------------------------------------
+
+    if (0) {
+
+
     my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
     if ($alignchar eq '') {
 	$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];
@@ -2670,12 +2682,26 @@ sub start_th_tex {
 	$current_length=~/(\d+\.?\d*)/;
 	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;
     }
+    }
+
+    # Accept xml until the </th> tag.
+
     &Apache::lonxml::startredirection();
     return '';
 }
 
 sub end_th_tex {
     my ($parstack,$parser,$safeeval) = @_;
+
+    my $table = $Apache::londefdef::table[-1];
+    my $text  = &Apache::lonxml::endredirection();
+    $table->append_cell_text($text.'}');
+
+    #-----------------------------------------------------------------------------
+    #  Old table code:
+    #-----------------------------------------------------------------------------
+
+    if (0) {
     my $current_row = $Apache::londefdef::table[-1]{'row_number'};
     my $data=&Apache::lonxml::endredirection();
     my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
@@ -2702,8 +2728,8 @@ sub end_th_tex {
 	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
 	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
 	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
-	} else {  
-	    $data=~s/^\s+(\S.*)/$1/; 
+	} else {
+	    $data=~s/^\s+(\S.*)/$1/;
 	    $data=~s/(.*\S)\s+$/$1/;
 	    $data=~s/(\s)+/$1/;
 	    my ($current_length,$min_length)=(0,0);
@@ -2732,14 +2758,15 @@ sub end_th_tex {
 	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
 	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;
 	    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++) {         
+	for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {
 	    $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
 	}
     #make data bold
     $data='\textbf{'.$data.'}';
     push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
+    }
     return'';
 }
 
@@ -2747,60 +2774,53 @@ sub end_th {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = &end_p();	# Close any open <p> in the row.
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[2];     
+	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
         $Apache::londefdef::TD_redirection =0;
 	&end_th_tex($parstack,$parser,$safeeval);
     }
     return $currentstring;
 }
-     
+
 #-- <img> tag (end tag forbidden)
 #
 #  Render the <IMG> tag.
-#     <IMG> has the following attributes (in addition to the 
+#     <IMG> has the following attributes (in addition to the
 #     standard HTML ones:
 #      TeXwrap   - Governs how the tex target will try to wrap text around
 #                  horizontally aligned images.
 #      TeXwidth  - The width of the image when rendered for print (mm).
 #      TeXheight - The height of the image when rendered for print (mm)
 #         (Note there seems to also be support for this as a % of page size)
-#      
+#
 sub start_img {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
 					 undef,1);
-    if (! $src && 
+    if (! $src &&
 	($target eq 'web' || $target eq 'webgrade' || $target eq 'tex')
-	) { 
+	) {
 	my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);
 	return '';
     }
-    &Apache::lonxml::extlink($src);
+    unless ($src =~ m{^data\:image/gif;base64,}) {
+        &Apache::lonxml::extlink($src);
+    }
     my $currentstring = '';
     my $scaling = .3;
 
    # Render unto browsers that which are the browser's...
 
     if ($target eq 'web' || $target eq 'webgrade') {
-	if ($env{'browser.imagesuppress'} ne 'on') {
-	    my $enc = ('yes' eq 
-		       lc(&Apache::lonxml::get_param('encrypturl',$parstack,
-						     $safeeval)));
-	    $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
-							 $enc);
-	} else {
-	    my $alttag = &Apache::lonxml::get_param('alt',$parstack,$safeeval,
-						    undef,1);
-	    if (!$alttag) {
-		$alttag = &Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],
-						   $src);
-	    }
-	    $currentstring.='[IMAGE: '.$alttag.']';
-	}
-
-	# and render unto TeX that which is LaTeX
+        my $enc = ('yes' eq
+                   lc(&Apache::lonxml::get_param('encrypturl',$parstack,
+                      $safeeval)));
+        unless ($src =~ m{^data\:image/gif;base64,}) {
+            $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
+                            $enc);
+        }
 
+    # and render unto TeX that which is LaTeX
     } elsif ($target eq 'tex') {
 	#
 	#  The alignment will require some superstructure to be put around
@@ -2808,7 +2828,7 @@ sub start_img {
 	#  simulate the alignments offered by html.
 	#
 	#
-	my $align = lc(&Apache::lonxml::get_param('align', 
+	my $align = lc(&Apache::lonxml::get_param('align',
 						  $parstack,
 						  $safeeval,
 						  undef,1));
@@ -2818,7 +2838,7 @@ sub start_img {
 	#
 	&Apache::lonxml::debug("Alignemnt = $align");
 	#  LaTeX's image/text wrapping is really bad since it wants to
-	#  make figures float.  
+	#  make figures float.
         #   The user has the optional parameter (applicable only to l/r
 	# alignment to use the picins/parpic directive to get wrapped text
 	# this is also imperfect.. that's why we give them a choice...
@@ -2841,62 +2861,39 @@ sub start_img {
 
 	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
 
-	#if original gif/jpg/png file exist do following:
+	#if original bmp/gif/jpg/png/svg file exist do following:
 	my $origsrc=$src;
 	my ($path,$file) = &get_eps_image($src);
+	# &Apache::lonnet::logthis("Image source: $src result: $path $file");
 	$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($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]'; }
+	    # Default size if not able to extract that (e.g. eps image).
+
+	    # &Apache::lonnet::logthis("Size = $size");
+
 	    $size='['.$size;
-	    $size=~s/,$/]/; 
-	    $currentstring .= '\graphicspath{{'.$destpath.'}}'
-		.'\includegraphics'.$size.'{'.$destfile.'} ';
-
-	    #    If there's an alignment specification we need to honor it here.
-	    #    For the horizontal alignments, we will also honor the
-	    #    value of the latex specfication.  The default is parbox,
-	    #    and that's used for illegal values too.  
-	    #    
-	    #    Even though we set a default alignment value, the user
-	    #    could have given us an illegal value.  In that case we
-	    #    just use the default alignment of bottom..
-	    if      ($align eq "top")    {
-		$currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}';
-	    } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
-		my $offset = $height_param/2;
-		$currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}';
-	    } elsif ($align eq "left")   { 
-		if ($latex_rendering eq "parpic") { 
-		    $currentstring = '\parpic[l]{'.$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 {	                                 # wrapfig rendering
-		    $currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}'
-			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
+	    $size=~s/,$/]/;
+	    $currentstring .= '\graphicspath{{'.$path.'}}'
+		.'\includegraphics'.$size.'{'.$file.'} ';
+	    my $closure;
+	    ($currentstring, $closure) = &align_latex_image($align,
+							    $latex_rendering,
+							    $currentstring,
+							    $width_param,
+							    $height_param);
+	    $currentstring .= $closure;
 
-		}
-	    } else {		# Bottom is also default.
-		# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
-	    }
 	} else {
 	    &Apache::lonxml::debug("$src does not exist");
 	    #original image file doesn't exist so check the alt attribute
-	    my $alt = 
+	    my $alt =
 		&Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
 	    unless ($alt) {
 		$alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
@@ -2908,10 +2905,11 @@ sub start_img {
 	# And here's where the semi-quote breaks down: allow the user
         # to edit the beast as well by rendering the problem for edit:
     } elsif ($target eq 'edit') {
+        my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
 	$currentstring .=&Apache::edit::tag_start($target,$token);
 	$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
-	    &Apache::edit::browse('src',undef,'alt').' '.
-	    &Apache::edit::search('src',undef,'alt').'<br />';
+                         &Apache::edit::browse_or_search('src',undef,'alt',$only,undef,1).
+                         '<br />';
 	$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
 	$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
 	$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />';
@@ -2920,20 +2918,32 @@ sub start_img {
 	$currentstring .=&Apache::edit::select_arg('Alignment:','align',
 						   ['','bottom','middle','top','left','right'],$token,5);
 	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
-						   ['', 'parbox', 'parpic'], $token, 2);
+						   ['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
+        my $alt=    &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+        my $enc=    &Apache::lonxml::get_param('encrypturl',$parstack,$safeeval);
+
 	$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
 						   ['no','yes'], $token, 2);
+        if (($alt=~/\S/) && (lc($enc) eq 'yes')) {
+           $currentstring.='<br /><span class="LC_warning">'.&mt('Warning: the description "[_1]" will be available, even for encrypted URL',$alt).'</span><br />';
+        }
 	$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
 	my $src=    &Apache::lonxml::get_param('src',$parstack,$safeeval);
-	my $alt=    &Apache::lonxml::get_param('alt',$parstack,$safeeval);
 	my $width=  &Apache::lonxml::get_param('width',$parstack,$safeeval);
 	my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
-
-
-	$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
-	if ($width) { $currentstring.=' width="'.$width.'" '; }
-	if ($height) { $currentstring.=' height="'.$height.'" '; }
-	$currentstring .= ' />';
+        my $element = &Apache::edit::get_element('src');
+        my $text;
+        if ($token->[2]{'src'}=~/\$/) {
+           $text = &mt('Variable image source');
+        } elsif ($token->[2]{'src'}=~/\S/) {
+	   $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
+	   if ($width) { $currentstring.=' width="'.$width.'" '; }
+	   if ($height) { $currentstring.=' height="'.$height.'" '; }
+	   $currentstring .= ' id="previewimg_'.$element.'" />';
+        } else {
+           $text = &mt("No image source specified");
+        }
+        $currentstring .= ' <span id="showimg_'.$element.'">'.$text.'</span>';
     } elsif ($target eq 'modified') {
 	my ($osrc,$owidth,$oheight)=
 	    ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
@@ -2954,7 +2964,7 @@ sub start_img {
 	}
 	if ($osrc ne $nsrc || (!$nwidth && !$nheight)) {
 	    # changed image or no size specified,
-            # if they didn't explicitly change the 
+            # if they didn't explicitly change the
             # width or height use the ones from the image
 	    if ($iwidth && $iheight) {
 		if ($owidth == $nwidth || (!$nwidth && !$nheight)) {
@@ -2993,7 +3003,7 @@ sub end_img {
 #-- <applet> tag (end tag required)
 sub start_applet {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    
+
     my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,undef,1);
     &Apache::lonxml::extlink($code);
     my $archive=&Apache::lonxml::get_param('archive',$parstack,$safeeval,
@@ -3001,21 +3011,30 @@ sub start_applet {
     &Apache::lonxml::extlink($archive);
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	if ($env{'browser.appletsuppress'} ne 'on') {
-	    $currentstring = &Apache::lonenc::encrypt_ref($token,
-							  {'code'=>$code,
-							   'archive'=>$archive}
-							  );
-	} else {
-	    my $alttag= &Apache::lonxml::get_param('alt',$parstack,
-						   $safeeval,undef,1);
-	    unless ($alttag) {
-		$alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],
-						 $code);
-	    }
-	    $currentstring='[APPLET: '.$alttag.']';
-	}
+        $currentstring = $token->[4];
     } elsif ($target eq 'tex') {
+        # Turn off some stuff we can't be inside thank you LaTeX
+
+	my $restart_sub = 0;
+	my $restart_sup = 0;
+
+	# Since <sub> and <sup> are simple tags it's ok to turn off/on
+	# using the start_ stop_ functions.. those tags only care about
+	# $target.
+
+	if (&is_inside_of($tagstack, "sub")) {
+	    $restart_sub = 1;
+	    $currentstring .= &end_sub($target, $token, $tagstack,
+				       $parstack, $parser, $safeeval);
+	}
+	if (&is_inside_of($tagstack, "sup")) {
+	    $restart_sup = 1;
+	    $currentstring .= &end_sup($target, $token, $tagstack,
+				       $parstack, $parser, $safeeval);
+	}
+
+	# Now process the applet; just replace it with its alt attribute.
+
 	my $alttag= &Apache::lonxml::get_param('alt',$parstack,
 					       $safeeval,undef,1);
 	unless ($alttag) {
@@ -3026,7 +3045,18 @@ sub start_applet {
 	}
 	$currentstring.='\begin{center} \fbox{Java Applet: '.$alttag.
 	    '.}\end{center}';
-    } 
+
+	# Turn stuff back on that we can't be inside of.
+
+	if ($restart_sub) {
+	    $currentstring .= &start_sub($target, $token, $tagstack,
+					$parstack, $parser, $safeeval);
+	}
+	if ($restart_sup) {
+	    $currentstring .= &start_sup($target, $token, $tagstack,
+					 $parstack, $parser, $safeeval);
+	}
+    }
     return $currentstring;
 }
 
@@ -3036,29 +3066,20 @@ sub end_applet {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
-    } 
+    }
     return $currentstring;
 }
 
 #-- <embed> tag (end tag optional/required)
-sub start_embed {    
+sub start_embed {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
     &Apache::lonxml::extlink($src);
     my $currentstring = '';
     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
-		('alt',$parstack,$safeeval,undef,1);
-	    unless ($alttag) {
-		$alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
-	    }
-	    $currentstring='[EMBED: '.$alttag.']';
-	}
+    $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
     } elsif ($target eq 'tex') {
-    } 
+    }
     return $currentstring;
 }
 
@@ -3066,38 +3087,64 @@ sub end_embed {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
-    } elsif ($target eq 'tex') {  
-    } 
+        $currentstring = $token->[2];
+    } elsif ($target eq 'tex') {
+        # ./.
+    }
     return $currentstring;
 }
 
 #-- <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) {
+    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval,
+                                          undef,1);
+    if ($name =~/^cabbase$/i) {
 	my $value=&Apache::lonxml::get_param('value',$parstack,
 					     $safeeval,undef,1);
 	&Apache::lonxml::extlink($value);
-    } 
-  
+    } elsif ($name eq 'flashvars') {
+        if (lc(&Apache::lonxml::get_param('type',$parstack,$safeeval,-2,1))
+            eq 'application/x-shockwave-flash') {
+            my $launcher =
+                &Apache::lonxml::get_param('data',$parstack,$safeeval,-2,1);
+            if ($launcher) {
+                &Apache::lonxml::extlink($launcher);
+            }
+            my $flashvars=&Apache::lonxml::get_param('value',$parstack,
+                                                     $safeeval,undef,1);
+            if ($flashvars ne '') {
+                foreach my $item (split(/\&/,$flashvars)) {
+                    my ($key,$value)=split(/=/,$item,2);
+                    if ($key eq 'content') {
+                        if ($value ne '') {
+                            my ($dir) = ($launcher =~ m{(.+/)[^/]+$});
+                            &Apache::lonxml::extlink($dir.$value);
+                        }
+                    } elsif ($key eq 'thumb') {
+                        if ($value ne '') {
+                            &Apache::lonxml::extlink($value);
+                        }
+                    }
+                }
+            }
+        }
+    }
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
-    &Apache::lonxml::extlink($src);
+    if ($src ne '') {
+        &Apache::lonxml::extlink($src);
+    }
     my $currentstring = '';
     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; }
-	my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval,
-					    undef,1);
 	if ($name=~/^cabbase$/i) {
 	    $toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack,
 							   $safeeval,undef,1);
 	}
 	$currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert);
     } elsif ($target eq 'tex') {
-    } 
+    }
     return $currentstring;
 }
 
@@ -3105,9 +3152,9 @@ sub end_param {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];     
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
-    } 
+    }
     return $currentstring;
 }
 
@@ -3142,12 +3189,12 @@ sub end_allow {
 sub start_frameset {
     my ($target,$token) = @_;
     my $currentstring = '';	# Close any pending para.
-    if ($target eq 'web' || $target eq 'webgrade') { 
-	$currentstring = 
+    if ($target eq 'web' || $target eq 'webgrade') {
+	$currentstring =
 	    &Apache::loncommon::start_page($Apache::londefdef::title,
 					   $Apache::londefdef::head,
 					   {'add_entries'    => $token->[2],
-					    'no_title'       => 1,
+#					    'no_title'       => 1,
 					    'force_register' => 1,
 					    'frameset'       => 1,});
 
@@ -3172,7 +3219,7 @@ sub start_xmp {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\begin{verbatim}';
-    } 
+    }
     return $currentstring;
 }
 
@@ -3196,7 +3243,7 @@ sub start_pre {
     } elsif ($target eq 'tex') {
 	$currentstring .= '\begin{verbatim}';
 	&Apache::lonxml::disable_LaTeX_substitutions();
-    } 
+    }
     return $currentstring;
 }
 
@@ -3252,12 +3299,12 @@ sub end_externallink {
     return $currentstring;
 }
 
-#-- <blankspace heigth="">
+#-- <blankspace height="">
 sub start_blankspace {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = &end_p();	# closes off any unclosed <p>
     if ($target eq 'tex') {
-	my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
+	my $howmuch = &Apache::lonxml::get_param('height',$parstack,$safeeval,undef,1);
 	$currentstring .= '\vskip '.$howmuch.' ';
     }
     return $currentstring;
@@ -3277,8 +3324,8 @@ sub start_abbr {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3286,8 +3333,8 @@ sub end_abbr {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3296,8 +3343,8 @@ sub start_acronym {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3305,8 +3352,8 @@ sub end_acronym {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3315,8 +3362,8 @@ sub start_area {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3324,8 +3371,8 @@ sub end_area {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3334,7 +3381,7 @@ sub start_base {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     }
     return $currentstring;
 }
@@ -3343,8 +3390,8 @@ sub end_base {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3353,8 +3400,8 @@ sub start_bdo {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3362,8 +3409,8 @@ sub end_bdo {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3372,8 +3419,8 @@ sub start_bgsound {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3381,8 +3428,8 @@ sub end_bgsound {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3391,8 +3438,8 @@ sub start_blink {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3400,8 +3447,8 @@ sub end_blink {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3410,8 +3457,11 @@ sub start_blockquote {
     my ($target,$token) = @_;
     my $currentstring = &end_p();	# Close any unclosed <p>
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[4];     
-    } 
+	$currentstring .= $token->[4];
+    }
+    if ($target eq 'tex') {
+	$currentstring .= '\begin{quote}';
+    }
     return $currentstring;
 }
 
@@ -3419,8 +3469,11 @@ sub end_blockquote {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
+    if ($target eq 'tex') {
+	$currentstring = '\end{quote}';
+    }
     return $currentstring;
 }
 
@@ -3429,8 +3482,8 @@ sub start_button {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3438,8 +3491,8 @@ sub end_button {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3448,8 +3501,8 @@ sub start_caption {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3457,8 +3510,8 @@ sub end_caption {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3467,8 +3520,8 @@ sub start_col {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3476,18 +3529,39 @@ sub end_col {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
-#-- <colgroup> tag (end tag optional)
+#-- <colgroup tag (end tag optional)
 sub start_colgroup {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack, $parstack, $parser, $safeeval, $style) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
+    if ($target eq 'tex') {
+	# TODO: Ensure this tag is in a table:
+
+	# Fetch the attributes and build the hash for the
+	# call to define_colgroup.
+
+	my $span    = &Apache::lonxml::get_param('span',   $parstack, $safeeval);
+	my $halign  = &Apache::lonxml::get_param('halign', $parstack, $safeeval);
+
+	my %colgroup_params;
+	if ($span ne '') {
+	    $colgroup_params{'span'} = $span;
+	}
+	if ($halign ne '') {
+	    $colgroup_params{'halign'} = $halign;
+	}
+	
+	my $table = $Apache::londefdef::table[-1];
+	$table->define_colgroup(\%colgroup_params);
+
+    }
     return $currentstring;
 }
 
@@ -3495,18 +3569,22 @@ sub end_colgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
+
 #-- <del> tag (end tag required)
 sub start_del {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    } elsif ($target eq 'tex') {
+	&disable_para();
+	$currentstring .= '\st{';
+    }
     return $currentstring;
 }
 
@@ -3514,8 +3592,11 @@ sub end_del {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    } elsif ($target eq 'tex') {
+	&enable_para();
+	$currentstring = '}';
+    }
     return $currentstring;
 }
 
@@ -3524,8 +3605,8 @@ sub start_fieldset {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3533,8 +3614,8 @@ sub end_fieldset {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3543,8 +3624,8 @@ sub start_frame {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3552,8 +3633,8 @@ sub end_frame {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3562,8 +3643,68 @@ sub start_iframe {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+        my ($src,$url,$query);
+        if ($token->[2]->{'src'}) {
+            $src = $token->[2]->{'src'};
+        } elsif ($token->[2]->{'SRC'}) {
+            $src = $token->[2]->{'SRC'};
+        }
+        if ($src) {
+            ($url,$query) = ($src =~ /^([^?]+)\??([^?]*)$/);
+            if ($query =~ /inhibitmenu=yes/) {
+                $currentstring = $token->[4];
+            } else {
+                my $inhibit;
+                if ($url =~ m{^[^/.].*\.x?html?$}) {
+                    $inhibit = 1;
+                } elsif ($url =~ m{^/(uploaded|res)/.*\.x?html?$}) {
+                    $inhibit = 1;
+                }
+                if ($inhibit) {
+                    $currentstring = '<iframe ';
+                    foreach my $attrib (@{$token->[3]}) {
+                        if (lc($attrib) eq 'src') {
+                            if ($query) {
+                                $query.='&amp;inhibitmenu=yes';
+                            } else {
+                                $query = 'inhibitmenu=yes';
+                            }
+                            $currentstring .= 'src="'.$url.'?'.$query.'" ';
+                        } else {
+                            $currentstring .= lc($attrib).'="'.$token->[2]->{$attrib}.'" ';
+                        }
+                    }
+                    $currentstring =~ s/\s+$//;
+                    if ($token->[4] =~ m{/>$}) {
+                        $currentstring .= ' />';
+                    } else {
+                        $currentstring .= '>';
+                    }
+                } else {
+                    $currentstring = $token->[4];
+                }
+            }
+            if (($url !~ m{^https?://}) && ($env{'request.course.id'})) {
+                my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'});
+                my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                if ($url =~ m{^([^/]|/uploaded/)}) {
+                    my $cleanhref = &clean_docs_httpref($url,$docuri,$cdom,$cnum);
+                    if ($cleanhref) {
+                        &Apache::lonxml::extlink($cleanhref);
+                    }
+                } elsif (($url =~ m{/res/$LONCAPA::domain_re/}) && ($docuri =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E})) {
+                    if (!&Apache::lonnet::allowed('bre',$url)) {
+                        if (&Apache::lonnet::is_on_map($url)) {
+                            &Apache::lonxml::extlink($url);
+                        }
+                    }
+                }
+            }
+        } else {
+            $currentstring = $token->[4];
+        }
+    }
     return $currentstring;
 }
 
@@ -3571,8 +3712,8 @@ sub end_iframe {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3581,8 +3722,8 @@ sub start_ins {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3590,8 +3731,8 @@ sub end_ins {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3600,8 +3741,8 @@ sub start_isindex {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3609,8 +3750,8 @@ sub end_isindex {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3619,8 +3760,8 @@ sub start_keygen {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3628,8 +3769,8 @@ sub end_keygen {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3638,8 +3779,8 @@ sub start_label {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3647,8 +3788,8 @@ sub end_label {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3657,8 +3798,8 @@ sub start_layer {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3666,8 +3807,8 @@ sub end_layer {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3676,8 +3817,8 @@ sub start_legend {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3685,8 +3826,8 @@ sub end_legend {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3698,8 +3839,8 @@ sub start_link {
 	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
 					    undef,1);
 	&Apache::lonxml::extlink($href);
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3707,8 +3848,8 @@ sub end_link {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3717,8 +3858,8 @@ sub start_marquee {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3726,8 +3867,8 @@ sub end_marquee {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3736,8 +3877,8 @@ sub start_multicol {
     my ($target,$token) = @_;
     my $currentstring = &end_p();	# Close any pending <p>
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[4];     
-    } 
+	$currentstring .= $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3745,8 +3886,8 @@ sub end_multicol {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3755,7 +3896,7 @@ sub start_nobr {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     }  elsif ($target eq 'tex') {
 	$currentstring='\mbox{';
     }
@@ -3766,7 +3907,7 @@ sub end_nobr {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
+	$currentstring = $token->[2];
     }   elsif ($target eq 'tex') {
 	$currentstring='}';
     }
@@ -3778,8 +3919,8 @@ sub start_noembed {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3787,8 +3928,8 @@ sub end_noembed {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3797,8 +3938,8 @@ sub start_noframes {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3806,8 +3947,8 @@ sub end_noframes {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3816,8 +3957,8 @@ sub start_nolayer {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3825,8 +3966,8 @@ sub end_nolayer {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3835,8 +3976,8 @@ sub start_noscript {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3844,8 +3985,8 @@ sub end_noscript {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3854,8 +3995,8 @@ sub start_object {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3863,8 +4004,8 @@ sub end_object {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3873,8 +4014,8 @@ sub start_optgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3882,8 +4023,8 @@ sub end_optgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3892,7 +4033,7 @@ sub start_samp {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring='\texttt{';
     }
@@ -3903,7 +4044,7 @@ sub end_samp {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
+	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring='}';
     }
@@ -3915,8 +4056,8 @@ sub start_server {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3924,8 +4065,8 @@ sub end_server {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -3934,8 +4075,8 @@ sub start_spacer {
     my ($target,$token) = @_;
     my $currentstring = &end_p();	# Close off any open <p> tag.
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring .= $token->[4];     
-    } 
+	$currentstring .= $token->[4];
+    }
     return $currentstring;
 }
 
@@ -3943,18 +4084,38 @@ sub end_spacer {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
+my @span_end_stack; # for span tex target
+
 #-- <span> tag (end tag required)
 sub start_span {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    } elsif ($target eq 'tex') {
+        my $endstring = '';
+        my $family = &get_css_property('font-family',$parstack,$safeeval);
+        if ($family eq 'monospace') {
+            $currentstring .= '\texttt{';
+            $endstring .= '}';
+        }
+        my $weight = &get_css_property('font-weight',$parstack,$safeeval);
+        if ($weight eq 'bold') {
+            $currentstring .= '\textbf{';
+            $endstring .= '}';
+        }
+        my $style = &get_css_property('font-style',$parstack,$safeeval);
+        if ($style eq 'italic') {
+            $currentstring .= '\textit{';
+            $endstring .= '}';
+        }
+        push(@span_end_stack, $endstring);
+    }
     return $currentstring;
 }
 
@@ -3962,8 +4123,11 @@ sub end_span {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    } elsif ($target eq 'tex') {
+        my $endstring = pop @span_end_stack;
+        $currentstring .= $endstring;
+    }
     return $currentstring;
 }
 
@@ -3972,8 +4136,14 @@ sub start_tbody {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
+    if ($target eq 'tex') {
+	# TODO: Ensure this tag is within a table:
+
+	my $table = $Apache::londefdef::table[-1];
+	$table->start_body();
+    }
     return $currentstring;
 }
 
@@ -3981,8 +4151,14 @@ sub end_tbody {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
+    if($target eq 'tex') {
+	# TODO: Ensure this tag is within a table:
+
+	my $table = $Apache::londefdef::table[-1];
+	$table->end_body();
+    }
     return $currentstring;
 }
 
@@ -3991,8 +4167,13 @@ sub start_tfoot {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
+    if ($target eq 'tex') {
+        # TODO: ensure this is within a table tag.
+	my $table = $Apache::londefdef::table[-1];
+	$table->start_foot();
+    }
     return $currentstring;
 }
 
@@ -4000,8 +4181,13 @@ sub end_tfoot {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
+    if ($target eq 'tex') {
+	#  TODO: Ensure this is in side a table
+	my $table = $Apache::londefdef::table[-1];
+	$table->end_foot();
+    }
     return $currentstring;
 }
 
@@ -4010,8 +4196,13 @@ sub start_thead {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
+    if ($target eq 'tex') {
+	# Assume we're in a table... TODO: Verify that and ignore tag if not.
+	my $table = $Apache::londefdef::table[-1];
+	$table->start_head();
+    }
     return $currentstring;
 }
 
@@ -4019,8 +4210,14 @@ sub end_thead {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
+    if ($target eq 'tex') {
+     	# TODO: Verify we are in a table and ignore tag if not.
+
+	my $table = $Apache::londefdef::table[-1];
+	$table->end_head();
+    }
     return $currentstring;
 }
 
@@ -4029,9 +4226,9 @@ sub start_var {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
+	$currentstring = $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring = '\textit{'; 
+	$currentstring = '\textit{';
     }
     return $currentstring;
 }
@@ -4042,8 +4239,8 @@ sub end_var {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring = '}'; 
-    } 
+	$currentstring = '}';
+    }
     return $currentstring;
 }
 
@@ -4052,8 +4249,8 @@ sub start_wbr {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[4];     
-    } 
+	$currentstring = $token->[4];
+    }
     return $currentstring;
 }
 
@@ -4061,8 +4258,8 @@ sub end_wbr {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = $token->[2];    
-    } 
+	$currentstring = $token->[2];
+    }
     return $currentstring;
 }
 
@@ -4070,8 +4267,8 @@ sub end_wbr {
 sub start_hideweboutput {
     my ($target,$token) = @_;
     if ($target eq 'web' || $target eq 'webgrade') {
-	&Apache::lonxml::startredirection();     
-    } 
+	&Apache::lonxml::startredirection();
+    }
     return '';
 }
 
@@ -4079,8 +4276,8 @@ sub end_hideweboutput {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web' || $target eq 'webgrade') {
-	$currentstring = &Apache::lonxml::endredirection();    
-    } 
+	$currentstring = &Apache::lonxml::endredirection();
+    }
     return '';
 }
 
@@ -4088,7 +4285,7 @@ sub end_hideweboutput {
 sub image_replication {
     my $src = shift;
     if (not -e $src) { &Apache::lonnet::repcopy($src); }
-    #replicates eps or ps 
+    #replicates eps or ps
     my $epssrc = my $pssrc = $src;
     $epssrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
     $pssrc  =~ s/\.(gif|jpg|jpeg|png)$/.ps/i;
@@ -4098,27 +4295,9 @@ 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) = @_;
@@ -4129,9 +4308,9 @@ sub resize_image {
     $width_param  = $width_param  * $scaling;
 
     #do we have any specified LaTeX size of the picture?
-    my $toget='TeXwidth'; 
-    if ($cis) { 
-	$toget=lc($toget); 
+    my $toget='TeXwidth';
+    if ($cis) {
+	$toget=lc($toget);
     }
     my $TeXwidth = &Apache::lonxml::get_param($toget,$parstack,
 					      $safeeval,$depth,$cis);
@@ -4141,11 +4320,11 @@ sub resize_image {
     #do we have any specified web size of the picture?
     my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
 					   $depth,1);
-    if ($TeXwidth) { 
+    if ($TeXwidth) {
 	my $old_width_param=$width_param;
 	if ($TeXwidth=~/(\d+)\s*\%/) {
 	    $width_param = $1*$env{'form.textwidth'}/100;
-	} else { 
+	} else {
 	    $width_param = $TeXwidth;
 	}
 	if ($TeXheight) {
@@ -4154,10 +4333,10 @@ sub resize_image {
 	    $height_param=$TeXwidth/$old_width_param*$height_param;
 	}
     } elsif ($TeXheight) {
-	$height_param = $TeXheight;
 	if ($height_param) {
 	    $width_param  = $TeXheight/$height_param*$width_param;
 	}
+	$height_param = $TeXheight;
     } elsif ($width) {
 	my $old_width_param=$width_param;
 	$width_param = $width*$scaling;
@@ -4179,7 +4358,7 @@ sub resize_image {
 sub image_size {
     my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
 
-    #size of image from gif/jpg/jpeg/png 
+    #size of image from gif/jpg/jpeg/png
     my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     if (-e $ressrc) {
 	$src = $ressrc;
@@ -4192,7 +4371,7 @@ sub image_size {
     undef($image);
 
     ($height_param, $width_param) = &resize_image($height_param, $width_param,
-						  $scaling, $parstack, $safeeval, 
+						  $scaling, $parstack, $safeeval,
 						  $depth, $cis);
 
     return ($height_param, $width_param);
@@ -4221,8 +4400,8 @@ sub get_eps_image {
 	&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;
+    my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg|svg)/i);
+    $src=~s/\.(bmp|gif|png|jpg|jpeg|svg)$/\.eps/i;
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     &Apache::lonxml::debug("Filelocation gives: $src");
     if (! -e $src) {
@@ -4241,62 +4420,77 @@ sub get_eps_image {
 
 		#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");
-		my $newsrc=$orig_src;
-		$newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
-		&Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");
-		print FILE "$newsrc\n";
-		close FILE;
+		if (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.");
+		    print FILE ("$newsrc\n");
+		    close(FILE);
+                }
 		$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
-		$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
+		$src=~s|/home/httpd/html/priv/[^/]+/([^/]*)/|/home/httpd/prtspool/$1/|;
 		if ($sext ne "") {	 # Put the ext. back in to uniquify.
 		    $src =~ s/\.eps$/$sext.eps/;
 		}
+
 	    }
+
 	}
+    } else {
+	# If the postscript file has spaces in its name,
+	# LaTeX will gratuitiously vomit.  Therefore
+	# queue such files for copy with " " replaced by "_".
+	# printout.pm will know them by their .ps  or .eps extensions.
+	my $newsrc = $orig_src;
+	$newsrc    =~  s|(.*)/res/|/home/httpd/html/res/|;
+	open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+	print FILE "$src\n";
+	close FILE;
+	$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
+	$src=~s|/home/httpd/html/priv/[^/]+/([^/]*)/|/home/httpd/prtspool/$1/|;
     }
     my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
+    $path =~ s/ /\_/g;
+    $file =~ s/ /\_/g;
     &Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />");
     return ($path.'/',$file);
 }
 
 sub eps_generation {
-    my ($src,$file,$width_param) = @_;	     
+    my ($src,$file,$width_param) = @_;
     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";
+    if (open(my $tmpfile,">>$filename")) {
+        print $tmpfile "$src\n";
+        close($tmpfile);
+    }
     my $newsrc = $src;
-    $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
-    $newsrc=~s/\/home\/httpd\/html\/res//;
-    $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;
-    $newsrc=~s/\/\.\//\//;
-    $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
-    if ($newsrc=~/\/home\/httpd\/lonUsers\//) {
-	$newsrc=~s/\/home\/httpd\/lonUsers//;
-	$newsrc=~s/\/([^\/]+)\/(\w)\/(\w)\/(\w)\//\/$1\//;
+    $newsrc =~ s/(\.bmp|\.gif|\.jpg|\.jpeg)$/\.eps/i;
+    $newsrc=~s{/home/httpd/html/res}{};
+    $newsrc=~s{/home/httpd/html/priv/[^/]+/($LONCAPA::username_re)/}{/$1/};
+    $newsrc=~s{/\./}{/};
+    $newsrc=~s{/([^/]+)\.(ps|eps)}{/};
+    if ($newsrc=~m{/home/httpd/lonUsers/}) {
+	$newsrc=~s{/home/httpd/lonUsers}{};
+	$newsrc=~s{/($LONCAPA::domain_re)/./././}{/$1/};
     }
-    if ($newsrc=~/\/userfiles\//) {
+    if ($newsrc=~m{/userfiles/}) {
 	return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
     } else {
 	return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
     }
 }
 
-sub file_path {     
+sub file_path {
     my $src=shift;
-    my ($file,$path); 
+    my ($file,$path);
     if ($src =~ m!(.*)/([^/]*)$!) {
-	$file = $2; 
-	$path = $1.'/'; 
-    } 
+	$file = $2;
+	$path = $1.'/';
+    }
     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';}
@@ -4318,39 +4512,94 @@ sub recalc {
 sub LATEX_length {
     my $garbage=shift;
     $garbage=~s/^\s+$//;
-    $garbage=~s/^\s+(\S.*)/$1/;#space before 
-    $garbage=~s/(.*\S)\s+$/$1/;#space after 
+    $garbage=~s/^\s+(\S.*)/$1/;#space before
+    $garbage=~s/(.*\S)\s+$/$1/;#space after
     $garbage=~s/(\s)+/$1/;#only one space
-    $garbage=~s/(\\begin{([^\}]+)}|\\end{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
-    $garbage=~s/(\$\_\{|\$\_|\$\^{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$
+    $garbage=~s/(\\begin\{([^\}]+)}|\\end\{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
+    $garbage=~s/(\$\_\{|\$\_|\$\^\{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$
     $garbage=~s/([^\\])\$/$1/g;#$
-    $garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...}
+    $garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^\{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...}
    $garbage=~s/(\\alpha|\\beta|\\gamma|\\delta|\\epsilon|\\verepsilon|\\zeta|\\eta|\\theta|\\vartheta|\\iota|\\kappa|\\lambda|\\mu|\\nu|\\xi|\\pi|\\varpi|\\rho|\\varrho|\\sigma|\\varsigma|\\tau|\\upsilon|\\phi|\\varphi|\\chi|\\psi|\\omega|\\Gamma|\\Delta|\\Theta|\\Lambda|\\Xi|\\Pi|\\Sigma|\\Upsilon|\\Phi|\\Psi|\\Omega)/1/g;
     $garbage=~s/(\\pm|\\mp|\\times|\\div|\\cdot|\\ast|\\star|\\dagger|\\ddagger|\\amalg|\\cap|\\cup|\\uplus|\\sqcap|\\sqcup|\\vee|\\wedge|\\oplus|\\ominus|\\otimes|\\circ|\\bullet|\\diamond|\\lhd|\\rhd|\\unlhd|\\unrhd|\\oslash|\\odot|\\bigcirc|\\Box|\\Diamond|\\bigtriangleup|\\bigtriangledown|\\triangleleft|\\triangleright|\\setminus|\\wr)/1/g;
     $garbage=~s/(\\le|\\ll|\\leq|\\ge|\\geq|\\gg|\\neq|\\doreq|\\sim|\\simeq|\\subset|\\subseteq|\\sqsubset|\\sqsubseteq|\\in|\\vdash|\\models|\\supset|\\supseteq|\\sqsupset|\\sqsupseteq|\\ni|\\dash|\\perp|\\approx|\\cong|\\equiv|\\propto|\\prec|\\preceq|\\parallel|\\asymp|\\smile|\\frown|\\bowtie|\\succ|\\succeq|\\mid)/1/g;
     $garbage=~s/(\\not<|\\\\not\\le|\\not\\prec|\\not\\preceq|\\not\\subset|\\not\\subseteq|\\not\\sqsubseteq|\\not\\in|\\not>|\\not\\ge|\\not\\succ|\\notsucceq|\\not\\supset|\\notsupseteq|\\not\\sqsupseteq|\\notin|\\not=|\\not\\equiv|\\not\\sim|\\not\\simeq|\\not\\approx|\\not\\cong|\\not\\asymp)/1/g;
     $garbage=~s/(\\leftarrow|\\gets|\\Leftarrow|\\rightarrow|\\to|\\Rightarrow|\\leftrightarrow|\\Leftrightarrow|\\mapsto|\\hookleftarrow|\\leftharpoonup|\\leftkarpoondown|\\rightleftharpoons|\\longleftarrow|\\Longleftarrow|\\longrightarrow|\\Longrightarrow|\\longleftrightarrow|\\Longleftrightarrow|\\longmapsto|\\hookrightarrow|\\rightharpoonup|\\rightharpoondown|\\uparrow|\\Uparrow|\\downarrow|\\Downarrow|\\updownarrow|\\Updownarrow|\\nearrow|\\searrow|\\swarrow|\\nwarrow)/11/g;
     $garbage=~s/(\\aleph|\\hbar|\\imath|\\jmath|\\ell|\\wp|\\Re|\\Im|\\mho|\\prime|\\emptyset|\\nabla|\\surd|\\partial|\\top|\\bot|\\vdash|\\dashv|\\forall|\\exists|\\neg|\\flat|\\natural|\\sharp|\\\||\\angle|\\backslash|\\Box|\\Diamond|\\triangle|\\clubsuit|\\diamondsuit|\\heartsuit|\\spadesuit|\\Join|\\infty)/11/g;
-    $garbage=~s/(\\hat{([^}]+)}|\\check{([^}]+)}|\\dot{([^}]+)}|\\breve{([^}]+)}|\\acute{([^}]+)}|\\ddot{([^}]+)}|\\grave{([^}]+)}|\\tilde{([^}]+)}|\\mathring{([^}]+)}|\\bar{([^}]+)}|\\vec{([^}]+)})/$1/g;
+    $garbage=~s/(\\hat\{([^}]+)}|\\check\{([^}]+)}|\\dot\{([^}]+)}|\\breve\{([^}]+)}|\\acute\{([^}]+)}|\\ddot\{([^}]+)}|\\grave\{([^}]+)}|\\tilde\{([^}]+)}|\\mathring\{([^}]+)}|\\bar\{([^}]+)}|\\vec\{([^}]+)})/$1/g;
     #remove some other LaTeX command
-    $garbage=~s|\\(\w+)\\|\\|g;	 
-    $garbage=~s|\\(\w+)(\s*)|$2|g;	 	 
+    $garbage=~s|\\(\w+)\\|\\|g;
+    $garbage=~s|\\(\w+)(\s*)|$2|g;
     $garbage=~s|\+|11|g;
     my  $value=length($garbage);
     return $value;
 }
 
 
-# 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 align_latex_image {
+    my ($align, $latex_rendering, $image, $width, $height) = @_;
+    my $currentstring;        # The 1/2 wrapped image.
+    my $closure;              # The closure of the wrappage.
+
+    # if it's none just return it back
+    if ($latex_rendering eq 'none') {
+	return ($image,'');
+    }
+
+    #    If there's an alignment specification we need to honor it here.
+    #    For the horizontal alignments, we will also honor the
+    #    value of the latex specfication.  The default is parbox,
+    #    and that's used for illegal values too.
+    #
+    #    Even though we set a default alignment value, the user
+    #    could have given us an illegal value.  In that case we
+    #    just use the default alignment of bottom..
+    $currentstring = '';
+    if      ($align eq "top")    {
+	$currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
+	$closure = '}';
+    } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
+	my $offset = $height/2;
+	$currentstring .= '\raisebox{-'.$offset.'mm}{'.$image;
+	$closure       = '}';
+    } elsif ($align eq "left")   {
+	if ($latex_rendering eq "parpic") {
+	    $currentstring .= '\parpic[l]{'.$image;
+	    $closure       = '}';
+	} elsif ($latex_rendering eq "parbox") {
+	    $currentstring .= '\begin{minipage}[l]{'.$width.'mm}'
+		.$image;
+	    $closure = '\end{minipage}';
+	} elsif ($latex_rendering eq "wrapfigure"
+		 || $latex_rendering ne 'none') {  # wrapfig render
+	    $currentstring .=
+		'\begin{wrapfigure}{l}{'.$width.'mm}'
+		.'\scalebox{1.0}{'.$image;
+	    $closure = '}\end{wrapfigure}';
+	}
+    } elsif ($align eq "right")  {
+	if ($latex_rendering eq "parpic") {
+	    $currentstring .= '\parpic[r]{'.$image;
+	    $closure = '}';
+	} elsif ($latex_rendering eq "parbox") {
+	    $currentstring .=  '\begin{minipage}[r]{'.$width.'mm}'
+		.$image;
+	    $closure = '\end{minipage}';
+	} elsif ($latex_rendering eq "wrapfigure"
+		 || $latex_rendering ne 'none') {  # wrapfig render
+	    $currentstring .=
+		'\begin{wrapfigure}{r}{'.$width.'mm}'
+		.'\scalebox{1.0}{'.$image;
+	    $closure = '}\end{wrapfigure}';
+	}
+    } else {		# Bottom is also default.
+	# $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}';
+	$currentstring .= "{$image";
+	$closure       = '}';
+    }
+    return ($currentstring, $closure);
+}
+
+
 sub is_inside_of {
     my ($tagstack, $tag) = @_;
     my @stack = @$tagstack;
@@ -4363,5 +4612,252 @@ sub is_inside_of {
 }
 
 
+#
+#   This sub provides the typical LaTeX prefix matter for tex output:
+#
+sub latex_header {
+    my ($mode) = @_;
+    my $currentstring = '';
+
+    $currentstring .=
+	"\n% &Apache::lonxml::londefdef \n" .
+	'\documentclass[letterpaper,twoside]{article}\raggedbottom';
+    if (($env{'form.latex_type'}=~'batchmode') ||
+	(!$env{'request.role.adv'}) ||
+	($mode eq 'batchmode')) {$currentstring .='\batchmode';}
+    $currentstring .= '\newcommand{\keephidden}[1]{}'.
+	'\renewcommand{\deg}{$^{\circ}$}'.
+	'\usepackage{multirow}'."\n".
+	'\usepackage{longtable}'."\n".
+	'\usepackage{textcomp}'."\n".
+	'\usepackage{makeidx}'."\n".
+	'\usepackage[dvips]{graphicx}'."\n".
+	'\usepackage{wrapfig}'."\n".
+	'\usepackage{picins}'."\n".
+	'\usepackage[T1]{fontenc}'."\n".
+	'\usepackage{lmodern}'."\n".
+	'\usepackage[postscript]{ucs}'."\n".
+	'\usepackage[utf8x]{inputenc}'."\n".
+	'\usepackage{pifont}'."\n".
+	'\usepackage{latexsym}'."\n".
+	'\usepackage{epsfig}'."\n".
+	'\usepackage{xtab}'."\n".
+	'\usepackage{tabularx}'."\n".
+	'\usepackage{booktabs}'."\n".
+	'\usepackage{array}'."\n".
+	'\usepackage{colortbl}'."\n".
+	'\usepackage{xcolor}'."\n".
+	'\usepackage{calc}'."\n".
+	'\usepackage{amsmath}'."\n".
+	'\usepackage{soul}'."\n".
+	'\usepackage{amssymb}'."\n".
+	'\usepackage{amsfonts}'."\n".
+	'\usepackage{amsthm}'."\n".
+	'\usepackage{amscd}'."\n".
+	'\usepackage{actuarialangle}'."\n";
+    if($env{'form.pdfFormFields'} eq 'yes') {
+	$currentstring .= '\usepackage{hyperref}'.
+	    '\usepackage{eforms}'.
+	    '\usepackage{tabularx}';
+    }
+
+        $currentstring .= '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
+                          '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
+    $currentstring .= '\begin{document}';
+
+    return $currentstring;
+
+}
+
+sub clean_docs_httpref {
+    my ($href,$docuri,$cdom,$cnum) = @_;
+    if ($docuri eq '') {
+        $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'});
+    }
+    if ($cdom eq '') {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    }
+    if ($cnum eq '') {
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    }
+    my $cleanhref;
+    if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/)(.+/)[^/]+$}) {
+        my $prefix = $1;
+        my $relpath = $2;
+        my ($hrefpath,$fname);
+        if ($href =~ m{^/}) {
+            if ($href =~ m{^\Q$prefix\E(.+/)([^/]+)$}) {
+                $hrefpath = $1;
+                $fname = $2;
+            } else {
+                return $cleanhref;
+            }
+        } else {
+            if ($href =~ m{/}) {
+                (my $path,$fname) = ($href =~ m{^(.*)/([^/]*)$});
+                $hrefpath = $relpath.$path;
+                if ($path eq '') {
+                    $hrefpath =~ s{/$}{};
+                }
+            } else {
+                $fname = $href;
+                $hrefpath = $relpath;
+                $hrefpath =~ s{/$}{};
+            }
+        }
+        if ($fname ne '') {
+            my $cleanrelpath;
+            foreach my $dir (split(/\//,$hrefpath)) {
+                next if ($dir eq '.');
+                if ($dir eq '..') {
+                    $cleanrelpath =~ s{([^/]+/)$}{};
+                } else {
+                    $cleanrelpath .= $dir.'/';
+                }
+            }
+            if ($cleanrelpath ne '') {
+                $cleanhref = $prefix.$cleanrelpath.$fname;
+            } else {
+                $cleanhref = $prefix.$fname;
+            }
+        }
+    }
+    return $cleanhref;
+}
+
+# This is retrieving a CSS property from the style attribute of the current element.
+# It is not checking <style> elements or linked stylesheets yet.
+sub get_css_property {
+    my ($property,$parstack,$safeeval) = @_;
+    my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval,undef,1);
+    my @style_components=split(/;/,$style);
+    foreach my $css_pair (@style_components) {
+        my ($name, $value) = split(/:/, $css_pair);
+        $name =~ s/^\s+|\s+$//g;
+        $value =~ s/^\s+|\s+$//g;
+        if ($name eq $property) {
+            return $value;
+        }
+    }
+    return undef;
+}
+
+=pod
+
+=head1 NAME
+
+Apache::londefdef.pm
+
+=head1 SYNOPSIS
+
+Tags Default Definition Module
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 NOTABLE SUBROUTINES
+
+=over
+
+=item start_hideweboutput()
+
+=item end_hideweboutput()
+
+=item image_replication()
+
+=item resize_image()
+
+	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.
+
+=item image_size()
+
+=item image_width()
+
+=item image_height()
+
+=item get_eps_image()
+
+=item eps_generation()
+
+=item file_path()
+
+=item recalc()
+
+	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
+
+=item LATEX_length()
+
+=item align_latex_image()
+
+  	Wrap image 'stuff' inside of the LaTeX required to implement
+   	alignment:
+     	align_tex_image(align, latex_rendering, image)
+   	Where:
+     	align   - The HTML alignment specification.
+     	latex_rendering - rendering hint for latex.
+     	image   - The LaTeX needed to insert the image itsef.
+     	width,height - dimensions of the image.
+ 	Returns:
+    	The 1/2 wrapped image and the stuff required to close the
+    	wrappage.  This allows e.g. randomlabel to insert more stuff
+    	into the closure.
+
+
+=item 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....
+     	}
+
+=item clean_docs_httpref($href,$docuri,$cdom,$cnum)
+        HTML pages uploaded to a course which contain dependencies either from iframes,
+        javascript files or objects (FlashPlayerSwf, MediaSrc, XMPSrc, ConfigurationSrc,
+        and PosterImageSrc) for which dependency is another file uploaded to the same
+        course.
+
+        Required input:
+        href - dependency (either a relative URL, or an absolute URL)
+        Optional inputs:
+        docuri - URL of HTML page containing the dependency
+        cdom - Course domain
+        cnum - CourseID
+
+        Output:
+        returns an absolute URL constructed from the href provided, and the calling context.
+        (this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/ or
+        /uploaded/$cdom/$cnum/supplemental/).
+
+=back
+
+=cut
+
+
 1;
 __END__