--- loncom/xml/londefdef.pm	2003/08/08 17:48:40	1.160
+++ loncom/xml/londefdef.pm	2003/10/14 00:21:12	1.180
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.160 2003/08/08 17:48:40 sakharuk Exp $
+# $Id: londefdef.pm,v 1.180 2003/10/14 00:21:12 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -92,9 +92,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);
+	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 ';}
+	$Apache::lonxml::post_evaluate=0;
     } else {
 	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
     }
@@ -164,9 +170,11 @@ sub start_html {
                            \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;
 }
@@ -193,7 +201,7 @@ 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];    
     } 
@@ -321,7 +329,7 @@ sub start_title {
     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>';
@@ -396,7 +404,7 @@ sub start_meta {
 }
 
 sub end_meta {
-    my ($target,$token,$tagstack,$parstack,$parser) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	my $args='';
@@ -405,8 +413,11 @@ sub end_meta {
 	    $currentstring = $token->[4];
 	}
     } elsif ($target eq 'tex') {
-	$currentstring=&Apache::lonxml::endredirection();
-	$currentstring='';
+	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;
 }
@@ -461,7 +472,12 @@ 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>';
 	}
@@ -532,7 +548,7 @@ 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;
 }
@@ -878,7 +894,7 @@ sub start_cite {
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\textit{";
+	$currentstring .= '\textit{';
     }
     return $currentstring;
 }
@@ -889,7 +905,7 @@ sub end_cite {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
+	$currentstring .= '}';
     }
     return $currentstring;
 }
@@ -924,7 +940,7 @@ sub start_address {
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\textit{";
+	$currentstring .= '\textit{';
     }
     return $currentstring;
 }
@@ -935,7 +951,7 @@ sub end_address {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
+	$currentstring .= '}';
     }
     return $currentstring;
 }
@@ -947,7 +963,7 @@ sub start_dfn {
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\textit{";
+	$currentstring .= '\textit{';
     } 
     return $currentstring;
 }
@@ -958,7 +974,7 @@ sub end_dfn {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
+	$currentstring .= '}';
     }
     return $currentstring;
 }
@@ -993,7 +1009,7 @@ sub start_kbd {
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\texttt";
+	$currentstring .= '\texttt{';
     }
     return $currentstring;
 }
@@ -1004,7 +1020,7 @@ sub end_kbd {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
+	$currentstring .= '}';
     }
     return $currentstring;
 }
@@ -1062,7 +1078,7 @@ sub start_q {
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= "\\emph{";
+	$currentstring .= '\emph{';
     }
     return $currentstring;
 }
@@ -1073,7 +1089,7 @@ sub end_q {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= "}";
+	$currentstring .= '}';
     } 
     return $currentstring;
 }
@@ -1402,14 +1418,21 @@ sub start_a {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
-	$a=~s/([^\\])%/$1\\\%/g;
-	$currentstring .= '\ref{'.$a.'}';
+	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,$parstack,$safeeval) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
@@ -1419,7 +1442,7 @@ sub end_a {
 
 #-- <li> tag
 sub start_li {
-    my ($target,$token,$tagstack,$parstack,$safeeval) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
@@ -1622,45 +1645,77 @@ sub start_dl {
     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;
 }
 
+sub item_cleanup {
+    my $item=&Apache::lonxml::endredirection();
+    $item=~s/\\begin{center}//g;
+    $item=~s/\\end{center}//g;
+    return $item;
+}
+
 #-- <dd> tag
 sub start_dd {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
@@ -1668,21 +1723,26 @@ sub start_dd {
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	if ($$tagstack[-2] eq 'dl') {
-	    $currentstring = ' \item [] ';  
-	} elsif ($$tagstack[-2] eq 'dt') {
-	    $currentstring = ']'; 
+	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;
 }
 
@@ -1783,7 +1843,7 @@ sub end_table {
 	$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) {
+		if ($length_raw_row[$jn]<$available_length) {
 		    $length_row_final[$jn]=$length_raw_row[$jn];
 		    $available_length=$available_length-$length_raw_row[$jn];
 		    $needed--;
@@ -1819,7 +1879,7 @@ sub end_table {
     return $currentstring;
 }
 
-#-- <tr> tag
+#-- <tr> tag (end tag optional)
 sub start_tr {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
@@ -1856,7 +1916,7 @@ sub end_tr {
     return $currentstring;
 }
 
-#-- <td> tag
+#-- <td> tag (end tag optional)
 sub start_td {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
@@ -1915,9 +1975,24 @@ sub end_td_tex {
 	    $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
 	    $Apache::londefdef::table[-1]{'length'} .= '0,';
 	} else {  
-	    $data=~s/^\s+(\S.*)/$1/;
+	    $data=~s/^\s+(\S.*)/$1/; 
 	    $data=~s/(.*\S)\s+$/$1/;
-	    my $current_length=2*length($data);
+	    $data=~s/(\s)+/$1/;
+	    my $current_length=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) {
+		    $elementdata=~s/^\s+(\S.*)/$1/; 
+		    $elementdata=~s/(.*\S)\s+$/$1/;
+		    $elementdata=~s/(\s)+/$1/;
+		    my $lengthnewdata=1.8*length($elementdata);
+		    if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}
+		}
+	    } else {
+		$current_length=1.8*length($data);
+	    }
 	    $Apache::londefdef::table[-1]{'length'} .= $current_length.',';
 	    $Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
 	}        
@@ -1941,7 +2016,7 @@ sub end_td {
     return $currentstring;
 }
 
-#-- <th> tag
+#-- <th> tag (end tag optional)
 sub start_th {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
@@ -2134,7 +2209,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;
 }
@@ -2145,7 +2229,6 @@ sub end_applet {
     if ($target eq 'web') {
 	$currentstring = $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring = " \\end{figure}";
     } 
     return $currentstring;
 }
@@ -2168,7 +2251,6 @@ sub start_embed {
 	    $currentstring='[EMBED: '.$alttag.']';
 	}
     } elsif ($target eq 'tex') {
-	$currentstring = " \\begin{figure} ";  
     } 
     return $currentstring;
 }
@@ -2178,8 +2260,7 @@ 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;
 }
@@ -2198,7 +2279,6 @@ sub start_param {
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	$currentstring = " \\begin{figure} ";  
     } 
     return $currentstring;
 }
@@ -2209,7 +2289,6 @@ sub end_param {
     if ($target eq 'web') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
-	$currentstring = " \\end{figure}";  
     } 
     return $currentstring;
 }
