--- loncom/xml/londefdef.pm 2001/12/07 22:23:37 1.36 +++ loncom/xml/londefdef.pm 2002/01/18 16:33:54 1.41 @@ -1,7 +1,8 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.36 2001/12/07 22:23:37 albertel Exp $ +# $Id: londefdef.pm,v 1.41 2002/01/18 16:33:54 sakharuk Exp $ +# # # Copyright Michigan State University Board of Trustees # @@ -39,15 +40,16 @@ # # last modified 06/26/00 by Alexander Sakharuk # 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer +# 01/18 Alex Sakharuk package Apache::londefdef; use strict; use Apache::lonxml; -sub BEGIN { +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','frameset')); + &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','frameset','pre')); } @@ -70,13 +72,18 @@ sub start_m { if ($target eq 'web') { my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]); $inside ='\\documentstyle{article}'.$inside; - #&Apache::lonxml::debug("M is starting with:$inside:"); + &Apache::lonxml::debug("M is starting with:$inside:"); my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); if ($eval eq 'on') { $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); #&Apache::lonxml::debug("M is evaulated to:$inside:"); } $currentstring = &Apache::lontexconvert::converted(\$inside); + if ($Apache::lontexconvert::errorstring) { + &Apache::lonxml::warning("tth error: ". + $Apache::lontexconvert::errorstring); + $Apache::lontexconvert::errorstring=''; + } #&Apache::lonxml::debug("M is ends with:$currentstring:"); } elsif ($target eq 'tex') { $currentstring = ""; @@ -97,6 +104,11 @@ sub end_m { sub start_html { my ($target,$token) = @_; my $currentstring = ''; + if ($ENV{'browser.mathml'}) { + &tth::ttminit(); + } else { + &tth::tthinit(); + } if ($target eq 'web') { $currentstring = &Apache::lonxml::xmlbegin(). &Apache::lonxml::fontsettings(); @@ -110,7 +122,8 @@ sub end_m { \setlength{\parindent}{20pt} \setlength{\marginparwidth}{90pt} \setlength{\textfloatsep}{8pt plus 2.0pt minus 4.0pt} - \newcommand{\keephidden}[1]{}'; + \newcommand{\keephidden}[1]{} + \usepackage[dvips]{graphicx}'; } return $currentstring; } @@ -312,7 +325,8 @@ sub end_m { } #-- tag sub start_body { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; +# my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { if (!$Apache::lonxml::registered) { @@ -337,10 +351,17 @@ sub end_m { &Apache::lonxml::unloadevents(); $currentstring .= '<'.$token->[1]; - map { - $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; - } keys %{$token->[2]}; + foreach (keys %{$token->[2]}) { + $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; + } $currentstring.='>'; + if ($ENV{'request.state'} ne 'published') { + $currentstring.=(< + + +EDITBUTTON + } } elsif ($target eq 'tex') { $currentstring = '\begin{document}'; } @@ -509,7 +530,7 @@ sub end_m { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\large{\textbf'; + $currentstring .= '\large{\textbf{'; } return $currentstring; } @@ -818,7 +839,7 @@ sub end_m { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\\'; + $currentstring .= '\\\\'; } elsif ($target eq 'latexsource') { $currentstring .= '\\'; } @@ -841,7 +862,7 @@ sub end_m { } elsif ($target eq 'tex') { $currentstring .= '\large{'; } elsif ($target eq 'latexsource') { - $currentstring .= '\large{'; + $currentstring .= '{\Large '; } return $currentstring; } @@ -864,9 +885,9 @@ sub end_m { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= '\footnotesize{'; + $currentstring .= '{\footnotesize '; } elsif ($target eq 'latexsource') { - $currentstring .= '\footnotesize{'; + $currentstring .= '{\footnotesize '; } return $currentstring; } @@ -1105,7 +1126,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{itemize} "; + $currentstring = '\begin{itemize}'; } return $currentstring; } @@ -1115,7 +1136,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{itemize}"; + $currentstring = '\end{itemize}'; } return $currentstring; } @@ -1168,7 +1189,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{enumerate} "; + $currentstring = '\begin{enumerate}'; } return $currentstring; } @@ -1178,7 +1199,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{enumerate}"; + $currentstring = '\end{enumerate}'; } return $currentstring; } @@ -1189,7 +1210,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{description} "; + $currentstring = '\begin{description}'; } return $currentstring; } @@ -1199,7 +1220,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{description}"; + $currentstring = '\end{description}'; } return $currentstring; } @@ -1210,7 +1231,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = "\\item[ "; + $currentstring = '\item['; } return $currentstring; } @@ -1220,7 +1241,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = "]"; + $currentstring = ']'; } return $currentstring; } @@ -1248,7 +1269,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = ""; + $currentstring = ''; } return $currentstring; } @@ -1258,7 +1279,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ""; + $currentstring = ''; } return $currentstring; } @@ -1279,7 +1300,7 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ""; + $currentstring = ''; } return $currentstring; } @@ -1300,21 +1321,25 @@ sub end_m { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = ""; + $currentstring = ''; } return $currentstring; } #-- tag - sub start_img { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; $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} "; + my $durty = $token->[2]->{'src'}; + $durty =~ s!(^.*)/(.*)$!$1/!; + my $durtytwo = $2; + my $num = index($durtytwo,'gif',0); + substr($durtytwo,$num,3) = 'eps'; + $currentstring = '\graphicspath{{/home/httpd/html'.$durty.'}}\fbox{\includegraphics{'.$durtytwo.'}}'; } return $currentstring; } @@ -1322,9 +1347,9 @@ sub end_m { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = " \\end{figure}"; + $currentstring = ''; } return $currentstring; } @@ -1442,5 +1467,26 @@ sub end_m { } return $currentstring; } +#-- 
+	sub start_pre {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= $token->[4];
+	    } elsif ($target eq 'tex') {
+		$currentstring .= '\begin{verbatim}';
+	    } 
+           return $currentstring;
+	}
+        sub end_pre {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'web') {
+	       $currentstring .= $token->[2];
+	    } elsif ($target eq 'tex') {
+		$currentstring .= '\end{verbatim}';
+	    }
+           return $currentstring;
+	}
 1;
 __END__