--- loncom/xml/londefdef.pm	2000/06/26 21:51:17	1.1
+++ loncom/xml/londefdef.pm	2001/02/01 19:10:11	1.20
@@ -2,31 +2,46 @@
 # Tags Default Definition Module 
 #
 # last modified 06/26/00 by Alexander Sakharuk
+# 11/6,11/30,02/01/01 Gerd Kortemeyer
 
-package Apache::londefaulttag; 
+package Apache::londefdef; 
 
 use strict;
+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'));
+
+}
 
 #===================================================================== 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;
+#-- <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;
 	}
+#-- <m> tag
         sub start_m {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$parstack,$parser) = @_;
             my $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 = "\$";
+              $currentstring = "";
             }
 	   return $currentstring;
 	}
@@ -34,9 +49,9 @@ use strict;
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = "\".'\$') ";    
             } elsif ($target eq 'tex') {
-              $currentstring = "\$";
+              $currentstring = "";
+	    } elsif ($target eq 'meta') {
             }
 	   return $currentstring;
 	}
@@ -91,23 +106,7 @@ use strict;
             } 
 	   return $currentstring;
 	}
-#------------------------------------------------------------------------ <applet> tag
-      sub start_applet {
-	    my ($target,$token) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-              $currentstring = $token->[4];     
-	    } 
-	   return $currentstring;
-	}
-        sub end_applet {
-	    my ($target,$token) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-              $currentstring = $token->[2];    
-            } 
-	   return $currentstring;
-	}
+
 #------------------------------------------------------------------------ <select> tag
       sub start_select {
 	    my ($target,$token) = @_;
@@ -200,6 +199,10 @@ use strict;
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    }
+            if ($target eq 'meta') {
+		$currentstring='<title>';
+                &start_output();
+            }
 	   return $currentstring;
 	}
         sub end_title {
@@ -207,6 +210,10 @@ use strict;
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[2];    
+            }
+            if ($target eq 'meta') {
+               &end_output();
+               $currentstring='</title>';
             } 
 	   return $currentstring;
 	}
@@ -217,6 +224,18 @@ use strict;
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    }
+            if ($target eq 'meta') {
+		unless ($token->[2]->{'http-equiv'}) {
+		    my $name=$token->[2]->{'name'};
+                    $name=~tr/A-Z/a-z/;
+                    $name=~s/\s/\_/g;
+                    if ($name) {
+                       $currentstring='<'.$name.'>'.
+                                         $token->[2]->{'content'}.
+			              '</'.$name.'>';
+		    }
+                }
+	    }
 	   return $currentstring;
 	}
         sub end_meta {
@@ -256,6 +275,8 @@ use strict;
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
               $currentstring = " \\begin{center} ";  
+	    }  elsif ($target eq 'latexsource') {
+              $currentstring = " \\begin{center} ";  
 	    } 
 	   return $currentstring;
 	}
@@ -266,6 +287,8 @@ use strict;
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
               $currentstring = " \\end{center}";  
+	    }  elsif ($target eq 'latexsource') {
+              $currentstring = " \\end{center}";  
 	    } 
 	   return $currentstring;
 	}
@@ -276,7 +299,9 @@ use strict;
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " {\\bf ";  
+              $currentstring = " \\textbf{";  
+	    }  elsif ($target eq 'latexsource') {
+              $currentstring = " \\textbf{";  
 	    } 
 	   return $currentstring;
 	}
@@ -287,6 +312,8 @@ use strict;
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
               $currentstring = "}";  
+	    } elsif ($target eq 'latexsource') {
+              $currentstring = "}";  
 	    } 
 	   return $currentstring;
 	}
@@ -297,7 +324,9 @@ use strict;
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " {\\bf ";  
+              $currentstring = " \\textbf{";  
+	    } elsif ($target eq 'latexsource') {
+              $currentstring = " \\textbf{";  
 	    } 
 	   return $currentstring;
 	}
@@ -309,6 +338,8 @@ use strict;
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
               $currentstring = "}";  
+	    }  elsif ($target eq 'latexsource') {
+              $currentstring = "}";  
 	    } 
 	   return $currentstring;
 	}
