--- loncom/xml/londefdef.pm	2000/11/01 17:26:14	1.8
+++ loncom/xml/londefdef.pm	2001/03/26 20:36:10	1.23
@@ -2,6 +2,7 @@
 # Tags Default Definition Module 
 #
 # last modified 06/26/00 by Alexander Sakharuk
+# 11/6,11/30,02/01/01 Gerd Kortemeyer
 
 package Apache::londefdef; 
 
@@ -9,31 +10,27 @@ 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','output'));
+
+    &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
 #-- <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;
-	}
+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 'meta') {
-#              my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]); 
-#	      $currentstring ='';
-#	    }
             if ($target eq 'web') {
 		my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]); 
                 $inside ='\\documentstyle{article}'.$inside;
@@ -107,23 +104,7 @@ sub BEGIN {
             } 
 	   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) = @_;
@@ -216,6 +197,10 @@ sub BEGIN {
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    }
+            if ($target eq 'meta') {
+		$currentstring='<title>';
+                &start_output();
+            }
 	   return $currentstring;
 	}
         sub end_title {
@@ -223,15 +208,32 @@ sub BEGIN {
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[2];    
+            }
+            if ($target eq 'meta') {
+               &end_output();
+               $currentstring='</title>';
             } 
 	   return $currentstring;
 	}
 #-------------------------------------------------------------------------- <meta> tag
       sub start_meta {
-	    my ($target,$token) = @_;
+	    my ($target,$token,$parstack,$parser) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
+              $currentstring = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]);     
+              $currentstring = '';
+	    }
+            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;
 	}
@@ -239,7 +241,7 @@ sub BEGIN {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[2];    
+#              $currentstring = $token->[2];    
             } 
 	   return $currentstring;
 	}
@@ -248,7 +250,7 @@ sub BEGIN {
 	    my ($target,$token) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];     
+#              $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
               $currentstring = " \\begin{document} ";  
 	    } 
@@ -272,6 +274,8 @@ sub BEGIN {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
               $currentstring = " \\begin{center} ";  
+	    }  elsif ($target eq 'latexsource') {
+              $currentstring = " \\begin{center} ";  
 	    } 
 	   return $currentstring;
 	}
@@ -282,6 +286,8 @@ sub BEGIN {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
               $currentstring = " \\end{center}";  
+	    }  elsif ($target eq 'latexsource') {
+              $currentstring = " \\end{center}";  
 	    } 
 	   return $currentstring;
 	}
@@ -292,7 +298,9 @@ sub BEGIN {
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " {\\bf ";  
+              $currentstring = " \\textbf{";  
+	    }  elsif ($target eq 'latexsource') {
+              $currentstring = " \\textbf{";  
 	    } 
 	   return $currentstring;
 	}
@@ -303,6 +311,8 @@ sub BEGIN {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
               $currentstring = "}";  
+	    } elsif ($target eq 'latexsource') {
+              $currentstring = "}";  
 	    } 
 	   return $currentstring;
 	}
@@ -313,7 +323,9 @@ sub BEGIN {
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " {\\bf ";  
+              $currentstring = " \\textbf{";  
+	    } elsif ($target eq 'latexsource') {
+              $currentstring = " \\textbf{";  
 	    } 
 	   return $currentstring;
 	}
@@ -325,6 +337,8 @@ sub BEGIN {
               $currentstring = $token->[2];     
 	    } elsif ($target eq 'tex') {
               $currentstring = "}";  
+	    }  elsif ($target eq 'latexsource') {
+              $currentstring = "}";  
 	    } 
 	   return $currentstring;
 	}
@@ -336,7 +350,10 @@ sub BEGIN {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "\\chapter{ ";
-	    } 
+	    } elsif ($target eq 'meta') {
+		$currentstring='<subject>';
+                &start_output();
+            }
            return $currentstring;
 	}
         sub end_h1 {
@@ -346,7 +363,10 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
-	    } 
+	    } elsif ($target eq 'meta') {
+                &end_output();
+		$currentstring='</subject>';
+            } 
            return $currentstring;
 	}
 #---------------------------------------------------------------------------- <h2> tag
