--- loncom/xml/londefdef.pm	2003/04/18 15:14:18	1.130
+++ loncom/xml/londefdef.pm	2004/04/06 18:05:29	1.208
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.130 2003/04/18 15:14:18 sakharuk Exp $
+# $Id: londefdef.pm,v 1.208 2004/04/06 18:05:29 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -25,8 +25,7 @@
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
-#
-# Copyright for TtHfunc and TtMfunc by Ian Hutchinson. 
+## 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 
@@ -51,11 +50,22 @@ use Apache::File();
 use Image::Magick;
 use Apache::lonmenu();
 use Apache::lonmeta();
+use Apache::Constants qw(:common);
+
 
 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'));
+    &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'));
+
+}
 
+sub initialize_londefdef {
+    $Apache::londefdef::TD_redirection=0;
+    @Apache::londefdef::table = ();
+    $Apache::londefdef::select=0;
+    @Apache::londefdef::description=();
+    $Apache::londefdef::DD_redirection=0;
+    $Apache::londefdef::DT_redirection=0;
 }
 
 #======================= TAG SUBROUTINES =====================
@@ -72,11 +82,10 @@ sub end_output {
 }
 #-- <m> tag
 sub start_m {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
-	$Apache::lonxml::prevent_entity_encode++;
-	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+    my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+    if ($target eq 'web' || $target eq 'analyze') {
 	$inside ='\\documentstyle{article}'.$inside;
 	&Apache::lonxml::debug("M is starting with:$inside:");
 	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
@@ -91,11 +100,15 @@ sub start_m {
 	    $Apache::lontexconvert::errorstring='';
 	}
 	#&Apache::lonxml::debug("M is ends with:$currentstring:");
+	$Apache::lonxml::post_evaluate=0;
     } elsif ($target eq 'tex') {
-	$currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+	$currentstring = $inside;
+	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
+	if ($eval eq 'on') {
+	    $currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);
+	}
 	if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
-    } else {
-	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+	$Apache::lonxml::post_evaluate=0;
     }
     return $currentstring;
 }
@@ -103,11 +116,8 @@ sub start_m {
 sub end_m {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
-	$Apache::lonxml::prevent_entity_encode--;
-    } elsif ($target eq 'tex') {
+    if ($target eq 'tex') {
 	$currentstring = "";
-    } elsif ($target eq 'meta') {
     }
     return $currentstring;
 }
@@ -133,37 +143,28 @@ sub end_tthoption {
     return $result;
 }
 
-#-- <html> tag    
+#-- <html> tag (end tag optional)
 sub start_html {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($ENV{'browser.mathml'}) {
-	&tth::ttminit();
-	if ($ENV{'browser.unicode'}) {
-	    &tth::ttmoptions('-L -u1');
-	} else {
-	    &tth::ttmoptions('-L -u0');
-	}
-    } else {
-	&tth::tthinit();
-	if ($ENV{'browser.unicode'}) {
-	    &tth::tthoptions('-L -u1');
-	} else {
-	    &tth::tthoptions('-L -u0');
-	}
-    }
-    if ($target eq 'web') {
+    my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};
+    &Apache::lontexconvert::init_tth();
+    if ($target eq 'web' || $target eq 'edit') {
 	$currentstring = &Apache::lonxml::xmlbegin().
 	    &Apache::lonxml::fontsettings();     
     } elsif ($target eq 'tex') {
 	@Apache::londefdef::table = ();
-	$currentstring .= '\documentclass[letterpaper]{article}
-                           \newcommand{\keephidden}[1]{}
+	$currentstring .= '\documentclass[letterpaper]{article}';
+	if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';} 
+	$currentstring .= '\newcommand{\keephidden}[1]{}
                            \renewcommand{\deg}{$^{\circ}$}
+                           \usepackage{longtable}
                            \usepackage{textcomp}
+                           \usepackage{makeidx}
                            \usepackage[dvips]{graphicx}
                            \usepackage{epsfig}\usepackage{calc}
-\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}}';
+\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}}';
     }
     return $currentstring;
 }
@@ -177,7 +178,7 @@ sub end_html {
     return $currentstring;
 }
 
-#-- <head> tag
+#-- <head> tag (end tag optional)
 sub start_head {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -190,14 +191,14 @@ sub start_head {
 sub end_head {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' && $ENV{'request.state'} eq 'published') {
 	$currentstring = &Apache::lonmenu::registerurl(undef,$target).
 	    $token->[2];    
     } 
     return $currentstring;
 }
 
-#-- <map> tag
+#-- <map> tag (end tag required)
 sub start_map {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -216,13 +217,15 @@ sub end_map {
     return $currentstring;
 }
 
-#-- <select> tag
+#-- <select> tag (end tag required)
 sub start_select {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
-    } 
+    }  elsif ($target eq 'tex') {
+	$Apache::londefdef::select=0;
+    }
     return $currentstring;
 }
 
@@ -235,13 +238,20 @@ sub end_select {
     return $currentstring;
 }
 
-#-- <option> tag
+#-- <option> tag (end tag optional)
 sub start_option {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
-    } 
+    } elsif ($target eq 'tex') {
+	$Apache::londefdef::select++;
+	if ($Apache::londefdef::select == 1) {
+	    $currentstring='\noindent\fbox{'.&Apache::lonxml::get_param('value',$parstack,$safeeval).'}\keephidden{';
+	} else {
+	    $currentstring='\keephidden{';
+	}
+    }
     return $currentstring;
 }
 
@@ -250,11 +260,13 @@ sub end_option {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];    
-    } 
+    }  elsif ($target eq 'tex') {
+	$currentstring='}';
+    }
     return $currentstring;
 }
 
-#-- <input> tag
+#-- <input> tag (end tag forbidden)
 sub start_input {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -273,7 +285,7 @@ sub end_input {
     return $currentstring;
 }
 
-#-- <textarea> tag
+#-- <textarea> tag (end tag required)
 sub start_textarea {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -292,7 +304,7 @@ sub end_textarea {
     return $currentstring;
 }
 
-#-- <form> tag
+#-- <form> tag (end tag required)
 sub start_form {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -311,18 +323,18 @@ sub end_form {
     return $currentstring;
 }
 
-#-- <title> tag
+#-- <title> tag (end tag required)
 sub start_title {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	$currentstring .= '\keephidden{' 
+	$currentstring .= '\keephidden{Title of the document:  ' 
     }
     if ($target eq 'meta') {
 	$currentstring='<title>';
-	&start_output();
+	&start_output($target);
     }
     return $currentstring;
 }
@@ -336,13 +348,13 @@ sub end_title {
 	$currentstring .= '}';
     }  
     if ($target eq 'meta') {
-	&end_output();
+	&end_output($target);
 	$currentstring='</title>';
     } 
     return $currentstring;
 }
 
-#-- <meta> tag
+#-- <meta> tag (end tag forbidden)
 sub start_meta {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
@@ -354,8 +366,7 @@ sub start_meta {
 	} else {
 	    $currentstring = $token->[4];
 	}
-    }
-    if ($target eq 'meta') {
+    } elsif ($target eq 'meta') {
 	unless (&Apache::lonxml::get_param
 		('http-equiv',$parstack,$safeeval,undef,1)) {
 	    my $name=$token->[2]->{'name'};
@@ -363,18 +374,38 @@ sub start_meta {
 	    $name=~s/\s/\_/gs;
 	    $name=~s/\W//gs;
 	    if ($name) {
-		$currentstring='<'.$name.'>'.
+		$currentstring='<'.$name;
+                 my $display=&Apache::lonxml::get_param
+		('display',$parstack,$safeeval,undef,1);
+                if ($display) {
+                    $display=~s/\"/\'/g;
+		    $currentstring.=' display="'.$display.'"';
+                }
+		$currentstring.='>'.
 		    &Apache::lonxml::get_param
 			('content',$parstack,$safeeval,undef,1).
-			    '</'.$name.'>';
+			'</'.$name.'>';
 	    }
+            my $display=&Apache::lonxml::get_param
+		('display',$parstack,$safeeval,undef,1);
+            if ($display) {
+		$display=&HTML::Entities::encode($display,'<>&"');
+		$currentstring.='<'.$name.'.display>'.$display.
+                               '</'.$name.'.display>';
+            }
+	}
+    } elsif ($target eq 'tex') {
+	my $content=&Apache::lonxml::get_param('content',$parstack,$safeeval);
+	my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
+	if ((not defined $content) && (not defined $name)) {
+	    &Apache::lonxml::startredirection();
 	}
     }
     return $currentstring;
 }
 
 sub end_meta {
-    my ($target,$token,$tagstack,$parstack,$parser) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	my $args='';
@@ -382,7 +413,13 @@ sub end_meta {
 	if ($args ne '') {
 	    $currentstring = $token->[4];
 	}
-    } 
+    } elsif ($target eq 'tex') {
+	my $content=&Apache::lonxml::get_param('content',$parstack,$safeeval);
+	my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
+	if ((not defined $content) && (not defined $name)) {
+	    &Apache::lonxml::endredirection();
+	}
+    }
     return $currentstring;
 }
 