@@ -320,7 +351,10 @@ use strict;
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "\\chapter{ ";
-	    } 
+	    } elsif ($target eq 'meta') {
+		$currentstring='<subject>';
+                &start_output();
+            }
            return $currentstring;
 	}
         sub end_h1 {
@@ -330,7 +364,10 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
-	    } 
+	    } elsif ($target eq 'meta') {
+                &end_output();
+		$currentstring='</subject>';
+            } 
            return $currentstring;
 	}
 #---------------------------------------------------------------------------- <h2> tag
@@ -445,7 +482,9 @@ use strict;
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\it ";
+		$currentstring .= "\\textit{";
+	    }  elsif ($target eq 'latexsource') {
+		$currentstring .= "\\textit{";
 	    } 
            return $currentstring;
 	}
@@ -456,6 +495,8 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    }  elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    } 
            return $currentstring;
 	}
@@ -466,7 +507,9 @@ use strict;
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\it ";
+		$currentstring .= "\\textit{";
+	    }  elsif ($target eq 'latexsource') {
+		$currentstring .= "\\textit{";
 	    } 
            return $currentstring;
 	}
@@ -477,6 +520,8 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    } 
            return $currentstring;
 	}
@@ -487,7 +532,9 @@ use strict;
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\it ";
+		$currentstring .= "\\textit{";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\textit{";
 	    } 
            return $currentstring;
 	}
@@ -498,6 +545,8 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    }
            return $currentstring;
 	}
@@ -508,7 +557,9 @@ use strict;
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\it ";
+		$currentstring .= "\\textit{";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\textit{";
 	    } 
            return $currentstring;
 	}
@@ -519,6 +570,8 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    } 
            return $currentstring;
 	}
@@ -529,7 +582,9 @@ use strict;
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\tt ";
+		$currentstring .= "\\texttt{";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\texttt{";
 	    } 
            return $currentstring;
 	}
@@ -540,7 +595,9 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
-	    } 
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
+	    }
            return $currentstring;
 	}
 #---------------------------------------------------------------------------- <kbd> tag
@@ -550,7 +607,9 @@ use strict;
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\tt ";
+		$currentstring .= "\\texttt";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\texttt{";
 	    } 
            return $currentstring;
 	}
@@ -561,6 +620,8 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    } 
            return $currentstring;
 	}
@@ -592,7 +653,9 @@ use strict;
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\emph ";
+		$currentstring .= "\\emph{";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\emph{";
 	    } 
            return $currentstring;
 	}
@@ -603,7 +666,9 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
-	    } 
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
+	    }  
            return $currentstring;
 	}
 #----------------------------------------------------------------------------- <q> tag
@@ -613,8 +678,10 @@ use strict;
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\emph ";
-	    } 
+		$currentstring .= "\\emph{";
+	    }  elsif ($target eq 'latexsource') {
+		$currentstring .= "\\emph{";
+	    }
            return $currentstring;
 	}
         sub end_q {
@@ -624,7 +691,9 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
-	    } 
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
+	    }  
            return $currentstring;
 	}
 #----------------------------------------------------------------------------- <p> tag
@@ -635,6 +704,8 @@ use strict;
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "{\\par ";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "{\\par ";
 	    } 
            return $currentstring;
 	}
@@ -644,7 +715,9 @@ use strict;
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= " }";
+	        $currentstring .= "}";
+            } elsif ($target eq 'latexsource') {
+	        $currentstring .= "}";
             }
            return $currentstring;
 	}
@@ -656,6 +729,8 @@ use strict;
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "\\\\";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\\\";
 	    } 
            return $currentstring;
 	}
@@ -675,7 +750,9 @@ use strict;
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "{\\large ";
-	    } 
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "{\\large ";
+	    }  
            return $currentstring;
 	}
         sub end_big {
@@ -685,6 +762,8 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 	        $currentstring .= " }";
+            } elsif ($target eq 'latexsource') {
+	        $currentstring .= " }";
             }
            return $currentstring;
 	}
@@ -696,6 +775,8 @@ use strict;
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "{\\footnotesize ";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "{\\footnotesize ";
 	    } 
            return $currentstring;
 	}
