--- loncom/xml/londefdef.pm	2000/07/19 20:21:19	1.4
+++ loncom/xml/londefdef.pm	2000/11/06 14:29:53	1.9
@@ -9,19 +9,36 @@ use strict;
 use Apache::lonxml;
 
 sub BEGIN {
-    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','applet','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'));
+    &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','applet','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'));
 }
 
 #===================================================================== TAG SUBROUTINES
+#-- <output>
+        sub start_output {
+ 	    my ($target,$token,$parstack,$parser) = @_;
+            $Apache::lonxml::textredirection = 1; 
+            my $result = '';
+            return $result;
+	}
+        sub end_output {
+ 	    my ($target,$token,$parstack,$parser) = @_;
+            $Apache::lonxml::textredirection = 0;             
+            my $result = '';
+            return $result;
+	}
 #-- <m> tag
         sub start_m {
 	    my ($target,$token,$parstack,$parser) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-		my $inside = $parser->get_text("/m");
-                $currentstring = &Apache::lontexconvert::converted('\\documentstyle{article}'.$inside);
+		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 = "\$";
+              $currentstring = "";
             }
 	   return $currentstring;
 	}
@@ -30,7 +47,8 @@ sub BEGIN {
             my $currentstring = '';
             if ($target eq 'web') {
             } elsif ($target eq 'tex') {
-              $currentstring = "\$";
+              $currentstring = "";
+	    } elsif ($target eq 'meta') {
             }
 	   return $currentstring;
 	}
@@ -824,6 +842,15 @@ sub BEGIN {
 	    } 
            return $currentstring;
 	}
+        sub end_hr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= $token->[2];
+	    } elsif ($target eq 'tex') {
+	    } 
+           return $currentstring;
+	}
 #----------------------------------------------------------------------------- <a> tag
         sub start_a {
 	    my ($target,$token) = @_;