--- loncom/xml/londefdef.pm 2002/04/08 15:17:01 1.52
+++ loncom/xml/londefdef.pm 2002/07/01 19:58:25 1.67
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.52 2002/04/08 15:17:01 sakharuk Exp $
+# $Id: londefdef.pm,v 1.67 2002/07/01 19:58:25 sakharuk Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -45,12 +45,14 @@
package Apache::londefdef;
+use Apache::lonnet;
use strict;
use Apache::lonxml;
+use Apache::File();
BEGIN {
- &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'));
+ &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,6 +73,7 @@ sub start_m {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
+ $Apache::lonxml::prevent_entity_encode++;
my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]);
$inside ='\\documentstyle{article}'.$inside;
&Apache::lonxml::debug("M is starting with:$inside:");
@@ -95,6 +98,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,10 +118,11 @@ sub end_m {
$currentstring = &Apache::lonxml::xmlbegin().
&Apache::lonxml::fontsettings();
} elsif ($target eq 'tex') {
+ @Apache::londefdef::table = ();
$currentstring .= '\documentclass[letterpaper]{article}
\newcommand{\keephidden}[1]{}
\usepackage[dvips]{graphicx}
- \usepackage{epsfig}';
+ \usepackage{epsfig}\usepackage{calc}';
}
return $currentstring;
}
@@ -334,7 +339,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) {
@@ -342,8 +348,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]}) {
@@ -834,7 +840,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\\\\';
+ $currentstring .= '\vskip 0 mm';
} elsif ($target eq 'latexsource') {
$currentstring .= '\\';
}
@@ -917,17 +923,21 @@ EDITBUTTON
}
#-- 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;
@@ -1264,16 +1274,20 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
+ 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{'hinc'} = '\hline ';
- $Apache::londefdef::table{'vinc'} = '&';
- $Apache::londefdef::table{'vvinc'} = '|';
+ $Apache::londefdef::table[-1]{'hinc'} = '\hline ';
+ $Apache::londefdef::table[-1]{'vinc'} = '&';
+ $Apache::londefdef::table[-1]{'vvinc'} = '|';
} else {
- $Apache::londefdef::table{'hinc'} = '';
- $Apache::londefdef::table{'vinc'} = '';
- $Apache::londefdef::table{'vvinc'} = '';
+ $Apache::londefdef::table[-1]{'hinc'} = '';
+ $Apache::londefdef::table[-1]{'vinc'} = '';
+ $Apache::londefdef::table[-1]{'vvinc'} = '';
}
}
return $currentstring;
@@ -1284,17 +1298,29 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
+ my $inmemory = '';
my $output = '';
- my $header_of_table = '{'.$Apache::londefdef::table{'vvinc'};
+ my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
my $in;
- for ($in=0;$in<$Apache::londefdef::table{'counter_columns'};$in++) {
- $header_of_table .= @{ $Apache::londefdef::table{'columns'} }[$in].$Apache::londefdef::table{'vvinc'};
- $output .= $Apache::londefdef::table{'rowdata'}[$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 .= ' \\\\ ';
}
- $header_of_table .= '}';
- $currentstring .= '\begin{tabular}'.$header_of_table.$output.$Apache::londefdef::table{'hinc'}.'\end{tabular}';
+ $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;
}
@@ -1305,13 +1331,15 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- if (substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1) ne '') {
- push @ {$Apache::londefdef::table{'rows'} }, substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ $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{'rows'} }, 'c';
+ push @ {$Apache::londefdef::table[-1]{'rows'} }, 'c';
}
- push ( @{ $Apache::londefdef::table{'rowdata'} }, $Apache::londefdef::table{'hinc'});
- $Apache::londefdef::table{'counter_columns'} = 0;
+ push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
+ $Apache::londefdef::table[-1]{'counter_columns'} = -1;
}
return $currentstring;
@@ -1322,6 +1350,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
+# $currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
}
return $currentstring;
}
@@ -1334,10 +1363,10 @@ EDITBUTTON
} 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{'rows'}[0],0,1);;
+ $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
}
- push @{ $Apache::londefdef::table{'columns'} }, $what_to_push;
- $Apache::londefdef::table{'counter_columns'}++;
+ push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
+ $Apache::londefdef::table[-1]{'counter_columns'}++;
&Apache::lonxml::startredirection();
;
}
@@ -1349,9 +1378,39 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- my $current_row = $#{ $Apache::londedef::table{'rows'} };
+ my $current_row = $Apache::londefdef::table[-1]{'row_number'};
my $data=&Apache::lonxml::endredirection();
- @{ $Apache::londefdef::table{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table{'vinc'};
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'};
+ }
+ return $currentstring;
+ }
+#-- | 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();
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\bf{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
}
return $currentstring;
}
@@ -1361,33 +1420,79 @@ EDITBUTTON
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$token->[2]->{'src'};
my $currentstring = '';
+ my $width_param = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
+ 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;
+ } else {
+ if ($width ne '') {
+ $width_param = $width*.3;
+ if ($width_param <= 900) {
+ $width_param = '[width='.$width_param.'mm]';
+ } else {
+ $width_param = '[width= 9.0 cm]';
+ }
+ }
+ }
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+ $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+ my $epssrc = $src;
+ $epssrc =~ s/(\.gif|\.jpg|\.GIF|\.JPG)$/\.eps/;
+ 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.'/';
}
- $file=~s/(\.gif|\.jpg)$/\.eps/;
- if ($path) {
- $currentstring = '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
+ my $newsrc = $src;
+ $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+ $file=~s/(\.gif|\.jpg)$/\.eps/i;
+ if (-e $newsrc) {
+ if ($path) {
+ $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics'.$width_param.'{'.$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_param.'{'.$file.'}}';
}
}
return $currentstring;
@@ -1574,5 +1679,24 @@ sub start_embed {
}
return $currentstring;
}
+#--
+ 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__
|