--- loncom/xml/lonxml.pm 2001/03/26 17:32:14 1.62
+++ 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;
@@ -106,7 +106,9 @@ sub xmlparse {
# 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]}) {
+# &Apache::lonxml::debug("Found $token->[1] style");
if ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .=
&recurse($style_for_target{$token->[1]},$target,$safeeval,
@@ -116,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);
}
@@ -249,13 +252,13 @@ sub callsub {
$safeeval,$style);
}
if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
- &Apache::lonxml::debug("Calling sub $sub in $space $metamode
\n");
+# &Apache::lonxml::debug("Calling sub $sub in $space $metamode
\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 $metamode
\n");
+# &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode
\n");
if ($metamode <1) {
if (defined($token->[4]) && ($metamode < 1)) {
$currentstring .= $token->[4];
@@ -301,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 "
s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
}
@@ -317,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 "
e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
}
@@ -410,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 {
@@ -430,9 +433,18 @@ sub handler {
return OK if $request->header_only;
- $request->print(&Apache::lontexconvert::header());
+## $request->print(&Apache::lontexconvert::header());
- $request->print(''."\n");
+## $request->print(''."\n");
+
+ if ($target eq 'tex') {
+
+
+
+ } else {
+ $request->print(&Apache::lontexconvert::header());
+ $request->print(''."\n");
+ }
my $file=&Apache::lonnet::filelocation("",$request->uri);
my %mystyle;
@@ -447,8 +459,14 @@ sub handler {
$request->print($result);
- $request->print('');
- $request->print(&Apache::lontexconvert::footer());
+## $request->print('');
+ if ($target eq 'tex') {
+# $request->print('\end{document}'."\n");
+ } else {
+ $request->print('');
+ $request->print(&Apache::lontexconvert::footer());
+ }
+## $request->print(&Apache::lontexconvert::footer());
writeallows($request->uri);
return OK;
}