--- loncom/xml/londefdef.pm	2000/06/27 19:35:32	1.2
+++ loncom/xml/londefdef.pm	2000/10/26 14:01:40	1.6
@@ -6,25 +6,28 @@
 package Apache::londefdef; 
 
 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'));
+}
 
 #===================================================================== TAG SUBROUTINES
-#----------------------------------------------------------------------------- <m> tag
-        sub start_mfirst {
-	    my ($target,$token) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-              $currentstring = "\$out = lontexconvert::converted(\$in = '\\documentstyle{article}'.'\$'.\"";     
-	    } elsif ($target eq 'tex') {
-              $currentstring = "\$";
-            }
-	   return $currentstring;
-	}
+#-- <m> tag
         sub start_m {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$parstack,$parser) = @_;
             my $currentstring = '';
+            if ($target eq 'meta') {
+              my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]); 
+	      $currentstring ='';
+	    }
             if ($target eq 'web') {
-              $currentstring = "\$out = lontexconvert::converted(\$in = '\$'.\"";     
+		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 = "\$";
             }
@@ -34,9 +37,9 @@ use strict;
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = "\".'\$') ";    
             } elsif ($target eq 'tex') {
               $currentstring = "\$";
+	    } elsif ($target eq 'meta') {
             }
 	   return $currentstring;
 	}
@@ -830,6 +833,15 @@ use strict;
 	    } 
            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) = @_;