--- loncom/xml/londefdef.pm	2001/03/26 20:36:10	1.23
+++ loncom/xml/londefdef.pm	2002/07/24 19:56:32	1.76
@@ -1,21 +1,62 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
+# $Id: londefdef.pm,v 1.76 2002/07/24 19:56:32 sakharuk Exp $
+# 
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+# Copyright for TtHfunc and TtMfunc by Ian Hutchinson. 
+# TtHfunc and TtMfunc (the "Code") may be compiled and linked into 
+# binary executable programs or libraries distributed by the 
+# Michigan State University (the "Licensee"), but any binaries so 
+# distributed are hereby licensed only for use in the context
+# of a program or computational system for which the Licensee is the 
+# primary author or distributor, and which performs substantial 
+# additional tasks beyond the translation of (La)TeX into HTML.
+# The C source of the Code may not be distributed by the Licensee
+# to any other parties under any circumstances.
+#
+#
 # last modified 06/26/00 by Alexander Sakharuk
-# 11/6,11/30,02/01/01 Gerd Kortemeyer
+# 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer
+# 01/18 Alex Sakharuk
 
 package Apache::londefdef; 
 
+use Apache::lonnet;
 use strict;
 use Apache::lonxml;
+use Apache::File();
+use Image::Magick;
 
-sub BEGIN {
+BEGIN {
 
-    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow'));
+    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','th','td','blankspace','bubble','bubbles','bubbleline'));
 
 }
 
-#===================================================================== TAG SUBROUTINES
+#======================= TAG SUBROUTINES =====================
 #-- <output>
 sub start_output {
   my ($target) = @_;
@@ -28,49 +69,75 @@ sub end_output {
   return '';
 }
 #-- <m> tag
-        sub start_m {
-	    my ($target,$token,$parstack,$parser) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-		my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]); 
-                $inside ='\\documentstyle{article}'.$inside;
-#          &Apache::lonxml::debug($inside);
-                $currentstring = &Apache::lontexconvert::converted(\$inside);
-#          &Apache::lonxml::debug($currentstring);
-
-	    } elsif ($target eq 'tex') {
-              $currentstring = "";
-            }
-	   return $currentstring;
-	}
-        sub end_m {
-	    my ($target,$token) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-            } elsif ($target eq 'tex') {
-              $currentstring = "";
-	    } elsif ($target eq 'meta') {
-            }
-	   return $currentstring;
-	}
-#-------------------------------------------------------------------------- <html> tag    
+sub start_m {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+  my $currentstring = '';
+  if ($target eq 'web') {
+    $Apache::lonxml::prevent_entity_encode++;
+    my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+    $inside ='\\documentstyle{article}'.$inside;
+    &Apache::lonxml::debug("M is starting with:$inside:");
+    my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
+    if ($eval eq 'on') {
+      $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+      #&Apache::lonxml::debug("M is evaulated to:$inside:");
+    }
+    $currentstring = &Apache::lontexconvert::converted(\$inside);
+    if ($Apache::lontexconvert::errorstring) {
+      &Apache::lonxml::warning("tth error: ".
+			       $Apache::lontexconvert::errorstring);
+      $Apache::lontexconvert::errorstring='';
+    }
+    #&Apache::lonxml::debug("M is ends with:$currentstring:");
+  } elsif ($target eq 'tex') {
+    $currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+    if ($currentstring=~/\s*\\\\\s*/) {$currentstring = ' \vskip 0 mm ';}
+  } else {
+    my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+  }
+  return $currentstring;
+}
+sub end_m {
+  my ($target,$token) = @_;
+  my $currentstring = '';
+  if ($target eq 'web') {
+    $Apache::lonxml::prevent_entity_encode--;
+  } elsif ($target eq 'tex') {
+    $currentstring = "";
+  } elsif ($target eq 'meta') {
+  }
+  return $currentstring;
+}
+#-- <html> tag    
       sub start_html {
 	    my ($target,$token) = @_;
             my $currentstring = '';
+	    if ($ENV{'browser.mathml'}) {
+	      &tth::ttminit();
+	    } else {
+	      &tth::tthinit();
+	    }
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
-	    } 
+              $currentstring = &Apache::lonxml::xmlbegin().
+                               &Apache::lonxml::fontsettings();     
+	    } elsif ($target eq 'tex') {
+	      @Apache::londefdef::table = ();
+	      $currentstring .= '\documentclass[letterpaper]{article}
+                                 \newcommand{\keephidden}[1]{}           
+                                 \usepackage[dvips]{graphicx}
+                                 \usepackage{epsfig}\usepackage{calc}';
+	    }
 	   return $currentstring;
 	}
         sub end_html {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];    