@@ -431,15 +468,43 @@ sub end_accessrule {
     return $currentstring;
 }
 
-#-- <body> tag
+#-- <body> tag (end tag required)
 sub start_body {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
-	if (!$Apache::lonxml::registered) {
+	if ($Apache::lonhomework::parsing_a_problem) {
+	    &Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");
+	    return '';
+	}
+	if (!$Apache::lonxml::registered && 
+	    $ENV{'request.state'} eq 'published') {
 	    $currentstring.='<head>'.
 		&Apache::lonmenu::registerurl(undef,$target).'</head>';
 	}
+# Accessibility
+	if ($ENV{'browser.imagesuppress'} eq 'on') {
+	    delete($token->[2]->{'background'});
+	}
+	if ($ENV{'browser.fontenhance'} eq 'on') {
+	    my $style='';
+	    foreach my $key (keys(%{$token->[2]})) {
+		if ($key =~ /^style$/i) {
+		    $style.=$token->[2]->{$key}.';';
+		    delete($token->[2]->{$key});
+		}
+	    }
+	    $token->[2]->{'style'}=$style.'; font-size: x-large;';
+	}
+	if ($ENV{'browser.blackwhite'} eq 'on') {
+	    delete($token->[2]->{'font'});
+	    delete($token->[2]->{'link'});
+	    delete($token->[2]->{'alink'});
+	    delete($token->[2]->{'vlink'});
+	    delete($token->[2]->{'bgcolor'});
+	    delete($token->[2]->{'background'});
+	}
+# Overload loads
 	my $onLoad='';
 	foreach my $key (keys(%{$token->[2]})) {
 	    if ($key =~ /^onload$/i) {
@@ -466,12 +531,13 @@ sub start_body {
 	if ($ENV{'request.state'} ne 'published') {
 	    $currentstring.=(<<EDITBUTTON);
 		<form method="post">
-		<input type="submit" name="editmode" value="Edit" />
+		<input type="submit" name="editmode" accesskey="e" value="Edit" />
 		</form>
 EDITBUTTON
 	} else {
 	    $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
 	}
+	$currentstring.=&Apache::lonxml::message_location();
     } elsif ($target eq 'tex') {
 	$currentstring = '\begin{document}';  
     } 
@@ -484,12 +550,12 @@ sub end_body {
     if ($target eq 'web') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
-	$currentstring = '\end{document}';  
+	$currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';  
     } 
     return $currentstring;
 }
 
-#-- <center> tag
+#-- <center> tag (end tag required)
 sub start_center {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -497,9 +563,7 @@ sub start_center {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\begin{center}';  
-    }  elsif ($target eq 'latexsource') {
-	$currentstring = '\begin{center}';  
-    } 
+    }
     return $currentstring;
 }
 
@@ -510,13 +574,11 @@ sub end_center {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\end{center}';  
-    }  elsif ($target eq 'latexsource') {
-	$currentstring = '\end{center}';  
-    } 
+    }
     return $currentstring;
 }
 
-#-- <b> tag
+#-- <b> tag (end tag required)
 sub start_b {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -524,8 +586,6 @@ sub start_b {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\textbf{';  
-    }  elsif ($target eq 'latexsource') {
-	$currentstring = '\textbf{';  
     } 
     return $currentstring;
 }
@@ -537,13 +597,11 @@ sub end_b {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '}';  
-    } elsif ($target eq 'latexsource') {
-	$currentstring = '}';  
     } 
     return $currentstring;
 }
 
-#-- <strong> tag
+#-- <strong> tag (end tag required)
 sub start_strong {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -551,8 +609,6 @@ sub start_strong {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\textbf{';  
-    } elsif ($target eq 'latexsource') {
-	$currentstring = '\textbf{';  
     } 
     return $currentstring;
 }
@@ -560,18 +616,15 @@ sub start_strong {
 sub end_strong {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
-	
+    if ($target eq 'web') {	
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '}';  
-    }  elsif ($target eq 'latexsource') {
-	$currentstring = '}';  
-    } 
+    }
     return $currentstring;
 }
 
-#-- <h1> tag
+#-- <h1> tag (end tag required)
 sub start_h1 {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
@@ -579,7 +632,7 @@ sub start_h1 {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $pre;
-	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') || (not defined $align)) {
 	    $pre='\begin{center}';
 	} elsif ($align eq 'left') {
@@ -592,7 +645,7 @@ sub start_h1 {
 	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; 
     } elsif ($target eq 'meta') {
 	$currentstring='<subject>';
-	&start_output();
+	&start_output($target);
     }
     return $currentstring;
 }
@@ -614,7 +667,7 @@ sub end_h1 {
 	}
 	$currentstring .= '}}'.$post;
     } elsif ($target eq 'meta') {
-	&end_output();
+	&end_output($target);
 	$currentstring='</subject>';
     } 
     return $currentstring;
@@ -835,17 +888,15 @@ sub end_h6 {
     return $currentstring;
 }
 
-#--- <cite> tag
+#--- <cite> tag (end tag required)
 sub start_cite {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\textit{";
-    }  elsif ($target eq 'latexsource') {
-	$currentstring .= "\\textit{";
-    } 
+	$currentstring .= '\textit{';
+    }
     return $currentstring;
 }
 
@@ -855,14 +906,12 @@ sub end_cite {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
-    }  elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
-    } 
+	$currentstring .= '}';
+    }
     return $currentstring;
 }
 
-#-- <i> tag
+#-- <i> tag (end tag required)
 sub start_i {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -870,9 +919,7 @@ sub start_i {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\textit{';
-    }  elsif ($target eq 'latexsource') {
-	$currentstring .= '\textit{';
-    } 
+    }
     return $currentstring;
 }
 
@@ -883,23 +930,19 @@ sub end_i {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
     } 
     return $currentstring;
 }
 
-#-- <address> tag
+#-- <address> tag (end tag required)
 sub start_address {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\textit{";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "\\textit{";
-    } 
+	$currentstring .= '\textit{';
+    }
     return $currentstring;
 }
 
@@ -909,23 +952,19 @@ sub end_address {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
+	$currentstring .= '}';
     }
     return $currentstring;
 }
 