@@ -2246,7 +2325,8 @@ 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>';
 	}
@@ -2286,6 +2366,29 @@ sub end_frameset {
     return $currentstring;
 }
 
+#-- <xmp>
+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>
 sub start_pre {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
@@ -2432,7 +2535,7 @@ sub start_base {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
-    } 
+    }
     return $currentstring;
 }
 
@@ -2825,8 +2928,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') {
@@ -2835,7 +2938,7 @@ sub start_malticol {
     return $currentstring;
 }
 
-sub end_malticol {
+sub end_multicol {
     my ($target,$token) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
@@ -2844,13 +2947,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;
 }
 
@@ -2859,11 +2964,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 = '';
@@ -2882,7 +2989,7 @@ sub end_noembed {
     return $currentstring;
 }
 
-#-- <noframes> tag
+#-- <noframes> tag (end tag required)
 sub start_noframes {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2901,7 +3008,7 @@ sub end_noframes {
     return $currentstring;
 }
 
-#-- <nolayer> tag
+#-- <nolayer> tag (end tag required)
 sub start_nolayer {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2920,7 +3027,7 @@ sub end_nolayer {
     return $currentstring;
 }
 
-#-- <noscript> tag
+#-- <noscript> tag (end tag required)
 sub start_noscript {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2939,7 +3046,7 @@ sub end_noscript {
     return $currentstring;
 }
 
-#-- <object> tag
+#-- <object> tag (end tag required)
 sub start_object {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2958,7 +3065,7 @@ sub end_object {
     return $currentstring;
 }
 
-#-- <optgroup> tag
+#-- <optgroup> tag (end tag required)
 sub start_optgroup {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -2977,13 +3084,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;
 }
 
@@ -2992,7 +3101,9 @@ sub end_samp {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[2];    
-    } 
+    } elsif ($target eq 'tex') {
+	$currentstring='}';
+    }
     return $currentstring;
 }
 
@@ -3015,7 +3126,7 @@ sub end_server {
     return $currentstring;
 }
 
-#-- <spacer> tag
+#-- <spacer> tag (end tag forbidden)
 sub start_spacer {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3034,7 +3145,7 @@ sub end_spacer {
     return $currentstring;
 }
 
-#-- <span> tag
+#-- <span> tag (end tag required)
 sub start_span {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3053,7 +3164,7 @@ sub end_span {
     return $currentstring;
 }
 
-#-- <tbody> tag
+#-- <tbody> tag (end tag optional)
 sub start_tbody {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3072,7 +3183,7 @@ sub end_tbody {
     return $currentstring;
 }
 
-#-- <tfoot> tag
+#-- <tfoot> tag (end tag optional)
 sub start_tfoot {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3091,7 +3202,7 @@ sub end_tfoot {
     return $currentstring;
 }
 
-#-- <thead> tag
+#-- <thead> tag (end tag optional)
 sub start_thead {
     my ($target,$token) = @_;
     my $currentstring = '';
@@ -3116,7 +3227,9 @@ sub start_var {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
-    } 
+    } elsif ($target eq 'tex') {
+	$currentstring = '\textit{'; 
+    }
     return $currentstring;
 }
 
@@ -3124,12 +3237,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 = '';
@@ -3148,7 +3263,6 @@ sub end_wbr {
     return $currentstring;
 }
 
-
 #-- <hideweboutput> tag
 sub start_hideweboutput {
     my ($target,$token) = @_;