-            } 
+		$currentstring = &Apache::lonxml::xmlend();
+	    }
 	   return $currentstring;
 	}
-#-------------------------------------------------------------------------- <head> tag
+#-- <head> tag
       sub start_head {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -83,11 +150,12 @@ sub end_output {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];    
+              $currentstring = &Apache::lonxml::registerurl(undef,$target).
+                               $token->[2];    
             } 
 	   return $currentstring;
 	}
-#--------------------------------------------------------------------------- <map> tag
+#-- <map> tag
       sub start_map {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -104,8 +172,7 @@ sub end_output {
             } 
 	   return $currentstring;
 	}
-
-#------------------------------------------------------------------------ <select> tag
+#-- <select> tag
       sub start_select {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -122,7 +189,7 @@ sub end_output {
             } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------ <option> tag
+#-- <option> tag
       sub start_option {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -139,7 +206,7 @@ sub end_output {
             } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------- <input> tag
+#-- <input> tag
       sub start_input {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -156,7 +223,7 @@ sub end_output {
             } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------- <textarea> tag
+#-- <textarea> tag
       sub start_textarea {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -173,7 +240,7 @@ sub end_output {
             } 
 	   return $currentstring;
 	}
-#-------------------------------------------------------------------------- <form> tag
+#-- <form> tag
       sub start_form {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -190,12 +257,14 @@ sub end_output {
             } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------- <title> tag
+#-- <title> tag
       sub start_title {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
+	    } elsif ($target eq 'tex') {
+              $currentstring .= '\keephidden{' 
 	    }
             if ($target eq 'meta') {
 		$currentstring='<title>';
@@ -208,20 +277,27 @@ sub end_output {
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[2];    
-            }
+            } elsif ($target eq 'tex') {
+              $currentstring .= '}';
+	    }  
             if ($target eq 'meta') {
                &end_output();
                $currentstring='</title>';
             } 
 	   return $currentstring;
 	}
-#-------------------------------------------------------------------------- <meta> tag
+#-- <meta> tag
       sub start_meta {
-	    my ($target,$token,$parstack,$parser) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]);     
-              $currentstring = '';
+	      my $args='';
+	      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+	      if ($args eq '') {
+		&Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]);
+	      } else {
+		$currentstring = $token->[4];
+	      }
 	    }
             if ($target eq 'meta') {
 		unless ($token->[2]->{'http-equiv'}) {
@@ -237,22 +313,61 @@ sub end_output {
 	    }
 	   return $currentstring;
 	}
-        sub end_meta {
-	    my ($target,$token) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-#              $currentstring = $token->[2];    
-            } 
-	   return $currentstring;
-	}
-#-------------------------------------------------------------------------- <body> tag
+      sub end_meta {
+	my ($target,$token,$tagstack,$parstack,$parser) = @_;
+	my $currentstring = '';
+	if ($target eq 'web') {
+	  my $args='';
+	  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
+	  if ($args ne '') {
+	    $currentstring = $token->[4];
+	  }
+	} 
+	return $currentstring;
+      }
+#-- <body> tag
         sub start_body {
-	    my ($target,$token) = @_;
+            my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+#	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-#              $currentstring = $token->[4];     
-	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{document} ";  
+	      if (!$Apache::lonxml::registered) {
+		$currentstring.='<head>'.
+		    &Apache::lonxml::registerurl(undef,$target).'</head>';
+	      }
+	      my $onLoad='';
+	      foreach my $key (keys(%{$token->[2]})) {
+		if ($key =~ /^onload$/i) {
+		  $onLoad.=$token->[2]->{$key}.';';
+		  delete($token->[2]->{$key});
+		}
+	      }
+	      $token->[2]->{'onLoad'}=&Apache::lonxml::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::lonxml::unloadevents().
+		                         ';'.$onUnload;
+
+	      $currentstring .= '<'.$token->[1];
+	      foreach (keys %{$token->[2]}) {
+	      	$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
+	      }
+	      $currentstring.='>';
+	      if ($ENV{'request.state'} ne 'published') {
+		$currentstring.=(<<EDITBUTTON);
+		<form method="post">
+		<input type="submit" name="editmode" value="Edit" />
+		</form>
+EDITBUTTON
+	      }
+       	    } elsif ($target eq 'tex') {
+              $currentstring = '\begin{document}';  
 	    } 
 	   return $currentstring;
 	}
