--- loncom/xml/lonxml.pm	2001/03/23 22:08:05	1.60
+++ loncom/xml/lonxml.pm	2001/03/27 16:57:20	1.63
@@ -29,7 +29,7 @@ sub register {
 sub printalltags {
   my $temp;
   foreach $temp (sort keys %Apache::lonxml::alltags) {
-    &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
+#    &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
   }
 }
 use Apache::style;
@@ -97,19 +97,19 @@ sub xmlparse {
  while ( $#pars > -1 ) {
    while ($token = $pars[$#pars]->get_token) {
      if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
-       if (!$metamode) { $result=$token->[1]; }
+       if ($metamode<1) { $result=$token->[1]; }
      } elsif ($token->[0] eq 'PI') {
-       if (!$metamode) { $result=$token->[2]; }
+       if ($metamode<1) { $result=$token->[2]; }
      } elsif ($token->[0] eq 'S') {
        # add tag to stack 	    
        push (@stack,$token->[1]);
        # add parameters list to another stack
        push (@parstack,&parstring($token));
        &increasedepth($token);       
+#       &Apache::lonxml::debug("Checking for $token->[1] style");
        if (exists $style_for_target{$token->[1]}) {
-	 if ($metamode) {
-	   $result = $style_for_target{$token->[1]};
-	 } elsif ($Apache::lonxml::redirection) {
+#	   &Apache::lonxml::debug("Found $token->[1] style");
+	 if ($Apache::lonxml::redirection) {
 	   $Apache::lonxml::outputstack['-1'] .=  
 	     &recurse($style_for_target{$token->[1]},$target,$safeeval,
 		      \%style_for_target,@parstack);
@@ -118,6 +118,7 @@ sub xmlparse {
 				    $safeeval,\%style_for_target,@parstack);
 	 }
        } else {
+#	   &Apache::lonxml::debug("No style for for $token->[1]");
 	 $result = &callsub("start_$token->[1]", $target, $token,\@parstack,
 			    \@pars, $safeeval, \%style_for_target);
        }              
@@ -129,9 +130,7 @@ sub xmlparse {
        }
        
        if (exists $style_for_target{'/'."$token->[1]"}) {
-	 if ($metamode) {
-	   $result = $style_for_target{$token->[1]};
-	 } elsif ($Apache::lonxml::redirection) {
+	 if ($Apache::lonxml::redirection) {
 	   $Apache::lonxml::outputstack['-1'] .=  
 	     &recurse($style_for_target{'/'."$token->[1]"},
 		      $target,$safeeval,\%style_for_target,@parstack);
@@ -191,9 +190,9 @@ sub recurse {
   while ( $#pat > -1 ) {
     while  ($tokenpat = $pat[$#pat]->get_token) {
       if (($tokenpat->[0] eq 'T') || ($tokenpat->[0] eq 'C') || ($tokenpat->[0] eq 'D') ) {
-	$partstring = $tokenpat->[1];
+	if ($metamode<1) { $partstring=$tokenpat->[1]; }
       } elsif ($tokenpat->[0] eq 'PI') {
-	$partstring = $tokenpat->[2];
+	if ($metamode<1) { $partstring=$tokenpat->[2]; }
       } elsif ($tokenpat->[0] eq 'S') {
 	push (@innerstack,$tokenpat->[1]);
 	push (@innerparstack,&parstring($tokenpat));
@@ -253,21 +252,23 @@ sub callsub {
 						$safeeval,$style);
     }
     if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
-      #&Apache::lonxml::debug("Calling sub $sub in $space<br />\n");
+#      &Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
       $sub1="$space\:\:$sub";
       $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
       $currentstring .= &$sub1($target,$token,$parstack,$parser,
 			     $safeeval,$style);
     } else {
-      #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br />\n");
-      if (defined($token->[4]) && !$metamode) {
-	$currentstring .= $token->[4];
-      } else {
-	$currentstring .= $token->[2];
+#      &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
+      if ($metamode <1) {
+	if (defined($token->[4]) && ($metamode < 1)) {
+	  $currentstring .= $token->[4];
+	} else {
+	  $currentstring .= $token->[2];
+	}
       }
     }
     if ($target eq 'edit' && $token->[0] eq 'E') {
-      $currentstring = &Apache::edit::tag_end($target,$token,$parstack,$parser,
+      $currentstring .= &Apache::edit::tag_end($target,$token,$parstack,$parser,
 						$safeeval,$style);
     }
     use strict 'refs';
@@ -303,7 +304,7 @@ sub increasedepth {
     $Apache::lonxml::olddepth=$Apache::lonxml::depth;
   }
   my $curdepth=join('_',@Apache::lonxml::depthcounter);
-  &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
+#  &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
 #print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
 }
 
@@ -319,7 +320,7 @@ sub decreasedepth {
     $Apache::lonxml::depth='-1';
   }
   my $curdepth=join('_',@Apache::lonxml::depthcounter);
-  &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
+#  &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
 #print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
 }
 
@@ -412,8 +413,8 @@ sub writeallows {
 sub handler {
   my $request=shift;
   
-  my $target='web';
-  $Apache::lonxml::debug=0;
+  my $target='tex';
+  $Apache::lonxml::debug=1;
   if ($ENV{'browser.mathml'}) {
     $request->content_type('text/xml');
   } else {
@@ -432,9 +433,18 @@ sub handler {
 
   return OK if $request->header_only;
 
-  $request->print(&Apache::lontexconvert::header());
+##  $request->print(&Apache::lontexconvert::header());
+
+##  $request->print('<body bgcolor="#FFFFFF">'."\n");
+
+  if ($target eq 'tex') {
 
-  $request->print('<body bgcolor="#FFFFFF">'."\n");
+
+
+  } else {
+         $request->print(&Apache::lontexconvert::header());
+         $request->print('<body bgcolor="#FFFFFF">'."\n");
+  }
 
   my $file=&Apache::lonnet::filelocation("",$request->uri);
   my %mystyle;
@@ -449,8 +459,14 @@ sub handler {
   $request->print($result);
 
 
-  $request->print('</body>');
-  $request->print(&Apache::lontexconvert::footer());
+##  $request->print('</body>');
+  if ($target eq 'tex') {
+#    $request->print('\end{document}'."\n");
+  } else {
+    $request->print('</body>');
+    $request->print(&Apache::lontexconvert::footer());
+  }
+##  $request->print(&Apache::lontexconvert::footer());
   writeallows($request->uri);
   return OK;
 }