-#-- <dfn> tag
+#-- <dfn> tag (end tag required)
 sub start_dfn {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\textit{";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "\\textit{";
+	$currentstring .= '\textit{';
     } 
     return $currentstring;
 }
@@ -936,14 +975,12 @@ sub end_dfn {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
-    } 
+	$currentstring .= '}';
+    }
     return $currentstring;
 }
 
-#-- <tt> tag
+#-- <tt> tag (end tag required)
 sub start_tt {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -951,9 +988,7 @@ sub start_tt {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\texttt{';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '\texttt{';
-    } 
+    }
     return $currentstring;
 }
 
@@ -964,23 +999,19 @@ sub end_tt {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
     }
     return $currentstring;
 }
 
-#-- <kbd> tag
+#-- <kbd> tag (end tag required)
 sub start_kbd {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\texttt";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "\\texttt{";
-    } 
+	$currentstring .= '\texttt{';
+    }
     return $currentstring;
 }
 
@@ -990,14 +1021,12 @@ sub end_kbd {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
-    } 
+	$currentstring .= '}';
+    }
     return $currentstring;
 }
 
-#-- <code> tag
+#-- <code> tag (end tag required)
 sub start_code {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -1020,7 +1049,7 @@ sub end_code {
     return $currentstring;
 }
 
-#-- <em> tag
+#-- <em> tag (end tag required)
 sub start_em {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -1028,9 +1057,7 @@ sub start_em {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\emph{';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '\emph{';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1041,22 +1068,18 @@ sub end_em {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
-    }  
+    } 
     return $currentstring;
 }
 
-#-- <q> tag
+#-- <q> tag (end tag required)
 sub start_q {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\emph{";
-    }  elsif ($target eq 'latexsource') {
-	$currentstring .= "\\emph{";
+	$currentstring .= '\emph{';
     }
     return $currentstring;
 }
@@ -1067,41 +1090,56 @@ sub end_q {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
-    }  
+	$currentstring .= '}';
+    } 
     return $currentstring;
 }
 
-#-- <p> tag
+#-- <p> tag (end tag optional)
+#optional attribute - align="center|left|right"
 sub start_p {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '{\par ';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '{\par ';
-    } 
+	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
+	if ($align eq 'center') {
+	    $currentstring='\begin{center}\par';
+	} elsif ($align eq 'right') {
+	    $currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{';
+	} elsif ($align eq 'left') {
+	    $currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{';
+	}
+	my $signal=1;#<p> does not work inside <b>...</b> 
+	foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}
+	if (!$signal) {$currentstring = '';}
+	}
+    }
     return $currentstring;
 }
 
 sub end_p {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
+	if ($$tagstack[-1] eq 'p') {
+	    my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
+	    if ($align eq 'center') {		
+		$currentstring .= '\end{center}';
+	    } elsif ($align eq 'right') {
+		$currentstring .= '}}';
+	    } elsif ($align eq 'left') {
+		$currentstring .= '}\hfill}';
+	    }
+	}
     }
     return $currentstring;
 }
 
-#-- <br> tag
+#-- <br> tag (end tag forbidden)
 sub start_br {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
@@ -1109,11 +1147,9 @@ sub start_br {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
-	    $currentstring .= '\vskip 0.2 mm';
+	    $currentstring .= '\vskip 0.2 mm ';
 	}
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '\\';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1126,17 +1162,15 @@ sub end_br {
     return $currentstring;
 }
 
-#-- <big> tag
+#-- <big> tag (end tag required)
 sub start_big {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\large{';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '{\Large ';
-    }  
+	$currentstring .= '{\large ';
+    } 
     return $currentstring;
 }
 
@@ -1147,13 +1181,11 @@ sub end_big {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
     }
     return $currentstring;
 }
 
-#-- <small> tag
+#-- <small> tag (end tag required)
 sub start_small {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -1161,9 +1193,7 @@ sub start_small {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '{\footnotesize ';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '{\footnotesize ';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1174,13 +1204,11 @@ sub end_small {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
     }
     return $currentstring;
 }
 
-#-- <basefont> tag
+#-- <basefont> tag (end tag forbidden)
 sub start_basefont {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
@@ -1209,13 +1237,16 @@ sub end_basefont {
     return $currentstring;
 }
 
-#-- <font> tag
+#-- <font> tag (end tag required)
 sub start_font {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
     if ($target eq 'web') {
 	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
-	if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode++;}
+	if ($face!~/symbol/i) {
+	    if (($ENV{'browser.fontenhance'} eq 'on') || 
+		($ENV{'browser.blackwhite'} eq 'on')) { return ''; }
+	}
 	$currentstring = $token->[4];     
     }  elsif ($target eq 'tex') {
 	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
@@ -1230,8 +1261,6 @@ sub end_font {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $currentstring = '';
     if ($target eq 'web') {
-	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
-	if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode--;}
 	$currentstring = $token->[2];    
     }  elsif ($target eq 'tex') {
 	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
@@ -1242,7 +1271,7 @@ sub end_font {
     return $currentstring;
 }
  
-#-- <strike> tag
+#-- <strike> tag (end tag required)
 sub start_strike {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -1268,7 +1297,7 @@ sub end_strike {
     return $currentstring;
 }
 
-#-- <s> tag
+#-- <s> tag (end tag required)
 sub start_s {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -1294,14 +1323,14 @@ sub end_s {
     return $currentstring;
 }
 
-#-- <sub> tag
+#-- <sub> tag (end tag required)
 sub start_sub {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\$_{ ";
+	$currentstring .= '\ensuremath{_{';
     } 
     return $currentstring;
 }
@@ -1312,19 +1341,19 @@ sub end_sub {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= " }\$";
+	$currentstring .= '}}';
     }
     return $currentstring;
 }
 
-#-- <sup> tag
+#-- <sup> tag (end tag required)
 sub start_sup {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\$^{ ";
+	$currentstring .= '\ensuremath{^{';
     } 
     return $currentstring;
 }
@@ -1335,26 +1364,26 @@ sub end_sup {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= " }\$";
+	$currentstring .= '}}';
     }
     return $currentstring;
 }
 
-#-- <hr> tag
+#-- <hr> tag (end tag forbidden)
 sub start_hr {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,0);
+	my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
 	if (defined $LaTeXwidth) {
 	    if ($LaTeXwidth=~/^%/) {
 		substr($LaTeXwidth,0,1)='';
 		$LaTeXwidth=($LaTeXwidth/100).'\textwidth';
 	    }
 	} else {
-	    $LaTeXwidth ='0.95\textwidth';
+	    $LaTeXwidth ='0.9\textwidth';
 	}
 	my ($pre,$post);
 	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
@@ -1365,7 +1394,7 @@ sub start_hr {
 	} elsif ($align eq 'right') {
 	    $pre=' \hfill \llap{'; $post='}';
 	}
-	$currentstring .= ' \vskip 0 mm \noindent\makebox[\textwidth]{'.$pre.'\makebox['.
+	$currentstring .= ' \vskip 0 mm \noindent\makebox['.$LaTeXwidth.']{'.$pre.'\makebox['.
                                     $LaTeXwidth.'][b]{\hrulefill}'.$post.'}\vskip 0 mm ';
     } 
     return $currentstring;
@@ -1376,12 +1405,11 @@ sub end_hr {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
-    } elsif ($target eq 'tex') {
-    } 
+    }
     return $currentstring;
 }
 
-#-- <div> tag
+#-- <div> tag (end tag required)
 sub start_div {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -1400,52 +1428,52 @@ sub end_div {
     return $currentstring;
 }
 
-#-- <a> tag
+#-- <a> tag (end tag required)
 sub start_a {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } 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.='';
+	}
     }
     return $currentstring;
 }
 
 sub end_a {
-    my ($target,$token,$tagstack,$stackref) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
-    } elsif ($target eq 'tex') {
-	my  $tempor_var = $stackref->[$#$stackref];
-	if (index($tempor_var,'name') != -1 ) {
-	    $tempor_var =~ s/name=([^,]*),/$1/g;
-	} elsif (index($tempor_var,'href') != -1 ) {
-	    $tempor_var =~ s/href=([^,]*),/$1/g;
-	    $currentstring .= " \\ref{$tempor_var}";
-	}
     }
     return $currentstring;
 }
 