@@ -262,20 +377,20 @@ sub end_output {
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\end{document}";  
+              $currentstring = '\end{document}';  
 	    } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------ <center> tag
+#-- <center> tag
         sub start_center {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{center} ";  
+              $currentstring = '\begin{center}';  
 	    }  elsif ($target eq 'latexsource') {
-              $currentstring = " \\begin{center} ";  
+              $currentstring = '\begin{center}';  
 	    } 
 	   return $currentstring;
 	}
@@ -285,22 +400,22 @@ sub end_output {
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\end{center}";  
+              $currentstring = '\end{center}';  
 	    }  elsif ($target eq 'latexsource') {
-              $currentstring = " \\end{center}";  
+              $currentstring = '\end{center}';  
 	    } 
 	   return $currentstring;
 	}
-#----------------------------------------------------------------------------- <b> tag
+#-- <b> tag
         sub start_b {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\textbf{";  
+              $currentstring = '\textbf{';  
 	    }  elsif ($target eq 'latexsource') {
-              $currentstring = " \\textbf{";  
+              $currentstring = '\textbf{';  
 	    } 
 	   return $currentstring;
 	}
@@ -310,22 +425,23 @@ sub end_output {
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = "}";  
+              $currentstring = '}';  
+
 	    } elsif ($target eq 'latexsource') {
-              $currentstring = "}";  
+              $currentstring = '}';  
 	    } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------ <strong> tag
+#-- <strong> tag
         sub start_strong {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\textbf{";  
+              $currentstring = '\textbf{';  
 	    } elsif ($target eq 'latexsource') {
-              $currentstring = " \\textbf{";  
+              $currentstring = '\textbf{';  
 	    } 
 	   return $currentstring;
 	}
@@ -336,20 +452,20 @@ sub end_output {
 
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = "}";  
+              $currentstring = '}';  
 	    }  elsif ($target eq 'latexsource') {
-              $currentstring = "}";  
+              $currentstring = '}';  
 	    } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------------- <h1> tag
+#-- <h1> tag
         sub start_h1 {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\chapter{ ";
+		$currentstring .= '\large{\textbf{';
 	    } elsif ($target eq 'meta') {
 		$currentstring='<subject>';
                 &start_output();
@@ -362,21 +478,21 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}}';
 	    } elsif ($target eq 'meta') {
                 &end_output();
 		$currentstring='</subject>';
             } 
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <h2> tag
+#-- <h2> tag
         sub start_h2 {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\section{ ";
+		$currentstring .= '\large{\textbf{';
 	    } 
            return $currentstring;
 	}
@@ -386,18 +502,18 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}}';
 	    } 
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <h3> tag
+#-- <h3> tag
         sub start_h3 {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\subsection{ ";
+		$currentstring .= '\large{\textbf{';
 	    } 
            return $currentstring;
 	}
@@ -407,18 +523,18 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}}';
 	    } 
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <h4> tag
+#-- <h4> tag
         sub start_h4 {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\subsubsection{ ";
+		$currentstring .= '\large{\textbf{';
 	    } 
            return $currentstring;
 	}
@@ -428,18 +544,18 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}}';
 	    } 
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <h5> tag
+#-- <h5> tag
         sub start_h5 {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\paragraph{ ";
+		$currentstring .= '\large{\textbf{';
 	    } 
            return $currentstring;
 	}
