--- loncom/xml/londefdef.pm	2003/05/21 14:57:31	1.134
+++ loncom/xml/londefdef.pm	2003/06/27 16:12:39	1.146
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.134 2003/05/21 14:57:31 sakharuk Exp $
+# $Id: londefdef.pm,v 1.146 2003/06/27 16:12:39 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -54,7 +54,7 @@ use Apache::lonmeta();
 
 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'));
 
 }
 
@@ -157,8 +157,9 @@ sub start_html {
 	    &Apache::lonxml::fontsettings();     
     } elsif ($target eq 'tex') {
 	@Apache::londefdef::table = ();
-	$currentstring .= '\documentclass[letterpaper]{article}
-                           \newcommand{\keephidden}[1]{}
+	$currentstring .= '\documentclass[letterpaper]{article}'.
+                           #'\batchmode'.
+                           '\newcommand{\keephidden}[1]{}
                            \renewcommand{\deg}{$^{\circ}$}
                            \usepackage{textcomp}
                            \usepackage[dvips]{graphicx}
@@ -354,8 +355,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'};
@@ -366,9 +366,11 @@ sub start_meta {
 		$currentstring='<'.$name.'>'.
 		    &Apache::lonxml::get_param
 			('content',$parstack,$safeeval,undef,1).
-			    '</'.$name.'>';
+			'</'.$name.'>';
 	    }
 	}
+    } elsif ($target eq 'tex') {
+	&Apache::lonxml::startredirection();
     }
     return $currentstring;
 }
@@ -382,7 +384,10 @@ sub end_meta {
 	if ($args ne '') {
 	    $currentstring = $token->[4];
 	}
-    } 
+    } elsif ($target eq 'tex') {
+	$currentstring=&Apache::lonxml::endredirection();
+	$currentstring='';
+    }
     return $currentstring;
 }
 
@@ -497,9 +502,7 @@ sub start_center {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\begin{center}';  
-    }  elsif ($target eq 'latexsource') {
-	$currentstring = '\begin{center}';  
-    } 
+    }
     return $currentstring;
 }
 
@@ -510,9 +513,7 @@ sub end_center {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\end{center}';  
-    }  elsif ($target eq 'latexsource') {
-	$currentstring = '\end{center}';  
-    } 
+    }
     return $currentstring;
 }
 
@@ -524,8 +525,6 @@ sub start_b {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\textbf{';  
-    }  elsif ($target eq 'latexsource') {
-	$currentstring = '\textbf{';  
     } 
     return $currentstring;
 }
@@ -537,8 +536,6 @@ sub end_b {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '}';  
-    } elsif ($target eq 'latexsource') {
-	$currentstring = '}';  
     } 
     return $currentstring;
 }
@@ -551,8 +548,6 @@ sub start_strong {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	$currentstring = '\textbf{';  
-    } elsif ($target eq 'latexsource') {
-	$currentstring = '\textbf{';  
     } 
     return $currentstring;
 }
@@ -565,9 +560,7 @@ sub end_strong {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
 	$currentstring = '}';  
-    }  elsif ($target eq 'latexsource') {
-	$currentstring = '}';  
-    } 
+    }
     return $currentstring;
 }
 
@@ -843,9 +836,7 @@ sub start_cite {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= "\\textit{";
-    }  elsif ($target eq 'latexsource') {
-	$currentstring .= "\\textit{";
-    } 
+    }
     return $currentstring;
 }
 
@@ -856,9 +847,7 @@ sub end_cite {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= "}";
-    }  elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
-    } 
+    }
     return $currentstring;
 }
 
@@ -870,9 +859,7 @@ sub start_i {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\textit{';
-    }  elsif ($target eq 'latexsource') {
-	$currentstring .= '\textit{';
-    } 
+    }
     return $currentstring;
 }
 
@@ -883,8 +870,6 @@ sub end_i {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
     } 
     return $currentstring;
 }
@@ -897,9 +882,7 @@ sub start_address {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= "\\textit{";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "\\textit{";
-    } 
+    }
     return $currentstring;
 }
 
@@ -910,8 +893,6 @@ sub end_address {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= "}";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
     }
     return $currentstring;
 }
@@ -924,8 +905,6 @@ sub start_dfn {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= "\\textit{";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "\\textit{";
     } 
     return $currentstring;
 }
@@ -937,9 +916,7 @@ sub end_dfn {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= "}";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
-    } 
+    }
     return $currentstring;
 }
 
@@ -951,9 +928,7 @@ sub start_tt {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\texttt{';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '\texttt{';
-    } 
+    }
     return $currentstring;
 }
 
@@ -964,8 +939,6 @@ sub end_tt {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
     }
     return $currentstring;
 }