-#-- <li> tag
+#-- <li> tag (end tag optional)
 sub start_li {
-    my ($target,$token,$tagstack,$stackref) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	my  $tempor_var = $stackref->[$#$stackref];
-	if (index($tempor_var,'circle') != -1 ) {
-	    $currentstring .= " \\item[o] ";
-	} elsif (index($tempor_var,'square') != -1 ) {
-	    $currentstring .= " \\item[$\Box$] ";
-	} elsif ($tempor_var ne '') { 
-	    $_ = $tempor_var;
-	    m/my\s*([^=]*)=/;
-	    $currentstring .= " \\item[$1] ";
+	my  $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,1);
+	if ($type=~/circle/) {
+	    $currentstring .= ' \item[o] ';
+	} elsif ($type=~/square/) {
+	    $currentstring .= ' \item[$\Box$] ';
+	} elsif ($type ne '') { 
+	    $currentstring .= ' \item['.$type.'] ';
 	} else {
-	    $currentstring .= " \\item ";
+	    $currentstring .= ' \item ';
 	}  
     } 
     return $currentstring;
@@ -1460,7 +1488,7 @@ sub end_li {
     return $currentstring;
 }
 
-#-- <u> tag
+#-- <u> tag (end tag required)
 sub start_u {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -1486,7 +1514,7 @@ sub end_u {
     return $currentstring;
 }
 
-#-- <ul> tag
+#-- <ul> tag (end tag required)
 sub start_ul {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
@@ -1529,7 +1557,7 @@ sub end_ul {
     return $currentstring;
 }
 
-#-- <menu> tag
+#-- <menu> tag (end tag required)
 sub start_menu {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -1552,7 +1580,7 @@ sub end_menu {
     return $currentstring;
 }
 
-#-- <dir> tag
+#-- <dir> tag (end tag required)
 sub start_dir {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -1575,7 +1603,7 @@ sub end_dir {
     return $currentstring;
 }
 
-#-- <ol> tag
+#-- <ol> tag (end tag required)
 sub start_ol {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
@@ -1628,109 +1656,163 @@ sub end_ol {
     return $currentstring;
 }
 
-#-- <dl> tag
+#-- <dl> tag (end tag required)
 sub start_dl {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	$currentstring = '\begin{description}';  
+	$currentstring = '\begin{description}';
+	@Apache::londefdef::description=();
+	$Apache::londefdef::DD_redirection=0;
+	$Apache::londefdef::DT_redirection=0;
     } 
     return $currentstring;
 }
 
 sub end_dl {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
-	$currentstring = '\end{description}';  
+	if ($Apache::londefdef::DT_redirection) {
+	    my $data=&item_cleanup;
+	    push @Apache::londefdef::description,'\item['.$data.']';
+	    $Apache::londefdef::DT_redirection=0;
+	} elsif ($Apache::londefdef::DD_redirection) {
+	    $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
+	}
+	foreach my $element (@Apache::londefdef::description) {
+	    $currentstring.=' '.$element.' ';
+	}
+	@Apache::londefdef::description=();
+	$currentstring.='\end{description}';  
     } 
     return $currentstring;
 }
 
-#-- <dt> tag
+#-- <dt> tag (end tag optional)
 sub start_dt {
-    my ($target,$token) = @_;
-    my $currentstring = '';
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    my $currentstring='';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	$currentstring = '\item[';  
+	if ($Apache::londefdef::DT_redirection) {
+	    my $data=&item_cleanup;
+	    push @Apache::londefdef::description,'\item['.$data.']';
+	    $Apache::londefdef::DT_redirection=0;
+	} elsif ($Apache::londefdef::DD_redirection) {
+	    $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
+	    $Apache::londefdef::DD_redirection=0;
+	}
+	&Apache::lonxml::startredirection();
+	$Apache::londefdef::DT_redirection=1;
     } 
     return $currentstring;
 }
 
 sub end_dt {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];    
     } elsif ($target eq 'tex') {
-	$currentstring = ']';  
+	my $data=&item_cleanup;
+	push @Apache::londefdef::description,'\item['.$data.']';
+	$Apache::londefdef::DT_redirection=0;
     } 
     return $currentstring;
 }
 
-#-- <dd> tag
+sub item_cleanup {
+    my $item=&Apache::lonxml::endredirection();
+    $item=~s/\\begin{center}//g;
+    $item=~s/\\end{center}//g;
+    return $item;
+}
+
+#-- <dd> tag (end tag optional)
 sub start_dd {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
+    } elsif ($target eq 'tex') {
+	if ($Apache::londefdef::DT_redirection) {
+	    my $data=&item_cleanup;
+	    push @Apache::londefdef::description,'\item['.$data.']';
+	    $Apache::londefdef::DT_redirection=0;
+	}
+	$Apache::londefdef::DD_redirection=1;
+	&Apache::lonxml::startredirection();
     } 
     return $currentstring;
 }
 
 sub end_dd {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];    
-    } 
+    }  elsif ($target eq 'tex') {
+	$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
+	$Apache::londefdef::DD_redirection=0;
+    }
     return $currentstring;
 }
 
-#-- <table> tag
+#-- <table> tag (end tag required)
+#list of supported attributes: border,width,TeXwidth
 sub start_table {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $textwidth;
-    if ($#Apache::londefdef::table==0) {
-	$textwidth=&recalc($ENV{'form.textwidth'});
-	$textwidth=~/(\d+)/;
-	$textwidth=$1;
-    } else {
-	$textwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
-    }
-    my $currentstring = '';
+    my ($textwidth,$currentstring)=('','');
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	my $aa = {};
 	push @Apache::londefdef::table, $aa; 
 	$Apache::londefdef::table[-1]{'row_number'} = -1;
-        #table's width
+        #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
+		my $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];
+		}
+	    }
+	}
 	my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
 	if (not defined $TeXwidth) {
 	    my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);
 	    if ($htmlwidth=~/%/) {
+                $Apache::londefdef::table[-1]{'percent'}=1;
 		$htmlwidth=~/(\d+)/;
-		my $value=$1*$textwidth/100;
-		$Apache::londefdef::table[-1]{'width'}=$value;
+		$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;;
 	    } else {
 		$Apache::londefdef::table[-1]{'width'}=$textwidth;
 	    }
 	} elsif ($TeXwidth=~/%/) {
+	    $Apache::londefdef::table[-1]{'percent'}=1;
 	    $TeXwidth=~/(\d+)/;
-	    my $value=$1*$textwidth/100;
-            $Apache::londefdef::table[-1]{'width'}=$value;
+            $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
 	} else {
-	    $Apache::londefdef::table[-1]{'width'}=$textwidth;
+	    $Apache::londefdef::table[-1]{'width'}=$TeXwidth;
 	}        
         #table's border
-	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1); 
+	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 '; 
@@ -1741,9 +1823,18 @@ sub start_table {
 	    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
 	    $Apache::londefdef::table[-1]{'vvinc'} = '';
 	}
-	$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
-	$currentstring = '\keephidden{NEW TABLE ENTRY}';
-    }
+	if ($#Apache::londefdef::table==0) {
+	    $Apache::londefdef::table[-1]{'output'}='\newline\setlength{\tabcolsep}{1 mm}';
+	}
+	$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';
+        $Apache::londefdef::table[-1]{'TeXlen'}=[];
+        $Apache::londefdef::table[-1]{'objectlen'}=[];
+        $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}';
+   }
     return $currentstring;
 }
  
