--- loncom/xml/londefdef.pm 2002/02/26 22:27:22 1.46
+++ loncom/xml/londefdef.pm 2002/07/25 15:28:26 1.78
@@ -1,8 +1,7 @@
-
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.46 2002/02/26 22:27:22 sakharuk Exp $
+# $Id: londefdef.pm,v 1.78 2002/07/25 15:28:26 sakharuk Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -45,12 +44,15 @@
package Apache::londefdef;
+use Apache::lonnet;
use strict;
use Apache::lonxml;
+use Apache::File();
+use Image::Magick;
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','pre','insert'));
+ &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','th','td','blankspace','bubble','bubbles','bubbleline'));
}
@@ -71,7 +73,8 @@ sub start_m {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
- my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]);
+ $Apache::lonxml::prevent_entity_encode++;
+ my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
$inside ='\\documentstyle{article}'.$inside;
&Apache::lonxml::debug("M is starting with:$inside:");
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
@@ -87,7 +90,10 @@ sub start_m {
}
#&Apache::lonxml::debug("M is ends with:$currentstring:");
} elsif ($target eq 'tex') {
- $currentstring = "";
+ $currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+ if ($currentstring=~/\s*\\\\\s*/) {$currentstring = ' \vskip 0 mm ';}
+ } else {
+ my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
}
return $currentstring;
}
@@ -95,6 +101,7 @@ sub end_m {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
+ $Apache::lonxml::prevent_entity_encode--;
} elsif ($target eq 'tex') {
$currentstring = "";
} elsif ($target eq 'meta') {
@@ -114,18 +121,12 @@ sub end_m {
$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]{}
+ \renewcommand{\deg}{$^{\circ}$}
\usepackage[dvips]{graphicx}
- \usepackage{epsfig}';
+ \usepackage{epsfig}\usepackage{calc}';
}
return $currentstring;
}
@@ -150,7 +151,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;
@@ -332,7 +333,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>';
}
my $onLoad='';
foreach my $key (keys(%{$token->[2]})) {
@@ -341,7 +343,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) {
@@ -349,8 +352,8 @@ sub end_m {
delete($token->[2]->{$key});
}
}
- $token->[2]->{'onUnload'}=$onUnload.
- &Apache::lonxml::unloadevents();
+ $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().
+ ';'.$onUnload;
$currentstring .= '<'.$token->[1];
foreach (keys %{$token->[2]}) {
@@ -360,7 +363,7 @@ sub end_m {
if ($ENV{'request.state'} ne 'published') {
$currentstring.=(<<EDITBUTTON);
<form method="post">
- <input type="submit" name="showmode" value="Edit" />
+ <input type="submit" name="editmode" value="Edit" />
</form>
EDITBUTTON
}
@@ -836,12 +839,14 @@ EDITBUTTON
}
#-- <br> tag
sub start_br {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\\\\';
+ if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
+ $currentstring .= '\vskip 0 mm';
+ }
} elsif ($target eq 'latexsource') {
$currentstring .= '\\';
}
@@ -924,17 +929,21 @@ EDITBUTTON
}
#-- <font> tag
sub start_font {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
if ($target eq 'web') {
+ my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
+ if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode++;}
$currentstring = $token->[4];
}
return $currentstring;
}
sub end_font {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
if ($target eq 'web') {
+ my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
+ if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode--;}
$currentstring = $token->[2];
}
return $currentstring;
@@ -946,7 +955,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{\\underline ";
+ $currentstring .= '\underline{';
}
return $currentstring;
}
@@ -956,7 +965,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }";
+ $currentstring .= '}';
}
return $currentstring;
}
@@ -967,7 +976,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{\\underline ";
+ $currentstring .= '\underline{';
}
return $currentstring;
}
@@ -977,7 +986,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }";
+ $currentstring .= '}';
}
return $currentstring;
}
@@ -1030,7 +1039,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\hline ";
+ $currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth - 8 mm][b]{\hrulefill}';
}
return $currentstring;
}
@@ -1107,7 +1116,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{\\underline ";
+ $currentstring .= '\underline{';
}
return $currentstring;
}
@@ -1117,7 +1126,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }";
+ $currentstring .= '}';
}
return $currentstring;
}
@@ -1266,12 +1275,26 @@ EDITBUTTON
}
#-- <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;
}
@@ -1281,49 +1304,140 @@ EDITBUTTON
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 .= ' \\\\ ';
+ }
+ my @length = split(/,/,$Apache::londefdef::table[-1]{'length'});
+ my $how_many_columns = $#length;
+ my $parboxlength = '(\textwidth';
+ for (my $io=0; $io<=$#length;$io++) {
+ if ($length[$io] ne '') {
+ $parboxlength .= ' - '.$length[$io].' ';
+ }
+ }
+ $parboxlength .= ')/'.$how_many_columns.' - 7 mm';
+ $output =~ s/\\parbox{}/\\parbox{$parboxlength}/g;
+ $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
+ 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'} }, 'l';
+ }
+ push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
+ $Apache::londefdef::table[-1]{'counter_columns'} = -1;
+ $Apache::londefdef::table[-1]{'length'} = '';
+
}
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];
+ $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();
+ if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) {
+ $Apache::londefdef::table[-1]{'length'} .= $1.',';
+ } else {
+ $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
+ }
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
+ }
+ return $currentstring;
+ }
+#-- <th> tag
+ sub start_th {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ $currentstring = $token->[4];
+ } elsif ($target eq 'tex') {
+ 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_th {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ $currentstring = $token->[2];
+ } elsif ($target eq 'tex') {
+ my $current_row = $Apache::londefdef::table[-1]{'row_number'};
+ my $data=&Apache::lonxml::endredirection();
+ if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) {
+ $Apache::londefdef::table[-1]{'length'} .= $1.',';
+ } else {
+ $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
+ }
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{\textbf{'.$data.'}} '.$Apache::londefdef::table[-1]{'vinc'};
}
return $currentstring;
}
@@ -1333,33 +1447,80 @@ EDITBUTTON
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$token->[2]->{'src'};
my $currentstring = '';
+ my $width_param = '';
+ my $height_param = '';
+ my $scaling = .3;
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+ $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+ my $image = Image::Magick->new;
+ my $current_figure = $image->Read($src);
+ $width_param = $image->Get('width') * $scaling;;
+ $height_param = $image->Get('height') * $scaling;;
+ undef $image;
+ my $epssrc = $src;
+ $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+ if (not -e $epssrc) {
+ my $localfile = $epssrc;
+ $localfile =~ s/.*(\/res)/$1/;
+ my $file;
+ my $path;
+ if ($localfile =~ m!(.*)/([^/]*)$!) {
+ $file = $2;
+ $path = $1.'/';
+ }
+ my $signal_eps = 0;
+ my @content_directory = &Apache::lonnet::dirlist($path);
+ for (my $iy=0;$iy<=$#content_directory;$iy++) {
+ my @tempo_array = split(/&/,$content_directory[$iy]);
+ $content_directory[$iy] = $tempo_array[0];
+ if ($file eq $tempo_array[0]) {
+ $signal_eps = 1;
+ last;
+ }
+ }
+ if ($signal_eps) {
+ my $eps_file = &Apache::lonnet::getfile($localfile);
+ } else {
+ $localfile = $src;
+ $localfile =~ s/.*(\/res)/$1/;
+ my $as = &Apache::lonnet::getfile($src);
+ }
+ }
my $file;
- my $path;
+ my $path;
if ($src =~ m!(.*)/([^/]*)$!) {
- $file = $2;
- $path = $1;
- if ($path=~m:^/:) {
- $path = '/home/httpd/html'.$path;
- } elsif ($path =~ /^\./) {
- $path = $Apache::lonxml::pwd[-1].'/'.$path;
- } else {
- #else it is a full url don't print
- $path = undef;
- }
- } else {
- $path = $Apache::lonxml::pwd[-1];
- $file = $src;
+ $file = $2;
+ $path = $1.'/';
+ }
+ my $newsrc = $src;
+ $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+ $file=~s/(\.gif|\.jpg)$/\.eps/i;
+ #do we have any specified size of the picture?
+ my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
+ my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);
+ my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
+ if ($TeXwidth ne '') {
+ $width_param = $TeXwidth;
+ } elsif ($TeXheight ne '') {
+ $width_param = $TeXheight/$height_param*$width_param;
+ } elsif ($width ne '') {
+ $width_param = $width*$scaling;
}
- $file=~s/(\.gif|\.jpg)$/\.eps/;
- if ($path) {
- $currentstring = '\graphicspath{{'.$path.'}}\fbox{\includegraphics{'.$file.'}}';
+ #where can we find the picture?
+ if (-e $newsrc) {
+ if ($path) {
+ $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+ }
} else {
- $currentstring = 'See the image at \tt{'.$src.'}';
+ my $temp_file;
+ my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
+ $temp_file = Apache::File->new('>>'.$filename);
+ print $temp_file "$src\n";
+ $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
}
}
return $currentstring;
@@ -1474,7 +1635,8 @@ sub start_embed {
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];
}
@@ -1527,5 +1689,42 @@ sub start_embed {
}
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;
+ }
+#-- <blankspace heigth="">
+ sub start_blankspace {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ my $currentstring = '';
+ if ($target eq 'tex') {
+ my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval);
+ $currentstring .= '\vskip '.$howmuch.' ';
+ }
+ return $currentstring;
+ }
+ sub end_blankspace {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($target eq 'tex') {
+ $currentstring .= '';
+ }
+ return $currentstring;
+ }
+
1;
__END__