--- loncom/xml/londefdef.pm 2002/01/17 17:42:34 1.40
+++ 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.40 2002/01/17 17:42:34 albertel Exp $
+# $Id: londefdef.pm,v 1.41 2002/01/18 16:33:54 sakharuk Exp $
+#
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,6 +40,7 @@
#
# 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;
@@ -47,7 +49,7 @@ use Apache::lonxml;
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'));
}
@@ -101,7 +103,7 @@ sub end_m {
#-- tag
sub start_html {
my ($target,$token) = @_;
- my $currentstring = '';
+ my $currentstring = '';
if ($ENV{'browser.mathml'}) {
&tth::ttminit();
} else {
@@ -120,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;
}
@@ -322,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) {
@@ -526,7 +530,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\large{\textbf';
+ $currentstring .= '\large{\textbf{';
}
return $currentstring;
}
@@ -835,7 +839,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\\';
+ $currentstring .= '\\\\';
} elsif ($target eq 'latexsource') {
$currentstring .= '\\';
}
@@ -858,7 +862,7 @@ EDITBUTTON
} elsif ($target eq 'tex') {
$currentstring .= '\large{';
} elsif ($target eq 'latexsource') {
- $currentstring .= '\large{';
+ $currentstring .= '{\Large ';
}
return $currentstring;
}
@@ -881,9 +885,9 @@ EDITBUTTON
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;
}
@@ -1122,7 +1126,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\begin{itemize} ";
+ $currentstring = '\begin{itemize}';
}
return $currentstring;
}
@@ -1132,7 +1136,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{itemize}";
+ $currentstring = '\end{itemize}';
}
return $currentstring;
}
@@ -1185,7 +1189,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\begin{enumerate} ";
+ $currentstring = '\begin{enumerate}';
}
return $currentstring;
}
@@ -1195,7 +1199,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{enumerate}";
+ $currentstring = '\end{enumerate}';
}
return $currentstring;
}
@@ -1206,7 +1210,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\begin{description} ";
+ $currentstring = '\begin{description}';
}
return $currentstring;
}
@@ -1216,7 +1220,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{description}";
+ $currentstring = '\end{description}';
}
return $currentstring;
}
@@ -1227,7 +1231,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = "\\item[ ";
+ $currentstring = '\item[';
}
return $currentstring;
}
@@ -1237,7 +1241,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = "]";
+ $currentstring = ']';
}
return $currentstring;
}
@@ -1265,7 +1269,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = "";
+ $currentstring = '';
}
return $currentstring;
}
@@ -1275,7 +1279,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = "";
+ $currentstring = '';
}
return $currentstring;
}
@@ -1296,7 +1300,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = "";
+ $currentstring = '';
}
return $currentstring;
}
@@ -1317,21 +1321,25 @@ EDITBUTTON
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;
}
@@ -1339,9 +1347,9 @@ EDITBUTTON
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;
}
@@ -1459,5 +1467,26 @@ EDITBUTTON
}
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__