@@ -1755,64 +1846,170 @@ sub end_table {
     } elsif ($target eq 'tex') {
 	my $inmemory = '';
 	my $output = '';
-	#construct header of the table
-	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
-	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
-	    $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
+	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];
+		}	
+	    }
 	}
-	$header_of_table .= '}';
-	#define the length of the table cells
-	#always starts with TeXwidth (if defined everything else is ignored)
-	my @length_row_final = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[0]);
-	for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
-	    my @length_row = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[$in]);
-	    for (my $jn=0;$jn<=$#length_row;$jn++) {
-		if ($length_row_final[$jn]<$length_row[$jn]) {$length_row_final[$jn]=$length_row[$jn];}
-	    }
-	}
-	#continues trying estimate the width of raw data
-	my @length_raw_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]);
-	for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
-	    my @length_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[$in]);
-	    for (my $jn=0;$jn<=$#length_row;$jn++) {
-		if ($length_raw_row[$jn]<$length_row[$jn]) {$length_raw_row[$jn]=$length_row[$jn];}
-	    }
-	}
-        #comparing of TeXwidth and raw data width
-	my $available_length=$Apache::londefdef::table[-1]{'width'};
-	my $needed=0;
-	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
-	    if ($length_row_final[$jn]!=0) {
-		$available_length=$available_length-$length_row_final[$jn];
-		$needed++;
-	    }
-	}
-	$needed=$#length_row_final-$needed+1;
-	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
-	    if ($length_row_final[$jn]==0) {
-		if ($length_raw_row[$jn]<$available_length/3) {
-		    $length_row_final[$jn]=$length_raw_row[$jn];
-		    $available_length=$available_length-$length_raw_row[$jn];
-		    $needed--;
+        #free space and number of empty columns
+	my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0);
+##	&Apache::lonnet::logthis("Available space $Apache::londefdef::table[-1]{'width'}");
+	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;}#object size is bigger
+	    if ($min_len[$jn]<$localmin) {$min_len[$jn]=$localmin;}#object size is bigger
+	    if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) {
+		$min_len[$jn]=0;
+		$max_len[$jn]=0;
 	    }
 	}
-	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
-	    if ($length_row_final[$jn]==0) {
-		$length_row_final[$jn]=0.9*$available_length/$needed;
+       #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) {
+##	    &Apache::lonnet::logthis("I am in position 1: $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) {
+##		&Apache::lonnet::logthis("I am in position 2");
+		$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
+		for (my $jn=0;$jn<=$#max_len;$jn++) {
+		    if ($fwidth[$jn]==0) {
+			$fwidth[$jn]=$min_len[$jn];
+		    }
+		}
+	    } else {
+	      #step 3. adjustment over minimal + corrections
+##		&Apache::lonnet::logthis("I am in position 3");
+		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];
+			}
+		    }
+		}
+	    }
+	}
+        #recalculation for the use of all available width if width is defined in %
+        if ($Apache::londefdef::table[-1]{'percent'}==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++) {
-	    for (my $jn=0;$jn<=$#length_row_final;$jn++) {
-		my $substituted=$length_row_final[$jn];
-		$Apache::londefdef::table[-1]{'rowdata'}[$in]=~s/TOBECHANGEDONNUMBER/$substituted mm/;
-	    }
-	    $output .=  $Apache::londefdef::table[-1]{'rowdata'}[$in];
-	    chop $output;
-	    $output .= ' \\\\ ';
+	    for (my $jn=0;$jn<=$#fwidth;$jn++) {
+		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+		    $output.='\begin{center}';
+		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+		    $output.=' \hfill \llap{'
+		}
+		$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
+		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+		    $output.='\end{center}';
+		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+		    $output.='} ';
+		}
+                if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}
+	    }
+	    $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
 	}
-	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
+	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\vskip 0 mm ';
 	if ($#Apache::londefdef::table > 0) {	    
 	    my $inmemory = $Apache::londefdef::table[-1]{'output'};
 	    pop @Apache::londefdef::table;
@@ -1820,12 +2017,13 @@ sub end_table {
 	} else {
 	    $currentstring .= $Apache::londefdef::table[-1]{'output'};
 	    pop @Apache::londefdef::table;
+	    undef @Apache::londefdef::table;
 	}
     }
     return $currentstring;
 }
 
-#-- <tr> tag
+#-- <tr> tag (end tag optional)
 sub start_tr {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
@@ -1833,89 +2031,164 @@ sub start_tr {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$Apache::londefdef::table[-1]{'row_number'}++;
-	my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
+	my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
 	if ($alignchar ne '') {
-	    push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
+	    push @ {$Apache::londefdef::table[-1]{'rows'} },substr($alignchar,0,1);
 	} else {
 	    push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';
 	}
 	push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
 	$Apache::londefdef::table[-1]{'counter_columns'} = -1;
-	$Apache::londefdef::table[-1]{'TeXlength'} = '';
- 	$Apache::londefdef::table[-1]{'length'} = '';
+	push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];
+	push @ {$Apache::londefdef::table[-1]{'objectlen'}}, [];
+	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) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
-	push @{ $Apache::londefdef::table[-1]{'TeXlengthrow'} },$Apache::londefdef::table[-1]{'TeXlength'};
-	push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};
+	if ($Apache::londefdef::TD_redirection) {
+	    &end_td_tex($parstack,$parser,$safeeval);    
+	}
     }
     return $currentstring;
 }
 
-#-- <td> tag
+#-- <td> tag (end tag optional)
 sub start_td {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
-	if ($what_to_push eq '') {
-	    $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
-	}
-	push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
-	$Apache::londefdef::table[-1]{'counter_columns'}++;
-	&Apache::lonxml::startredirection();
+	$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; 
+    for (my $i=$#ar-1;$i>=0;$i--) {
+	if (lc($$tagstack[$i]) eq $good_tag) {
+	    &start_td_tex($parstack,$parser,$safeeval);
+	    last;
+	} elsif (lc($$tagstack[$i]) eq $bad_tag) {
+	    splice @ar, $i+1;
+	    &end_td_tex(\@ar,$parser,$safeeval);
+	    &start_td_tex($parstack,$parser,$safeeval);
+	    last;
+	}
+    }
+    return '';
+}
+ 
+sub start_td_tex {
+    my ($parstack,$parser,$safeeval) = @_;
+    my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
+    if ($alignchar eq '') {
+	$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];
+    }
+    push @{ $Apache::londefdef::table[-1]{'align'}[$Apache::londefdef::table[-1]{'row_number'}] }, $alignchar;
+    $Apache::londefdef::table[-1]{'counter_columns'}++;
+    my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
+    if (defined $TeXwidth) {		
+	my $current_length=&recalc($TeXwidth);
+	$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 ($parstack,$parser,$safeeval) = @_;
+    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);
+    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';
+    } 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;
+	    my $fwidth=0;
+            while ($garbage_data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
+		my $current_length=&recalc($1);
+		$current_length=~/(\d+\.?\d*)/;
+		if ($fwidth<$1) {$fwidth=$1;}
+		$garbage_data=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
+	    }
+            while ($garbage_data=~m/\[(\d+\.?\d*)\s*mm\]/) {
+		my $current_length=$1;
+		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';
+	} else {  
+	    $data=~s/^\s+(\S.*)/$1/; 
+	    $data=~s/(.*\S)\s+$/$1/;
+	    $data=~s/(\s)+/$1/;
+	    my ($current_length,$min_length)=(0,0);
+	    if ($data=~/\\vskip/) {
+                my $newdata=$data;
+		$newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;
+		my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);
+		foreach my $elementdata (@newdata) {
+		    my $lengthnewdata=2.5*&LATEX_length($elementdata);
+		    if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}
+                    my @words=split(/ /,$elementdata);
+		    foreach my $word (@words) {
+			my $lengthword=2.5*&LATEX_length($word);
+			if ($min_length<$lengthword) {$min_length=$lengthword;}
+		    }
+		}
+	    } else {
+		$current_length=2.5*&LATEX_length($data);
+                    my @words=split(/ /,$data);
+		    foreach my $word (@words) {
+			my $lengthword=2.5*&LATEX_length($word);
+			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 $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {         
+	    $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
+	}
+    push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
+    return'';
+}
+
 sub end_td {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
-	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);
-	if (defined $TeXwidth) {		
-	    my $current_length=&recalc($TeXwidth);
-	    $current_length=~/(\d+)/;
-	    $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
-	    $Apache::londefdef::table[-1]{'length'} .= '0,';
-	} else {
-	    if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
-		my $current_length=&recalc($1);
-		$current_length=~/(\d+)/;
-		$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
-		$Apache::londefdef::table[-1]{'length'} .= '0,';
-	    } else {     
-		$data=~/^\s*(\S.*)/;
-		$data=$1;
-		$data=~/(.*\S)\s*$/;
-		$data=$1;
-		my $current_length=2*length($data);
-		$Apache::londefdef::table[-1]{'length'} .= $current_length.',';
-		$Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
-	    }        
-	}
-	for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {                                
-	    $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
-	}
-	@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
+        $Apache::londefdef::TD_redirection =0;
+	&end_td_tex($parstack,$parser,$safeeval);
     }
     return $currentstring;
 }
 