@@ -449,18 +565,18 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}}';
 	    } 
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <h6> tag
+#-- <h6> tag
         sub start_h6 {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\subparagraph{ ";
+		$currentstring .= '\large{\textbf{';
 	    } 
            return $currentstring;
 	}
@@ -470,11 +586,11 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}}';
 	    } 
            return $currentstring;
 	}
-#-------------------------------------------------------------------------- <cite> tag
+#--- <cite> tag
         sub start_cite {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -499,16 +615,16 @@ sub end_output {
 	    } 
            return $currentstring;
 	}
-#----------------------------------------------------------------------------- <i> tag
+#-- <i> tag
         sub start_i {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\textit{";
+		$currentstring .= '\textit{';
 	    }  elsif ($target eq 'latexsource') {
-		$currentstring .= "\\textit{";
+		$currentstring .= '\textit{';
 	    } 
            return $currentstring;
 	}
@@ -518,13 +634,13 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}';
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "}";
+		$currentstring .= '}';
 	    } 
            return $currentstring;
 	}
-#----------------------------------------------------------------------- <address> tag
+#-- <address> tag
         sub start_address {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -549,7 +665,7 @@ sub end_output {
 	    }
            return $currentstring;
 	}
-#--------------------------------------------------------------------------- <dfn> tag
+#-- <dfn> tag
         sub start_dfn {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -574,16 +690,16 @@ sub end_output {
 	    } 
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <tt> tag
+#-- <tt> tag
         sub start_tt {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\texttt{";
+		$currentstring .= '\texttt{';
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "\\texttt{";
+		$currentstring .= '\texttt{';
 	    } 
            return $currentstring;
 	}
@@ -593,13 +709,13 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}';
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "}";
+		$currentstring .= '}';
 	    }
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <kbd> tag
+#-- <kbd> tag
         sub start_kbd {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -624,14 +740,14 @@ sub end_output {
 	    } 
            return $currentstring;
 	}
-#-------------------------------------------------------------------------- <code> tag
+#-- <code> tag
         sub start_code {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\tt ";
+		$currentstring .= '\texttt{';
 	    } 
            return $currentstring;
 	}
@@ -641,20 +757,20 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}';
 	    } 
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <em> tag
+#-- <em> tag
         sub start_em {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\emph{";
+		$currentstring .= '\emph{';
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "\\emph{";
+		$currentstring .= '\emph{';
 	    } 
            return $currentstring;
 	}
@@ -664,13 +780,13 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "}";
+		$currentstring .= '}';
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "}";
+		$currentstring .= '}';
 	    }  
            return $currentstring;
 	}
-#----------------------------------------------------------------------------- <q> tag
+#-- <q> tag
         sub start_q {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -695,16 +811,16 @@ sub end_output {
 	    }  
            return $currentstring;
 	}
-#----------------------------------------------------------------------------- <p> tag
+#-- <p> tag
         sub start_p {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{\\par ";
+		$currentstring .= '{\par ';
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "{\\par ";
+		$currentstring .= '{\par ';
 	    } 
            return $currentstring;
 	}
@@ -714,22 +830,24 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= "}";
+	        $currentstring .= '}';
             } elsif ($target eq 'latexsource') {
-	        $currentstring .= "}";
+	        $currentstring .= '}';
             }
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <br> tag
+#-- <br> tag
         sub start_br {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\\\";
+		if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
+		    $currentstring .= '\vskip 0 mm';
+		}
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "\\\\";
+		$currentstring .= '\\';
 	    } 
            return $currentstring;
 	}
@@ -741,16 +859,16 @@ sub end_output {
 	    }
            return $currentstring;
 	}
-#--------------------------------------------------------------------------- <big> tag
+#-- <big> tag
         sub start_big {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{\\large ";
+		$currentstring .= '\large{';
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "{\\large ";
+		$currentstring .= '{\Large ';
 	    }  
            return $currentstring;
 	}
@@ -760,22 +878,22 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= " }";
+	        $currentstring .= '}';
             } elsif ($target eq 'latexsource') {
-	        $currentstring .= " }";
+	        $currentstring .= '}';
             }
            return $currentstring;
 	}
