--- loncom/xml/londefdef.pm	2001/02/01 19:10:11	1.20
+++ loncom/xml/londefdef.pm	2001/12/07 18:46:00	1.35
@@ -1,8 +1,44 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
+# $Id: londefdef.pm,v 1.35 2001/12/07 18:46:00 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
 
 package Apache::londefdef; 
 
@@ -11,68 +47,82 @@ use Apache::lonxml;
 
 sub 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','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','frameset'));
 
 }
 
-#===================================================================== TAG SUBROUTINES
+#======================= TAG SUBROUTINES =====================
 #-- <output>
-        sub start_output {
- 	    my ($target,$token) = @_;
-            $Apache::lonxml::textredirection = 1; 
-            my $result = '';
-            return $result;
-	}
-        sub end_output {
- 	    my ($target,$token) = @_;
-            $Apache::lonxml::textredirection = 0;             
-            my $result = '';
-            return $result;
-	}
+sub start_output {
+  my ($target) = @_;
+  if ($target eq 'meta') { $Apache::lonxml::metamode--; }
+  return '';
+}
+sub end_output {
+  my ($target) = @_;
+  if ($target eq 'meta') { $Apache::lonxml::metamode++; }
+  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') {
+    my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]);
+    $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);
+    #&Apache::lonxml::debug("M is ends with:$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_html {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
-	    } 
+              $currentstring = &Apache::lonxml::xmlbegin().
+                               &Apache::lonxml::fontsettings();     
+	    } elsif ($target eq 'tex') {
+	      $currentstring .= '\documentclass[letterpaper]{article}
+                                 \setlength{\oddsidemargin}{-40pt}
+                                 \setlength{\evensidemargin}{-60pt}
+                                 \setlength{\topmargin}{200pt}
+                                 \setlength{\textwidth}{4.4in}
+                                 \setlength{\textheight}{6.8in}
+                                 \setlength{\parindent}{20pt}
+                                 \setlength{\marginparwidth}{90pt}
+                                 \setlength{\textfloatsep}{8pt plus 2.0pt minus 4.0pt}
+                                 \newcommand{\keephidden}[1]{}';
+	    }
 	   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 = '';
@@ -85,11 +135,12 @@ sub BEGIN {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];    
+              $currentstring = &Apache::lonxml::registerurl().
+                               $token->[2];    
             } 
 	   return $currentstring;
 	}
-#--------------------------------------------------------------------------- <map> tag
+#-- <map> tag
       sub start_map {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -106,8 +157,7 @@ sub BEGIN {
             } 
 	   return $currentstring;
 	}