-#-- <th> tag
+#-- <th> tag (end tag optional)
 sub start_th {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
@@ -1971,20 +2244,22 @@ sub end_th {
     }
     return $currentstring;
 }
-#-- <img> tag
+#-- <img> tag (end tag forbidden)
 sub start_img {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
 					 undef,1);
+    if (not $src and ($target eq 'web' or $target eq 'tex')) { 
+	my $inside = &Apache::lonxml::get_all_text("/img",$parser);
+	&Apache::lonnet::logthis("inside was $inside");
+	return '';
+    }
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
     my $currentstring = '';
-    my $width_param = '';
-    my $height_param = '';
     my $scaling = .3;
-    
     if ($target eq 'web') {
 	if ($ENV{'browser.imagesuppress'} ne 'on') {
-	    $currentstring = $token->[4];
+	    $currentstring.= $token->[4];
 	} else {
 	    my $alttag= &Apache::lonxml::get_param
 		('alt',$parstack,$safeeval,undef,1);
@@ -1992,42 +2267,15 @@ sub start_img {
 		$alttag=&Apache::lonmeta::alttag
 		    ($Apache::lonxml::pwd[-1],$src);
 	    }
-	    $currentstring='[IMAGE: '.$alttag.']';
+	    $currentstring.='[IMAGE: '.$alttag.']';
 	}
     } elsif ($target eq 'tex') {
 	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-	&image_replication($src);
-	
 	#if original gif/jpg/png file exist do following:
-	if (-e $src) {          
-	    #defines the default size of image
-	    my $image = Image::Magick->new;
-	    my $current_figure = $image->Read($src);
-	    $width_param = $image->Get('width') * $scaling;;
-	    $height_param = $image->Get('height') * $scaling;;
-	    undef $image;
-	    #do we have any specified size of the picture?
-	    my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
-	    my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);
-	    my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
-						   undef,1);
-	    if ($TeXwidth ne '') {  
-		if ($TeXwidth=~/(\d+)\s*\%/) {
-		    $width_param = $1*$ENV{'form.textwidth'}/100;
-		} else { 
-		    $width_param = $TeXwidth;
-		}
-	    } elsif ($TeXheight ne '') {
-		$width_param = $TeXheight/$height_param*$width_param;
-	    } elsif ($width ne '') {
-		$width_param = $width*$scaling;      
-	    }
-	    my $file;
-	    my $path;	
-	    if ($src =~ m!(.*)/([^/]*)$!) {
-		$file = $2; 
-		$path = $1.'/'; 
-	    } 
+	if (-e $src) {
+	    #what is the image size?
+	    my $width_param=&image_size($src,$scaling,$parstack,$safeeval);
+            my ($file,$path)=&file_path($src); 
 	    my $newsrc = $src;
 	    $newsrc =~ s/\.(gif|jpg|png)$/.eps/i;
 	    $file=~s/\.(gif|jpg|png)$/.eps/i;
@@ -2047,12 +2295,8 @@ sub start_img {
 			$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 		    }
 		} else {
-		    #there aren't eps or ps - so create eps 
-		    my $temp_file;
-		    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
-		    $temp_file = Apache::File->new('>>'.$filename); 
-		    print $temp_file "$src\n";
-		    $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+		    #care about eps dynamical generation
+		    $currentstring.='\vskip 1 mm '.&eps_generation($src,$file,$width_param);
 		}
 	    }
 	} else {
@@ -2069,6 +2313,45 @@ sub start_img {
 		#<allow> tag will care about replication 
 	    }
 	}
+    } elsif ($target eq 'edit') {
+	$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 />';
+	$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 />';
+	$currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5);
+	$currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5);
+	$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 .= ' />';
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'src','alt',
+						     'TeXwidth','TeXheight',
+						     'width','height');
+	$src=$token->[2]{'src'};
+	if (!$token->[2]{'width'} && !$token->[2]{'height'}) {
+	    $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+	    &image_replication($src);
+	    if (-e $src) {
+		my $image = Image::Magick->new;
+		my ($width, $height, $size, $format) = $image->Ping($src);
+		if ($width && $height) {
+		    $token->[2]{'width'} =$width;
+		    $token->[2]{'height'}=$height;
+		    $constructtag=1;
+		}
+	    }
+	}
+	if ($constructtag) {$currentstring=&Apache::edit::rebuild_tag($token);}
     }
     return $currentstring;
 }
@@ -2084,7 +2367,7 @@ sub end_img {
     return $currentstring;
 }
 
-#-- <applet> tag
+#-- <applet> tag (end tag required)
 sub start_applet {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     
@@ -2109,7 +2392,16 @@ sub start_applet {
 	    $currentstring='[APPLET: '.$alttag.']';
 	}
     } elsif ($target eq 'tex') {
-	$currentstring = " \\begin{figure} ";
+	my $alttag= &Apache::lonxml::get_param('alt',$parstack,
+					       $safeeval,undef,1);
+	unless ($alttag) {
+	    my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,
+						undef,1);
+	    $alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],
+					     $code);
+	}
+	$currentstring.='\begin{center} \fbox{Java Applet: '.$alttag.
+	    '.}\end{center}';
     } 
     return $currentstring;
 }
@@ -2120,12 +2412,11 @@ sub end_applet {
     if ($target eq 'web') {
 	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring = " \\end{figure}";
     } 
     return $currentstring;
 }
 
-#-- <embed> tag
+#-- <embed> tag (end tag optional/required)
 sub start_embed {    
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
@@ -2143,7 +2434,6 @@ sub start_embed {
 	    $currentstring='[EMBED: '.$alttag.']';
 	}
     } elsif ($target eq 'tex') {
-	$currentstring = " \\begin{figure} ";  
     } 
     return $currentstring;
 }
@@ -2153,13 +2443,12 @@ sub end_embed {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];     
-    } elsif ($target eq 'tex') {
-	$currentstring = " \\end{figure}";  
+    } elsif ($target eq 'tex') {  
     } 
     return $currentstring;
 }
 