-#------------------------------------------------------------------------- <small> tag
+#-- <small> tag
         sub start_small {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{\\footnotesize ";
+		$currentstring .= '{\footnotesize ';
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "{\\footnotesize ";
+		$currentstring .= '{\footnotesize ';
 	    } 
            return $currentstring;
 	}
@@ -785,13 +903,13 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= " }";
+	        $currentstring .= '}';
             } elsif ($target eq 'latexsource') {
-	        $currentstring .= " }";
+	        $currentstring .= '}';
             }
            return $currentstring;
 	}
-#---------------------------------------------------------------------- <basefont> tag
+#-- <basefont> tag
       sub start_basefont {
 	my ($target,$token) = @_;
 	my $currentstring = '';
@@ -808,31 +926,35 @@ sub end_output {
 	} 
 	return $currentstring;
       }
-#-------------------------------------------------------------------------- <font> tag
+#-- <font> tag
          sub start_font {
-	    my ($target,$token) = @_;
+	    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->[4];     
 	    } 
 	   return $currentstring;
 	}
         sub end_font {
-	    my ($target,$token) = @_;
+	    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];    
             } 
 	   return $currentstring;
 	} 
-#------------------------------------------------------------------------ <strike> tag
+#-- <strike> tag
         sub start_strike {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{\\underline ";
+		$currentstring .= '\underline{';
 	    } 
            return $currentstring;
 	}
@@ -842,18 +964,18 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= " }";
+	        $currentstring .= '}';
             }
            return $currentstring;
 	}
-#----------------------------------------------------------------------------- <s> tag
+#-- <s> tag
         sub start_s {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{\\underline ";
+		$currentstring .= '\underline{';
 	    } 
            return $currentstring;
 	}
@@ -863,11 +985,11 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= " }";
+	        $currentstring .= '}';
             }
            return $currentstring;
 	}
-#--------------------------------------------------------------------------- <sub> tag
+#-- <sub> tag
         sub start_sub {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -888,7 +1010,7 @@ sub end_output {
             }
            return $currentstring;
 	}
-#--------------------------------------------------------------------------- <sup> tag
+#-- <sup> tag
         sub start_sup {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -909,14 +1031,14 @@ sub end_output {
             }
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <hr> tag
+#-- <hr> tag
         sub start_hr {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\hline ";
+		$currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth - 8 mm][b]{\hrulefill}';
 	    } 
            return $currentstring;
 	}
@@ -929,7 +1051,7 @@ sub end_output {
 	    } 
            return $currentstring;
 	}
-#----------------------------------------------------------------------------- <a> tag
+#-- <a> tag
         sub start_a {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -940,7 +1062,7 @@ sub end_output {
            return $currentstring;
 	}
         sub end_a {
-	    my ($target,$token,$stackref) = @_;
+	    my ($target,$token,$tagstack,$stackref) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
@@ -956,9 +1078,9 @@ sub end_output {
             }
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <li> tag
+#-- <li> tag
         sub start_li {
-	    my ($target,$token,$stackref) = @_;
+	    my ($target,$token,$tagstack,$stackref) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
@@ -986,14 +1108,14 @@ sub end_output {
 	    } 
 	   return $currentstring;
 	}
-#----------------------------------------------------------------------------- <u> tag
+#-- <u> tag
         sub start_u {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{\\underline ";
+		$currentstring .= '\underline{';
 	    } 
            return $currentstring;
 	}
@@ -1003,18 +1125,18 @@ sub end_output {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= " }";
+	        $currentstring .= '}';
             }
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <ul> tag
+#-- <ul> tag
         sub start_ul {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{itemize} ";  
+              $currentstring = '\begin{itemize}';  
 	    } 
 	   return $currentstring;
 	}
@@ -1024,11 +1146,11 @@ sub end_output {
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\end{itemize}";  
+              $currentstring = '\end{itemize}';  
 	    } 
 	   return $currentstring;
 	}
-#-------------------------------------------------------------------------- <menu> tag
+#-- <menu> tag
         sub start_menu {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1049,7 +1171,7 @@ sub end_output {
 	    } 
 	   return $currentstring;
 	}