@@ -461,7 +481,9 @@ sub BEGIN {
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\it ";
+		$currentstring .= "\\textit{";
+	    }  elsif ($target eq 'latexsource') {
+		$currentstring .= "\\textit{";
 	    } 
            return $currentstring;
 	}
@@ -472,6 +494,8 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    }  elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    } 
            return $currentstring;
 	}
@@ -482,7 +506,9 @@ sub BEGIN {
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\it ";
+		$currentstring .= "\\textit{";
+	    }  elsif ($target eq 'latexsource') {
+		$currentstring .= "\\textit{";
 	    } 
            return $currentstring;
 	}
@@ -493,6 +519,8 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    } 
            return $currentstring;
 	}
@@ -503,7 +531,9 @@ sub BEGIN {
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\it ";
+		$currentstring .= "\\textit{";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\textit{";
 	    } 
            return $currentstring;
 	}
@@ -514,6 +544,8 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    }
            return $currentstring;
 	}
@@ -524,7 +556,9 @@ sub BEGIN {
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\it ";
+		$currentstring .= "\\textit{";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\textit{";
 	    } 
            return $currentstring;
 	}
@@ -535,6 +569,8 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    } 
            return $currentstring;
 	}
@@ -545,7 +581,9 @@ sub BEGIN {
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\tt ";
+		$currentstring .= "\\texttt{";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\texttt{";
 	    } 
            return $currentstring;
 	}
@@ -556,7 +594,9 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
-	    } 
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
+	    }
            return $currentstring;
 	}
 #---------------------------------------------------------------------------- <kbd> tag
@@ -566,7 +606,9 @@ sub BEGIN {
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\tt ";
+		$currentstring .= "\\texttt";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\texttt{";
 	    } 
            return $currentstring;
 	}
@@ -577,6 +619,8 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
 	    } 
            return $currentstring;
 	}
@@ -608,7 +652,9 @@ sub BEGIN {
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= "{ \\emph ";
+		$currentstring .= "\\emph{";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\emph{";
 	    } 
            return $currentstring;
 	}
@@ -619,7 +665,9 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
-	    } 
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
+	    }  
            return $currentstring;
 	}
 #----------------------------------------------------------------------------- <q> tag
@@ -629,8 +677,10 @@ sub BEGIN {
             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 {
@@ -640,7 +690,9 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "}";
-	    } 
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "}";
+	    }  
            return $currentstring;
 	}
 #----------------------------------------------------------------------------- <p> tag
@@ -651,6 +703,8 @@ sub BEGIN {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "{\\par ";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "{\\par ";
 	    } 
            return $currentstring;
 	}
@@ -660,7 +714,9 @@ sub BEGIN {
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= " }";
+	        $currentstring .= "}";
+            } elsif ($target eq 'latexsource') {
+	        $currentstring .= "}";
             }
            return $currentstring;
 	}
@@ -672,6 +728,8 @@ sub BEGIN {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "\\\\";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "\\\\";
 	    } 
            return $currentstring;
 	}
@@ -691,7 +749,9 @@ sub BEGIN {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "{\\large ";
-	    } 
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "{\\large ";
+	    }  
            return $currentstring;
 	}
         sub end_big {
@@ -701,6 +761,8 @@ sub BEGIN {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
 	        $currentstring .= " }";
+            } elsif ($target eq 'latexsource') {
+	        $currentstring .= " }";
             }
            return $currentstring;
 	}
@@ -712,6 +774,8 @@ sub BEGIN {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		$currentstring .= "{\\footnotesize ";
+	    } elsif ($target eq 'latexsource') {
+		$currentstring .= "{\\footnotesize ";
 	    } 
            return $currentstring;
 	}
@@ -722,18 +786,28 @@ sub BEGIN {
 	       $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) = @_;
@@ -874,7 +948,7 @@ sub BEGIN {
                 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}";
@@ -889,12 +963,16 @@ sub BEGIN {
             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 ";
 	        }  
 	    } 
@@ -1079,7 +1157,7 @@ sub BEGIN {
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-              $currentstring = " \\begin{tabular} ";  
+              $currentstring = "";  
 	    } 
 	   return $currentstring;
 	}
@@ -1089,10 +1167,171 @@ sub BEGIN {
             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__