-#-- <param> tag
+#-- <param> tag (end tag forbidden)
 sub start_param {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     if (&Apache::lonxml::get_param
@@ -2173,7 +2462,6 @@ sub start_param {
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	$currentstring = " \\begin{figure} ";  
     } 
     return $currentstring;
 }
@@ -2184,7 +2472,6 @@ sub end_param {
     if ($target eq 'web') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
-	$currentstring = " \\end{figure}";  
     } 
     return $currentstring;
 }
@@ -2194,7 +2481,8 @@ sub start_allow {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
+    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+	&Apache::lonnet::clutter($src);
     &image_replication($src);
     my $result;
     if ($target eq 'edit') {
@@ -2215,16 +2503,40 @@ sub end_allow {
     return '';
 }
 
-#-- Frames
+#-- Frames (end tag required)
+#-- <frameset>
 sub start_frameset {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') { 
-	if (!$Apache::lonxml::registered) {
+	if (!$Apache::lonxml::registered &&
+	    $ENV{'request.state'} eq 'published') {
 	    $currentstring.='<head>'.
 		&Apache::lonmenu::registerurl(undef,$target).'</head>';
 	}
-	$currentstring .= $token->[4];
+	my $onLoad='';
+	foreach my $key (keys(%{$token->[2]})) {
+	    if ($key =~ /^onload$/i) {
+		$onLoad.=$token->[2]->{$key}.';';
+		delete($token->[2]->{$key});
+	    }
+	}
+	$token->[2]->{'onload'}=&Apache::lonmenu::loadevents().';'.$onLoad;
+	my $onUnload='';
+	foreach my $key (keys(%{$token->[2]})) {
+	    if ($key =~ /^onunload$/i) {
+		$onUnload.=$token->[2]->{$key}.';';
+		delete($token->[2]->{$key});
+	    }
+	}
+	$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
+	    ';'.$onUnload;
+	
+	$currentstring .= '<'.$token->[1];
+	foreach (keys %{$token->[2]}) {
+	    $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
+	}
+	$currentstring.='>';
     }
     return $currentstring;
 }
@@ -2238,16 +2550,37 @@ sub end_frameset {
     return $currentstring;
 }
 
-#-- <pre>
+#-- <xmp> (end tag required)
+sub start_xmp {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    my $currentstring = '';
+    if ($target eq 'web') {
+	$currentstring .= $token->[4];
+    } elsif ($target eq 'tex') {
+	$currentstring .= '\begin{verbatim}';
+    } 
+    return $currentstring;
+}
+
+sub end_xmp {
+    my ($target,$token) = @_;
+    my $currentstring = '';
+    if ($target eq 'web') {
+	$currentstring .= $token->[2];
+    } elsif ($target eq 'tex') {
+	$currentstring .= '\end{verbatim}';
+    }
+    return $currentstring;
+}
+
+#-- <pre> (end tag required)
 sub start_pre {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	my $width = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
-	if (not defined $width) {$width ='\textwidth';}
-	$currentstring .= '\parbox['.$width.']{\begin{verbatim}';
+	$currentstring .= '\begin{verbatim}';
     } 
     return $currentstring;
 }
@@ -2258,7 +2591,7 @@ sub end_pre {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\end{verbatim}}';
+	$currentstring .= '\end{verbatim}';
     }
     return $currentstring;
 }
@@ -2323,7 +2656,7 @@ sub end_blankspace {
     return $currentstring;
 }
 
