--- loncom/xml/londefdef.pm 2001/12/07 22:23:37 1.36
+++ loncom/xml/londefdef.pm 2002/05/09 15:44:43 1.57
@@ -1,7 +1,9 @@
+
# 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.57 2002/05/09 15:44:43 sakharuk Exp $
+#
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,15 +41,18 @@
#
# 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 Apache::lonnet;
use strict;
use Apache::lonxml;
+use Apache::File();
-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','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','allow','frameset','pre','insert','externallink','table','tr','td'));
}
@@ -70,13 +75,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,20 +107,20 @@ 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();
} elsif ($target eq 'tex') {
+ @Apache::londefdef::table = ();
$currentstring .= '\documentclass[letterpaper]{article}
- \setlength{\oddsidemargin}{-40pt}
- \setlength{\evensidemargin}{-60pt}
- \setlength{\topmargin}{200pt}
- \setlength{\textwidth}{4.4in}
- \setlength{\textheight}{6.8in}
- \setlength{\parindent}{20pt}
- \setlength{\marginparwidth}{90pt}
- \setlength{\textfloatsep}{8pt plus 2.0pt minus 4.0pt}
- \newcommand{\keephidden}[1]{}';
+ \newcommand{\keephidden}[1]{}
+ \usepackage[dvips]{graphicx}
+ \usepackage{epsfig}';
}
return $currentstring;
}
@@ -135,7 +145,7 @@ sub end_m {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
- $currentstring = &Apache::lonxml::registerurl().
+ $currentstring = &Apache::lonxml::registerurl(undef,$target).
$token->[2];
}
return $currentstring;
@@ -312,11 +322,13 @@ sub end_m {
}
#-- <body> 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) {
- $currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';
+ $currentstring.='<head>'.
+ &Apache::lonxml::registerurl(undef,$target).'</head>';
}
my $onLoad='';
foreach my $key (keys(%{$token->[2]})) {
@@ -325,7 +337,8 @@ sub end_m {
delete($token->[2]->{$key});
}
}
- $token->[2]->{'onLoad'}=$onLoad.&Apache::lonxml::loadevents();
+ $token->[2]->{'onLoad'}=&Apache::lonxml::loadevents().
+ ';'.$onLoad;
my $onUnload='';
foreach my $key (keys(%{$token->[2]})) {
if ($key =~ /^onunload$/i) {
@@ -333,14 +346,21 @@ sub end_m {
delete($token->[2]->{$key});
}
}
- $token->[2]->{'onUnload'}=$onUnload.
- &Apache::lonxml::unloadevents();
+ $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().
+ ';'.$onUnload;
$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);
+ <form method="post">
+ <input type="submit" name="editmode" value="Edit" />
+ </form>
+EDITBUTTON
+ }
} elsif ($target eq 'tex') {
$currentstring = '\begin{document}';
}
@@ -509,7 +529,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 +838,7 @@ sub end_m {
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\\';
+ $currentstring .= '\\\\';
} elsif ($target eq 'latexsource') {
$currentstring .= '\\';
}
@@ -841,7 +861,7 @@ sub end_m {
} elsif ($target eq 'tex') {
$currentstring .= '\large{';
} elsif ($target eq 'latexsource') {
- $currentstring .= '\large{';
+ $currentstring .= '{\Large ';
}
return $currentstring;
}
@@ -864,9 +884,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 +1125,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 +1135,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 +1188,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 +1198,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 +1209,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 +1219,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 +1230,7 @@ sub end_m {
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = "\\item[ ";
+ $currentstring = '\item[';
}
return $currentstring;
}
@@ -1220,7 +1240,7 @@ sub end_m {
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = "]";
+ $currentstring = ']';
}
return $currentstring;
}
@@ -1243,12 +1263,26 @@ sub end_m {
}
#-- <table> tag
sub start_table {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = "";
+ my $aa = {};
+ push @Apache::londefdef::table, $aa;
+ $Apache::londefdef::table[-1]{'row_number'} = -1;
+ $Apache::londefdef::table[-1]{'output'} = '\begin{tabular} ';
+ my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
+ unless (defined $border) { $border = 0; }
+ if ($border) {
+ $Apache::londefdef::table[-1]{'hinc'} = '\hline ';
+ $Apache::londefdef::table[-1]{'vinc'} = '&';
+ $Apache::londefdef::table[-1]{'vvinc'} = '|';
+ } else {
+ $Apache::londefdef::table[-1]{'hinc'} = '';
+ $Apache::londefdef::table[-1]{'vinc'} = '';
+ $Apache::londefdef::table[-1]{'vvinc'} = '';
+ }
}
return $currentstring;
}
@@ -1258,74 +1292,135 @@ sub end_m {
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = "";
- }
+ my $inmemory = '';
+ my $output = '';
+ my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
+ my $in;
+ for ($in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
+ $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
+ }
+ $header_of_table .= '}';
+ for ($in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
+ $output .= $Apache::londefdef::table[-1]{'rowdata'}[$in];
+ chop $output;
+ $output .= ' \\\\ ';
+ }
+ $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}';
+ if ($#Apache::londefdef::table > 0) {
+ $inmemory = $Apache::londefdef::table[-1]{'output'};
+ pop @Apache::londefdef::table;
+ $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory;
+ } else {
+ $currentstring = $Apache::londefdef::table[-1]{'output'};
+ $currentstring =~ s/\\\\\s+\\\\/\\\\/g;
+ pop @Apache::londefdef::table;
+ }
+ }
return $currentstring;
}
#-- <tr> tag
sub start_tr {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = '';
+ $Apache::londefdef::table[-1]{'row_number'}++;
+ my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ if ($alignchar ne '') {
+ push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
+ } else {
+ push @ {$Apache::londefdef::table[-1]{'rows'} }, 'c';
+ }
+ push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
+ $Apache::londefdef::table[-1]{'counter_columns'} = -1;
+
}
return $currentstring;
- }
+ }
sub end_tr {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = "";
- }
+# $currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
+ }
return $currentstring;
}
#-- <td> tag
sub start_td {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = '';
+ my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ if ($what_to_push eq '') {
+ $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
+ }
+ push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
+ $Apache::londefdef::table[-1]{'counter_columns'}++;
+ &Apache::lonxml::startredirection();
+;
}
return $currentstring;
- }
+ }
sub end_td {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = "";
- }
+ my $current_row = $Apache::londefdef::table[-1]{'row_number'};
+ my $data=&Apache::lonxml::endredirection();
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'};
+ }
return $currentstring;
}
#-- <img> tag
-
sub start_img {
- my ($target,$token) = @_;
- $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$token->[2]->{'src'};
my $currentstring = '';
- if ($target eq 'web') {
+
+ if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\begin{figure} ";
- }
- return $currentstring;
+ my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+ $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+ my $file;
+ my $path;
+ if ($src =~ m!(.*)/([^/]*)$!) {
+ $file = $2;
+ $path = $1.'/';
+ }
+ my $newsrc = $src;
+ $newsrc =~ s/(\.gif|\.jpg)$/\.eps/;
+ $file=~s/(\.gif|\.jpg)$/\.eps/;
+ if (-e $newsrc) {
+ if ($path) {
+ $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics{'.$file.'}}';
+ }
+ } else {
+ my $temp_file;
+ my $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.dat";
+ $temp_file = Apache::File->new('>>'.$filename);
+ print $temp_file "$src\n";
+ $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics{'.$file.'}}';
+ }
+ }
+ return $currentstring;
}
sub end_img {
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;
}
#-- <applet> tag
@@ -1334,41 +1429,41 @@ sub end_m {
my ($target,$token) = @_;
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$token->[2]->{'code'};
- $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+ $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];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{figure}";
+ $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 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 = '';
@@ -1428,7 +1523,8 @@ sub end_m {
my $currentstring = '';
if ($target eq 'web') {
if (!$Apache::lonxml::registered) {
- $currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';
+ $currentstring.='<head>'.
+ &Apache::lonxml::registerurl(undef,$target).'</head>';
}
$currentstring .= $token->[4];
}
@@ -1442,5 +1538,62 @@ sub end_m {
}
return $currentstring;
}
+#-- <pre>
+ 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;
+ }
+#-- <insert>
+ sub start_insert {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+ $currentstring .= '<b>'.$display.'</b>';;
+ }
+ return $currentstring;
+ }
+ sub end_insert {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ $currentstring .= '';
+ }
+ return $currentstring;
+ }
+#-- <externallink>
+ sub start_externallink {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+ $currentstring .= '<b>'.$display.'</b>';;
+ }
+ return $currentstring;
+ }
+ sub end_externallink {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ $currentstring .= '';
+ }
+ return $currentstring;
+ }
1;
__END__