-
-#------------------------------------------------------------------------ <select> tag
+#-- <select> tag
       sub start_select {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -124,7 +174,7 @@ sub BEGIN {
             } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------ <option> tag
+#-- <option> tag
       sub start_option {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -141,7 +191,7 @@ sub BEGIN {
             } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------- <input> tag
+#-- <input> tag
       sub start_input {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -158,7 +208,7 @@ sub BEGIN {
             } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------- <textarea> tag
+#-- <textarea> tag
       sub start_textarea {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -175,7 +225,7 @@ sub BEGIN {
             } 
 	   return $currentstring;
 	}
-#-------------------------------------------------------------------------- <form> tag
+#-- <form> tag
       sub start_form {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -192,12 +242,14 @@ sub BEGIN {
             } 
 	   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>';
@@ -210,19 +262,27 @@ sub BEGIN {
             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) = @_;
+	    my ($target,$token,$tagstack,$parstack,$parser) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
+	      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'}) {
@@ -238,22 +298,51 @@ sub BEGIN {
 	    }
 	   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 $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
-	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{document} ";  
+	      if (!$Apache::lonxml::registered) {
+		$currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';
+	      }
+	      my $onLoad='';
+	      foreach my $key (keys(%{$token->[2]})) {
+		if ($key =~ /^onload$/i) {
+		  $onLoad.=$token->[2]->{$key}.';';
+		  delete($token->[2]->{$key});
+		}
+	      }
+	      $token->[2]->{'onLoad'}=$onLoad.&Apache::lonxml::loadevents();
+	      my $onUnload='';
+	      foreach my $key (keys(%{$token->[2]})) {
+		if ($key =~ /^onunload$/i) {
+		  $onUnload.=$token->[2]->{$key}.';';
+		  delete($token->[2]->{$key});
+		}
+	      }
+	      $token->[2]->{'onUnload'}=$onUnload.
+		&Apache::lonxml::unloadevents();
+
+	      $currentstring .= '<'.$token->[1];
+	      map {
+		$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
+	      } keys %{$token->[2]};
+	      $currentstring.='>';
+       	    } elsif ($target eq 'tex') {
+              $currentstring = '\begin{document}';  
 	    } 
 	   return $currentstring;
 	}
@@ -263,20 +352,20 @@ sub BEGIN {
             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;
 	}
@@ -286,22 +375,22 @@ sub BEGIN {
             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;
 	}
@@ -311,22 +400,23 @@ sub BEGIN {
             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;
 	}
@@ -337,20 +427,20 @@ sub BEGIN {
 
               $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();
@@ -363,21 +453,21 @@ sub BEGIN {
             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;
 	}
@@ -387,18 +477,18 @@ sub BEGIN {
             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;
 	}
@@ -408,18 +498,18 @@ sub BEGIN {
             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;
 	}
@@ -429,18 +519,18 @@ sub BEGIN {
             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;
 	}
@@ -450,18 +540,18 @@ sub BEGIN {
             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;
 	}
@@ -471,11 +561,11 @@ sub BEGIN {
             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 = '';
@@ -500,16 +590,16 @@ sub BEGIN {
 	    } 
            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;
 	}
@@ -519,13 +609,13 @@ sub BEGIN {
             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 = '';
@@ -550,7 +640,7 @@ sub BEGIN {
 	    }
            return $currentstring;
 	}
-#--------------------------------------------------------------------------- <dfn> tag
+#-- <dfn> tag
         sub start_dfn {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -575,16 +665,16 @@ sub BEGIN {
 	    } 
            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;
 	}
@@ -594,13 +684,13 @@ sub BEGIN {
             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 = '';
@@ -625,14 +715,14 @@ sub BEGIN {
 	    } 
            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;
 	}
@@ -642,20 +732,20 @@ sub BEGIN {
             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;
 	}
@@ -665,13 +755,13 @@ sub BEGIN {
             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 = '';
@@ -696,16 +786,16 @@ sub BEGIN {
 	    }  
            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;
 	}
@@ -715,22 +805,22 @@ sub BEGIN {
             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 $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "\\\\";
+		$currentstring .= '\\';
 	    } elsif ($target eq 'latexsource') {
-		$currentstring .= "\\\\";
+		$currentstring .= '\\';
 	    } 
            return $currentstring;
 	}
@@ -742,16 +832,16 @@ sub BEGIN {
 	    }
            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;
 	}
@@ -761,22 +851,22 @@ sub BEGIN {
             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;
 	}
@@ -786,13 +876,13 @@ sub BEGIN {
             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 = '';
@@ -809,7 +899,7 @@ sub BEGIN {
 	} 
 	return $currentstring;
       }
-#-------------------------------------------------------------------------- <font> tag
+#-- <font> tag
          sub start_font {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -826,7 +916,7 @@ sub BEGIN {
             } 
 	   return $currentstring;
 	} 
-#------------------------------------------------------------------------ <strike> tag
+#-- <strike> tag
         sub start_strike {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -847,7 +937,7 @@ sub BEGIN {
             }
            return $currentstring;
 	}
-#----------------------------------------------------------------------------- <s> tag
+#-- <s> tag
         sub start_s {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -868,7 +958,7 @@ sub BEGIN {
             }
            return $currentstring;
 	}
-#--------------------------------------------------------------------------- <sub> tag
+#-- <sub> tag
         sub start_sub {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -889,7 +979,7 @@ sub BEGIN {
             }
            return $currentstring;
 	}
-#--------------------------------------------------------------------------- <sup> tag
+#-- <sup> tag
         sub start_sup {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -910,7 +1000,7 @@ sub BEGIN {
             }
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <hr> tag
+#-- <hr> tag
         sub start_hr {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -930,7 +1020,7 @@ sub BEGIN {
 	    } 
            return $currentstring;
 	}
-#----------------------------------------------------------------------------- <a> tag
+#-- <a> tag
         sub start_a {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -941,7 +1031,7 @@ sub BEGIN {
            return $currentstring;
 	}
         sub end_a {
-	    my ($target,$token,$stackref) = @_;
+	    my ($target,$token,$tagstack,$stackref) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
@@ -957,9 +1047,9 @@ sub BEGIN {
             }
            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];     
@@ -987,7 +1077,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-#----------------------------------------------------------------------------- <u> tag
+#-- <u> tag
         sub start_u {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1008,7 +1098,7 @@ sub BEGIN {
             }
            return $currentstring;
 	}
-#---------------------------------------------------------------------------- <ul> tag
+#-- <ul> tag
         sub start_ul {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1029,7 +1119,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-#-------------------------------------------------------------------------- <menu> tag
+#-- <menu> tag
         sub start_menu {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1050,7 +1140,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-#--------------------------------------------------------------------------- <dir> tag
+#-- <dir> tag
         sub start_dir {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1071,7 +1161,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------------- <ol> tag
+#-- <ol> tag
         sub start_ol {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1092,7 +1182,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------------- <dl> tag
+#-- <dl> tag
         sub start_dl {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1113,7 +1203,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------------- <dt> tag
+#-- <dt> tag
         sub start_dt {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1134,7 +1224,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-#---------------------------------------------------------------------------- <dd> tag
+#-- <dd> tag
         sub start_dd {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1151,7 +1241,7 @@ sub BEGIN {
             } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------- <table> tag
+#-- <table> tag
         sub start_table {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1172,7 +1262,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------- <tr> tag
+#-- <tr> tag
         sub start_tr {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1193,7 +1283,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------- <td> tag
+#-- <td> tag
         sub start_td {
 	    my ($target,$token) = @_;
             my $currentstring = '';
@@ -1214,7 +1304,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-# -------------------------------------------------------------------------- <img> tag
+#-- <img> tag
 
         sub start_img {
 	    my ($target,$token) = @_;
@@ -1238,7 +1328,7 @@ sub BEGIN {
 	    } 
 	   return $currentstring;
 	}
-# ----------------------------------------------------------------------- <applet> tag
+#-- <applet> tag
 
         sub start_applet {
 	    my ($target,$token) = @_;
@@ -1265,7 +1355,7 @@ sub BEGIN {
 	   return $currentstring;
 	}
 
-# ------------------------------------------------------------------------ <embed> tag
+#-- <embed> tag
 
         sub start_embed {
 	    my ($target,$token) = @_;
@@ -1290,7 +1380,7 @@ sub BEGIN {
 	   return $currentstring;
 	}
 
-# ------------------------------------------------------------------------ <param> tag
+#-- <param> tag
 
         sub start_param {
 	    my ($target,$token) = @_;
@@ -1319,7 +1409,7 @@ sub BEGIN {
 	   return $currentstring;
 	}
 
-# ------------------------------------------------------------------------ <allow> tag
+#-- <allow> tag
 
         sub start_allow {
 	    my ($target,$token) = @_;
@@ -1332,7 +1422,25 @@ sub BEGIN {
         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().'</head>';
+	    }
+	    $currentstring .= $token->[4];
+	  }
+	  return $currentstring;
+	}
+        sub end_frameset {
+	  my ($target,$token) = @_;
+	  my $currentstring = '';
+	  if ($target eq 'web') {
+	    $currentstring = $token->[2];
+	  }
+	  return $currentstring;
+	}
 1;
 __END__