-#-- <abbr> tag
+#-- <abbr> tag (end tag required)
 sub start_abbr {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2342,7 +2675,7 @@ sub end_abbr {
     return $currentstring;
 }
 
-#-- <acronym> tag
+#-- <acronym> tag (end tag required)
 sub start_acronym {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2361,7 +2694,7 @@ sub end_acronym {
     return $currentstring;
 }
 
-#-- <area> tag
+#-- <area> tag (end tag forbidden)
 sub start_area {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2380,13 +2713,13 @@ sub end_area {
     return $currentstring;
 }
 
-#-- <base> tag
+#-- <base> tag (end tag forbidden)
 sub start_base {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
-    } 
+    }
     return $currentstring;
 }
 
@@ -2399,7 +2732,7 @@ sub end_base {
     return $currentstring;
 }
 
-#-- <bdo> tag
+#-- <bdo> tag (end tag required)
 sub start_bdo {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2418,7 +2751,7 @@ sub end_bdo {
     return $currentstring;
 }
 
-#-- <bgsound> tag
+#-- <bgsound> tag (end tag optional)
 sub start_bgsound {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2437,7 +2770,7 @@ sub end_bgsound {
     return $currentstring;
 }
 
-#-- <blink> tag
+#-- <blink> tag (end tag required)
 sub start_blink {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2456,7 +2789,7 @@ sub end_blink {
     return $currentstring;
 }
 
-#-- <blockquote> tag
+#-- <blockquote> tag (end tag required)
 sub start_blockquote {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2475,7 +2808,7 @@ sub end_blockquote {
     return $currentstring;
 }
 
-#-- <button> tag
+#-- <button> tag (end tag required)
 sub start_button {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2494,7 +2827,7 @@ sub end_button {
     return $currentstring;
 }
 
-#-- <caption> tag
+#-- <caption> tag (end tag required)
 sub start_caption {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2513,7 +2846,7 @@ sub end_caption {
     return $currentstring;
 }
 
-#-- <col> tag
+#-- <col> tag (end tag forbdden)
 sub start_col {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2532,7 +2865,7 @@ sub end_col {
     return $currentstring;
 }
 
-#-- <colgroup> tag
+#-- <colgroup> tag (end tag optional)
 sub start_colgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2551,7 +2884,7 @@ sub end_colgroup {
     return $currentstring;
 }
 
-#-- <del> tag
+#-- <del> tag (end tag required)
 sub start_del {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2570,7 +2903,7 @@ sub end_del {
     return $currentstring;
 }
 
-#-- <fieldset> tag
+#-- <fieldset> tag (end tag required)
 sub start_fieldset {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2589,7 +2922,7 @@ sub end_fieldset {
     return $currentstring;
 }
 
-#-- <frame> tag
+#-- <frame> tag (end tag forbidden)
 sub start_frame {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2608,7 +2941,7 @@ sub end_frame {
     return $currentstring;
 }
 
-#-- <iframe> tag
+#-- <iframe> tag (end tag required)
 sub start_iframe {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2627,7 +2960,7 @@ sub end_iframe {
     return $currentstring;
 }
 
-#-- <ins> tag
+#-- <ins> tag (end tag required)
 sub start_ins {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2646,7 +2979,7 @@ sub end_ins {
     return $currentstring;
 }
 
-#-- <isindex> tag
+#-- <isindex> tag (end tag forbidden)
 sub start_isindex {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2665,7 +2998,7 @@ sub end_isindex {
     return $currentstring;
 }
 
-#-- <keygen> tag
+#-- <keygen> tag (end tag forbidden)
 sub start_keygen {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2703,7 +3036,7 @@ sub end_label {
     return $currentstring;
 }
 
-#-- <layer> tag
+#-- <layer> tag (end tag required)
 sub start_layer {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2722,7 +3055,7 @@ sub end_layer {
     return $currentstring;
 }
 
-#-- <legend> tag
+#-- <legend> tag (end tag required)
 sub start_legend {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2741,7 +3074,7 @@ sub end_legend {
     return $currentstring;
 }
 
-#-- <link> tag
+#-- <link> tag (end tag forbidden)
 sub start_link {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2760,7 +3093,7 @@ sub end_link {
     return $currentstring;
 }
 
-#-- <marquee> tag
+#-- <marquee> tag (end tag optional)
 sub start_marquee {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2779,8 +3112,8 @@ sub end_marquee {
     return $currentstring;
 }
 
-#-- <malticol> tag
-sub start_malticol {
+#-- <multicol> tag (end tag required)
+sub start_multicol {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
@@ -2789,7 +3122,7 @@ sub start_malticol {
     return $currentstring;
 }
 
-sub end_malticol {
+sub end_multicol {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
@@ -2798,13 +3131,15 @@ sub end_malticol {
     return $currentstring;
 }
 
-#-- <nobr> tag
+#-- <nobr> tag (end tag required)
 sub start_nobr {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
-    } 
+    }  elsif ($target eq 'tex') {
+	$currentstring='\mbox{';
+    }
     return $currentstring;
 }
 
@@ -2813,11 +3148,13 @@ sub end_nobr {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];    
-    } 
+    }   elsif ($target eq 'tex') {
+	$currentstring='}';
+    }
     return $currentstring;
 }
 
-#-- <noembed> tag
+#-- <noembed> tag (end tag required)
 sub start_noembed {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2836,7 +3173,7 @@ sub end_noembed {
     return $currentstring;
 }
 
-#-- <noframes> tag
+#-- <noframes> tag (end tag required)
 sub start_noframes {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2855,7 +3192,7 @@ sub end_noframes {
     return $currentstring;
 }
 
-#-- <nolayer> tag
+#-- <nolayer> tag (end tag required)
 sub start_nolayer {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2874,7 +3211,7 @@ sub end_nolayer {
     return $currentstring;
 }
 
-#-- <noscript> tag
+#-- <noscript> tag (end tag required)
 sub start_noscript {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2893,7 +3230,7 @@ sub end_noscript {
     return $currentstring;
 }
 
-#-- <object> tag
+#-- <object> tag (end tag required)
 sub start_object {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2912,7 +3249,7 @@ sub end_object {
     return $currentstring;
 }
 
-#-- <optgroup> tag
+#-- <optgroup> tag (end tag required)
 sub start_optgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2931,13 +3268,15 @@ sub end_optgroup {
     return $currentstring;
 }
 
-#-- <samp> tag
+#-- <samp> tag (end tag required)
 sub start_samp {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
-    } 
+    } elsif ($target eq 'tex') {
+	$currentstring='\texttt{';
+    }
     return $currentstring;
 }
 
@@ -2946,7 +3285,9 @@ sub end_samp {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];    
-    } 
+    } elsif ($target eq 'tex') {
+	$currentstring='}';
+    }
     return $currentstring;
 }
 
@@ -2969,7 +3310,7 @@ sub end_server {
     return $currentstring;
 }
 
-#-- <spacer> tag
+#-- <spacer> tag (end tag forbidden)
 sub start_spacer {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2988,7 +3329,7 @@ sub end_spacer {
     return $currentstring;
 }
 
-#-- <span> tag
+#-- <span> tag (end tag required)
 sub start_span {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3007,7 +3348,7 @@ sub end_span {
     return $currentstring;
 }
 
-#-- <tbody> tag
+#-- <tbody> tag (end tag optional)
 sub start_tbody {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3026,7 +3367,7 @@ sub end_tbody {
     return $currentstring;
 }
 
-#-- <tfoot> tag
+#-- <tfoot> tag (end tag optional)
 sub start_tfoot {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3045,7 +3386,7 @@ sub end_tfoot {
     return $currentstring;
 }
 
-#-- <thead> tag
+#-- <thead> tag (end tag optional)
 sub start_thead {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3070,7 +3411,9 @@ sub start_var {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
-    } 
+    } elsif ($target eq 'tex') {
+	$currentstring = '\textit{'; 
+    }
     return $currentstring;
 }
 
@@ -3078,12 +3421,14 @@ sub end_var {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
-	$currentstring = $token->[2];    
+	$currentstring = $token->[2];
+    } elsif ($target eq 'tex') {
+	$currentstring = '}'; 
     } 
     return $currentstring;
 }
 
-#-- <wbr> tag
+#-- <wbr> tag (end tag forbidden)
 sub start_wbr {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3102,28 +3447,96 @@ sub end_wbr {
     return $currentstring;
 }
 
+#-- <hideweboutput> tag
+sub start_hideweboutput {
+    my ($target,$token) = @_;
+    if ($target eq 'web') {
+	&Apache::lonxml::startredirection();     
+    } 
+    return '';
+}
+
+sub end_hideweboutput {
+    my ($target,$token) = @_;
+    my $currentstring = '';
+    if ($target eq 'web') {
+	$currentstring = &Apache::lonxml::endredirection();    
+    } 
+    return '';
+}
+
+
 sub image_replication {
     my $src = shift;
-    if (not -e $src) {
-	#replicates image itself
-	&Apache::lonnet::repcopy($src);
-	#replicates eps or ps 
-	my $newsrc = $src;
-	$newsrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
-	if (not -e $newsrc) {
-	    if (&Apache::lonnet::repcopy($newsrc) ne 'OK') {
-		$newsrc =~ s/\.eps$/\.ps/;
-		&Apache::lonnet::repcopy($newsrc);
-	    }
-	}
+    if (not -e $src) { &Apache::lonnet::repcopy($src); }
+    #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;
+    if (not -e $epssrc && not -e $pssrc) {
+	my $result=&Apache::lonnet::repcopy($epssrc);
+	if ($result ne OK) { &Apache::lonnet::repcopy($pssrc); }
     }
     return '';
 }
 
+sub image_size {
+    my ($src,$scaling,$parstack,$safeeval)=@_;
+    #size of image from gif/jpg/jpeg/png 
+    my $image = Image::Magick->new;
+    my $current_figure = $image->Read($src);
+    my $width_param = $image->Get('width') * $scaling;;
+    my $height_param = $image->Get('height') * $scaling;;
+    undef $image;
+    #do we have any specified LaTeX size of the picture?
+    my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
+    my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);
+    #do we have any specified web size of the picture?
+    my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
+					   undef,1);
+    if ($TeXwidth ne '') {  
+	if ($TeXwidth=~/(\d+)\s*\%/) {
+	    $width_param = $1*$ENV{'form.textwidth'}/100;
+	} else { 
+	    $width_param = $TeXwidth;
+	}
+    } elsif ($TeXheight ne '') {
+	$width_param = $TeXheight/$height_param*$width_param;
+    } elsif ($width ne '') {
+	$width_param = $width*$scaling;      
+    }
+    if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}}
+    return $width_param;
+}
+
+sub eps_generation {
+    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";
+    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)/\//;
+    return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+}
+
+sub file_path {     
+    my $src=shift;
+    my ($file,$path); 
+    if ($src =~ m!(.*)/([^/]*)$!) {
+	$file = $2; 
+	$path = $1.'/'; 
+    } 
+    return $file,$path;
+}
+
 sub recalc {
     my $argument = shift;
     if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';}
-    $argument=~/\s*(\d+)\s*(mm|cm|in|pc|pt)/;
+    $argument=~/\s*(\d+\.?\d*)\s*(mm|cm|in|pc|pt)/;
     my $value=$1;
     my $units=$2;
     if ($units eq 'cm') {
@@ -3138,5 +3551,35 @@ sub recalc {
     return $value.' mm';
 }
 
+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)+/$1/;#only one space
+    $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/(\\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;
+    #remove some other LaTeX command
+    $garbage=~s|\\(\w+)\\|\\|g;	 
+    $garbage=~s|\\(\w+)(\s*)|$2|g;	 	 
+    $garbage=~s|\+|11|g;
+
+    &Apache::lonnet::logthis("garbage was just $garbage");
+    my  $value=length($garbage);
+    return $value;
+}
+
+
+
+
 1;
 __END__