-#--------------------------------------------------------------------------- <dir> tag
+#-- <dir> tag
         sub start_dir {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1070,14 +1192,14 @@ sub end_output {
 	    } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------------- <ol> tag
+#-- <ol> tag
         sub start_ol {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{enumerate} ";  
+              $currentstring = '\begin{enumerate}';  
 	    } 
 	   return $currentstring;
 	}
@@ -1087,18 +1209,18 @@ sub end_output {
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\end{enumerate}";  
+              $currentstring = '\end{enumerate}';  
 	    } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------------- <dl> tag
+#-- <dl> tag
         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}';  
 	    } 
 	   return $currentstring;
 	}
@@ -1108,18 +1230,18 @@ sub end_output {
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\end{description}";  
+              $currentstring = '\end{description}';  
 	    } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------------- <dt> tag
+#-- <dt> tag
         sub start_dt {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = "\\item[ ";  
+              $currentstring = '\item[';  
 	    } 
 	   return $currentstring;
 	}
@@ -1129,11 +1251,11 @@ sub end_output {
             if ($target eq 'web') {
               $currentstring = $token->[2];    
             } elsif ($target eq 'tex') {
-              $currentstring = "]";  
+              $currentstring = ']';  
 	    } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------------- <dd> tag
+#-- <dd> tag
         sub start_dd {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1150,14 +1272,28 @@ sub end_output {
             } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------- <table> tag
+#-- <table> tag
         sub start_table {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = "";  
+		my $aa = {};
+		push @Apache::londefdef::table, $aa; 
+		$Apache::londefdef::table[-1]{'row_number'} = -1;
+		$Apache::londefdef::table[-1]{'output'} = '\begin{tabular} ';
+		my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
+		unless (defined $border) { $border = 0; }
+		if ($border) { 
+		    $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
+		    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
+		    $Apache::londefdef::table[-1]{'vvinc'} = '|';
+		} else {
+		    $Apache::londefdef::table[-1]{'hinc'} = ''; 
+		    $Apache::londefdef::table[-1]{'vinc'} = '&'; 
+		    $Apache::londefdef::table[-1]{'vvinc'} = '';
+		}
 	    } 
 	   return $currentstring;
 	}
@@ -1167,117 +1303,274 @@ sub end_output {
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = "";  
-	    } 
+		my $inmemory = '';
+		my $output = '';
+		my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
+		my $in;
+		for ($in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
+		    $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
+		}
+		$header_of_table .= '}';
+		for ($in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
+		    $output .=  $Apache::londefdef::table[-1]{'rowdata'}[$in];
+		    chop $output;
+		    $output .= ' \\\\ ';
+		}
+                my @length = split(/,/,$Apache::londefdef::table[-1]{'length'});
+                my $how_many_columns = $#length+1;
+                my $parboxlength = '(\textwidth';
+                for (my $io=0; $io<=$#length;$io++) {
+		    if ($length[$io] ne '') {
+			$parboxlength .= ' - '.$length[$io].' ';
+		    }
+		}
+		$parboxlength .= ')/'.$how_many_columns.' - 7 mm';
+		$output =~ s/\\parbox{}/\\parbox{$parboxlength}/g;
+		$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
+		if ($#Apache::londefdef::table > 0) {
+		    $inmemory = $Apache::londefdef::table[-1]{'output'};
+		    pop @Apache::londefdef::table;
+		    $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory;
+		} else {
+		    $currentstring = $Apache::londefdef::table[-1]{'output'};
+		    $currentstring =~ s/\\\\\s+\\\\/\\\\/g; 
+		    pop @Apache::londefdef::table;
+		}
+	    }
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------- <tr> tag
+#-- <tr> tag
         sub start_tr {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-	      $currentstring = '';
+		$Apache::londefdef::table[-1]{'row_number'}++;
+		my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+		if ($alignchar ne '') {
+		    push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
+		} 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]{'length'} = ''; #just added
+
 	    } 
 	   return $currentstring;
-	}
+	}        
         sub end_tr {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];     