@@ -978,9 +951,7 @@ sub start_kbd {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= "\\texttt";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "\\texttt{";
-    } 
+    }
     return $currentstring;
 }
 
@@ -991,9 +962,7 @@ sub end_kbd {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= "}";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
-    } 
+    }
     return $currentstring;
 }
 
@@ -1028,9 +997,7 @@ sub start_em {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\emph{';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '\emph{';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1041,9 +1008,7 @@ sub end_em {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
-    }  
+    } 
     return $currentstring;
 }
 
@@ -1055,8 +1020,6 @@ sub start_q {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= "\\emph{";
-    }  elsif ($target eq 'latexsource') {
-	$currentstring .= "\\emph{";
     }
     return $currentstring;
 }
@@ -1068,9 +1031,7 @@ sub end_q {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= "}";
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= "}";
-    }  
+    } 
     return $currentstring;
 }
 
@@ -1081,10 +1042,8 @@ sub start_p {
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '{\par ';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '{\par ';
-    } 
+	$currentstring .= '\par ';
+    }
     return $currentstring;
 }
 
@@ -1093,10 +1052,6 @@ sub end_p {
     my $currentstring = '';
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
-    } elsif ($target eq 'tex') {
-	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
     }
     return $currentstring;
 }
@@ -1111,9 +1066,7 @@ sub start_br {
 	if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
 	    $currentstring .= '\vskip 0.2 mm';
 	}
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '\\';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1133,10 +1086,8 @@ sub start_big {
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\large{';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '{\Large ';
-    }  
+	$currentstring .= '{\large ';
+    } 
     return $currentstring;
 }
 
@@ -1147,8 +1098,6 @@ sub end_big {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
     }
     return $currentstring;
 }
@@ -1161,9 +1110,7 @@ sub start_small {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
 	$currentstring .= '{\footnotesize ';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '{\footnotesize ';
-    } 
+    }
     return $currentstring;
 }
 
@@ -1174,8 +1121,6 @@ sub end_small {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '}';
-    } elsif ($target eq 'latexsource') {
-	$currentstring .= '}';
     }
     return $currentstring;
 }
@@ -1412,40 +1357,33 @@ sub start_a {
 }
 
 sub end_a {
-    my ($target,$token,$tagstack,$stackref) = @_;
+    my ($target,$token,$tagstack,$parstack,$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}";
-	}
+	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
+	$currentstring .= '\ref{'.$href.'}';
     }
     return $currentstring;
 }
 
 #-- <li> tag
 sub start_li {
-    my ($target,$token,$tagstack,$stackref) = @_;
+    my ($target,$token,$tagstack,$parstack,$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;
@@ -1696,11 +1634,11 @@ sub end_dd {
 #-- <table> tag
 sub start_table {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $textwidth;
+    my $textwidth='';
     if (not defined @Apache::londefdef::table) {
 	$textwidth=&recalc($ENV{'form.textwidth'});
-	$textwidth=~/(\d+)/;
-	$textwidth=$1;
+	$textwidth=~/(\d+\.?\d*)/;
+	$textwidth=0.95*$1;
     } else {
 	$textwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
     }
@@ -1742,7 +1680,7 @@ sub start_table {
 	    $Apache::londefdef::table[-1]{'vvinc'} = '';
 	}
 	$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
-	$currentstring = '\keephidden{NEW TABLE ENTRY '.$textwidth.'}';
+	$currentstring = '\keephidden{NEW TABLE ENTRY}';
     }
     return $currentstring;
 }
@@ -1820,6 +1758,7 @@ sub end_table {
 	} else {
 	    $currentstring .= $Apache::londefdef::table[-1]{'output'};
 	    pop @Apache::londefdef::table;
+	    undef @Apache::londefdef::table;
 	}
     }
     return $currentstring;
@@ -1885,6 +1824,9 @@ sub end_td {
     } elsif ($target eq 'tex') {
 	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
 	my $data=&Apache::lonxml::endredirection();
+
+	$currentstring.=' SSSS '.$data.' FFFF ';
+
 	my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
 	if (defined $TeXwidth) {		
 	    my $current_length=&recalc($TeXwidth);
@@ -1907,7 +1849,7 @@ sub end_td {
 		$Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
 	    }        
 	}
-	for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {                                
+	for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {         
 	    $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
 	}
 	@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
@@ -2194,7 +2136,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') {
@@ -2267,9 +2210,7 @@ sub start_pre {
     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;
 }
@@ -2280,7 +2221,7 @@ sub end_pre {
     if ($target eq 'web') {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
-	$currentstring .= '\end{verbatim}}';
+	$currentstring .= '\end{verbatim}';
     }
     return $currentstring;
 }