@@ -706,18 +787,28 @@ use strict;
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 	        $currentstring .= " }";
+            } elsif ($target eq 'latexsource') {
+	        $currentstring .= " }";
             }
            return $currentstring;
 	}
 #---------------------------------------------------------------------- <basefont> tag
       sub start_basefont {
-	    my ($target,$token) = @_;
-            my $currentstring = '';
-            if ($target eq 'web') {
-              $currentstring = $token->[4];     
-	    } 
-	   return $currentstring;
-	}
+	my ($target,$token) = @_;
+	my $currentstring = '';
+	if ($target eq 'web') {
+	  $currentstring = $token->[4];     
+	} 
+	return $currentstring;
+      }
+      sub end_basefont {
+	my ($target,$token) = @_;
+	my $currentstring = '';
+	if ($target eq 'web') {
+	  $currentstring = $token->[4];     
+	} 
+	return $currentstring;
+      }
 #-------------------------------------------------------------------------- <font> tag
          sub start_font {
 	    my ($target,$token) = @_;
@@ -830,6 +921,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) = @_;
@@ -849,7 +949,7 @@ use strict;
                 my  $tempor_var = $stackref->[$#$stackref];
 		if (index($tempor_var,'name') != -1 ) {
 		    $tempor_var =~ s/name=([^,]*),/$1/g;
-	        $currentstring .= " \\label{$tempor_var}";
+#	        $currentstring .= " \\label{$tempor_var}";
 	        } elsif (index($tempor_var,'href') != -1 ) {
 		    $tempor_var =~ s/href=([^,]*),/$1/g;
 	        $currentstring .= " \\ref{$tempor_var}";
@@ -864,12 +964,16 @@ use strict;
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-                my  $tempor_var = $stackref->[$#$stackref-1];
+                my  $tempor_var = $stackref->[$#$stackref];
                 if (index($tempor_var,'circle') != -1 ) {
 	          $currentstring .= " \\item[o] ";
 	        } elsif (index($tempor_var,'square') != -1 ) {
 	               $currentstring .= " \\item[$\Box$] ";
-	        } else {
+	        } elsif ($tempor_var ne '') { 
+		       $_ = $tempor_var;
+                       m/my\s*([^=]*)=/;
+		       $currentstring .= " \\item[$1] ";
+		} else {
 		    $currentstring .= " \\item ";
 	        }  
 	    } 
@@ -1054,7 +1158,7 @@ use strict;
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{tabular} ";  
+              $currentstring = "";  
 	    } 
 	   return $currentstring;
 	}
@@ -1064,10 +1168,171 @@ use strict;
             if ($target eq 'web') {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\end{tabular}";  
+              $currentstring = "";  
+	    } 
+	   return $currentstring;
+	}
+#------------------------------------------------------------------------- <tr> tag
+        sub start_tr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } elsif ($target eq 'tex') {
+	      $currentstring = '';
+	    } 
+	   return $currentstring;
+	}
+        sub end_tr {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+              $currentstring = "";  
 	    } 
 	   return $currentstring;
 	}
+#------------------------------------------------------------------------- <td> tag
+        sub start_td {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[4];     
+	    } elsif ($target eq 'tex') {
+	      $currentstring = '';
+	    } 
+	   return $currentstring;
+	}
+        sub end_td {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+              $currentstring = "";  
+	    } 
+	   return $currentstring;
+	}
+# -------------------------------------------------------------------------- <img> tag
+
+        sub start_img {
+	    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_img {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+              $currentstring = " \\end{figure}";  
+	    } 
+	   return $currentstring;
+	}
+# ----------------------------------------------------------------------- <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]=   
+                                        $token->[2]->{'archive'};
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $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}";  
+	    } 
+	   return $currentstring;
+	}
+
+# ------------------------------------------------------------------------ <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 end_embed {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+              $currentstring = " \\end{figure}";  
+	    } 
+	   return $currentstring;
+	}
+
+# ------------------------------------------------------------------------ <param> tag
+
+        sub start_param {
+	    my ($target,$token) = @_;
+	    if ($token->[2]->{'name'} eq 'cabbase') {
+                      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+					     $token->[2]->{'value'};
+            }   
+            $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_param {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+              $currentstring = $token->[2];     
+	    } elsif ($target eq 'tex') {
+              $currentstring = " \\end{figure}";  
+	    } 
+	   return $currentstring;
+	}
+
+# ------------------------------------------------------------------------ <allow> tag
+
+        sub start_allow {
+	    my ($target,$token) = @_;
+
+            $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
+                                        $token->[2]->{'src'};
+
+	   return '';
+	}
+        sub end_allow {
+	   return '';
+	}
+
 
 1;
 __END__