+		$currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = "";  
-	    } 
+#		$currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
+	    }
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------- <td> tag
+#-- <td> tag
         sub start_td {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-	      $currentstring = '';
+		my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),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();
+;
 	    } 
 	   return $currentstring;
-	}
+	}        
         sub end_td {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];     
+		$currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = "";  
-	    } 
+		my $current_row = $Apache::londefdef::table[-1]{'row_number'};
+		my $data=&Apache::lonxml::endredirection();
+		if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) {                 #just added
+                    $Apache::londefdef::table[-1]{'length'} .= $1.',';             #just added
+		}                                                                  #just added
+		@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
+	    }
 	   return $currentstring;
 	}
-# -------------------------------------------------------------------------- <img> tag
-
-        sub start_img {
-	    my ($target,$token) = @_;
-            $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
-                                        $token->[2]->{'src'};
+#-- <th> tag
+        sub start_th {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{figure} ";  
+		my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),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();
+;
 	    } 
 	   return $currentstring;
+	}        
+        sub end_th {
+	    my ($target,$token) = @_;
+            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();
+		if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) {                 #just added
+                    $Apache::londefdef::table[-1]{'length'} .= $1.',';             #just added
+		}                                                                  #just added
+		@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{\textbf{'.$data.'}} '.$Apache::londefdef::table[-1]{'vinc'};
+	    }
+	   return $currentstring;
+	}
+#-- <img> tag
+        sub start_img {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+            $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+                                        $token->[2]->{'src'};
+            my $currentstring = '';
+	    my $width_param = '';
+	    my $height_param = '';
+	    my $scaling = .3;
+
+	    if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } elsif ($target eq 'tex') {
+	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+              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;
+	      my $epssrc = $src;
+	      $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+	      if (not -e $epssrc) {
+		  my $localfile = $epssrc;
+		  $localfile =~ s/.*(\/res)/$1/;	
+		  my $file;
+		  my $path;	
+		  if ($localfile =~ m!(.*)/([^/]*)$!) {
+		      $file = $2;
+		      $path = $1.'/'; 
+		  }	
+		  my $signal_eps = 0;
+		  my @content_directory = &Apache::lonnet::dirlist($path);
+		  for (my $iy=0;$iy<=$#content_directory;$iy++) {
+		      my @tempo_array = split(/&/,$content_directory[$iy]);
+		      $content_directory[$iy] = $tempo_array[0];
+		      if ($file eq $tempo_array[0]) {
+			  $signal_eps = 1;
+			  last;
+		      }
+		  }
+		  if ($signal_eps) {
+		      my $eps_file = &Apache::lonnet::getfile($localfile);
+		  } else {
+		      $localfile = $src;
+		      $localfile =~ s/.*(\/res)/$1/;	
+		      my $as = &Apache::lonnet::getfile($src);		      
+		  }
+	      }
+	      my $file;
+	      my $path;	
+              if ($src =~ m!(.*)/([^/]*)$!) {
+		  $file = $2;
+		  $path = $1.'/'; 
+	      }
+	      my $newsrc = $src;
+	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+	      $file=~s/(\.gif|\.jpg)$/\.eps/i;
+              #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);
+	      if ($TeXwidth ne '') { 
+		  $width_param = $TeXwidth; 
+	      } elsif ($TeXheight ne '') { 
+		  $width_param = $TeXheight/$height_param*$width_param;
+	      } elsif ($width ne '') {
+		  $width_param = $width*$scaling;      
+	      }
+              #where can we find the picture?
+	      if (-e $newsrc) {
+		  if ($path) {
+		      $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+		  }
+	      } else {
+		  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 .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+	      }
+	    }
+	    return $currentstring;
 	}
         sub end_img {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];     
+              $currentstring = $token->[2];
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\end{figure}";  
-	    } 
+              $currentstring = '';
+	    }
 	   return $currentstring;
 	}
-# ----------------------------------------------------------------------- <applet> tag
+#-- <applet> tag
 
         sub start_applet {
 	    my ($target,$token) = @_;
               $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
                                         $token->[2]->{'code'};
-              $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
+              $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
                                         $token->[2]->{'archive'};
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
+              $currentstring = $token->[4];
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{figure} ";  
-	    } 
-	   return $currentstring;
-	}
-        sub end_applet {
-	    my ($target,$token) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-              $currentstring = $token->[2];     
-	    } elsif ($target eq 'tex') {
-              $currentstring = " \\end{figure}";  
+              $currentstring = " \\begin{figure} ";
 	    } 
 	   return $currentstring;
 	}
+sub end_applet {
+    my ($target,$token) = @_;
+    my $currentstring = '';
+    if ($target eq 'web') {
+	$currentstring = $token->[2];
+    } elsif ($target eq 'tex') {
+	$currentstring = " \\end{figure}";
+    } 
+    return $currentstring;
+}
 
-# ------------------------------------------------------------------------ <embed> tag
+#-- <embed> tag
 
-        sub start_embed {
-	    my ($target,$token) = @_;
-            $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
-                                        $token->[2]->{'src'};
-           my $currentstring = '';
-            if ($target eq 'web') {
-              $currentstring = $token->[4];     
-	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{figure} ";  
-	    } 
-	   return $currentstring;
-	}
+sub start_embed {    
+    my ($target,$token) = @_;
+    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+	$token->[2]->{'src'};
+    my $currentstring = '';
+    if ($target eq 'web') {
+	$currentstring = $token->[4];
+    } elsif ($target eq 'tex') {
+	$currentstring = " \\begin{figure} ";  
+    } 
+    return $currentstring;
+}
         sub end_embed {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1289,7 +1582,7 @@ sub end_output {
 	   return $currentstring;
 	}
 
-# ------------------------------------------------------------------------ <param> tag
+#-- <param> tag
 
         sub start_param {
 	    my ($target,$token) = @_;
@@ -1318,7 +1611,7 @@ sub end_output {
 	   return $currentstring;
 	}
 
-# ------------------------------------------------------------------------ <allow> tag
+#-- <allow> tag
 
         sub start_allow {
 	    my ($target,$token) = @_;
@@ -1331,7 +1624,102 @@ sub end_output {
         sub end_allow {
 	   return '';
 	}
-
+#-- Frames
+	sub start_frameset {
+	  my ($target,$token) = @_;
+	  my $currentstring = '';
+	  if ($target eq 'web') { 
+	    if (!$Apache::lonxml::registered) {
+	      $currentstring.='<head>'.
+		  &Apache::lonxml::registerurl(undef,$target).'</head>';
+	    }
+	    $currentstring .= $token->[4];
+	  }
+	  return $currentstring;
+	}
+        sub end_frameset {
+	  my ($target,$token) = @_;
+	  my $currentstring = '';
+	  if ($target eq 'web') {
+	    $currentstring = $token->[2];
+	  }
+	  return $currentstring;
+	}
+#-- <pre>
+	sub start_pre {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= $token->[4];
+	    } elsif ($target eq 'tex') {
+		$currentstring .= '\begin{verbatim}';
+	    } 
+           return $currentstring;
+	}
+        sub end_pre {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= $token->[2];
+	    } elsif ($target eq 'tex') {
+		$currentstring .= '\end{verbatim}';
+	    }
+           return $currentstring;
+	}
+#-- <insert>
+	sub start_insert {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+		my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+	       $currentstring .= '<b>'.$display.'</b>';;
+	    }
+           return $currentstring;
+	}
+        sub end_insert {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= '';
+	    }
+           return $currentstring;
+	}
+#-- <externallink>
+	sub start_externallink {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+		my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+	       $currentstring .= '<b>'.$display.'</b>';;
+	    }
+           return $currentstring;
+	}
+        sub end_externallink {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= '';
+	    }
+           return $currentstring;
+	}
+#-- <blankspace heigth="">
+        sub start_blankspace {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+            my $currentstring = '';
+            if ($target eq 'tex') {
+		my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval);
+		$currentstring .= '\vskip '.$howmuch.' ';
+	    }
+           return $currentstring;
+	}
+        sub end_blankspace {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'tex') {
+	       $currentstring .= '';
+	    }
+           return $currentstring;
+	}
 
 1;
 __END__