--- loncom/xml/londefdef.pm 2002/05/09 15:44:43 1.57
+++ loncom/xml/londefdef.pm 2002/07/12 16:37:38 1.73
@@ -1,8 +1,7 @@
-
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.57 2002/05/09 15:44:43 sakharuk Exp $
+# $Id: londefdef.pm,v 1.73 2002/07/12 16:37:38 albertel Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -49,10 +48,11 @@ 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','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'));
}
@@ -73,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);
@@ -89,7 +90,9 @@ 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);
+ } else {
+ my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
}
return $currentstring;
}
@@ -97,6 +100,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') {
@@ -120,7 +124,7 @@ sub end_m {
$currentstring .= '\documentclass[letterpaper]{article}
\newcommand{\keephidden}[1]{}
\usepackage[dvips]{graphicx}
- \usepackage{epsfig}';
+ \usepackage{epsfig}\usepackage{calc}';
}
return $currentstring;
}
@@ -838,7 +842,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\\\\';
+ $currentstring .= '\vskip 0 mm';
} elsif ($target eq 'latexsource') {
$currentstring .= '\\';
}
@@ -921,17 +925,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;
@@ -1280,7 +1288,7 @@ EDITBUTTON
$Apache::londefdef::table[-1]{'vvinc'} = '|';
} else {
$Apache::londefdef::table[-1]{'hinc'} = '';
- $Apache::londefdef::table[-1]{'vinc'} = '';
+ $Apache::londefdef::table[-1]{'vinc'} = '&';
$Apache::londefdef::table[-1]{'vvinc'} = '';
}
}
@@ -1305,7 +1313,17 @@ EDITBUTTON
chop $output;
$output .= ' \\\\ ';
}
- $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}';
+ my @length = split(/,/,$Apache::londefdef::table[-1]{'length'});
+ my $how_many_columns = $#length+1;
+ 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;
@@ -1330,10 +1348,11 @@ EDITBUTTON
if ($alignchar ne '') {
push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
} else {
- push @ {$Apache::londefdef::table[-1]{'rows'} }, 'c';
+ 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'} = ''; #just added
}
return $currentstring;
@@ -1374,7 +1393,43 @@ EDITBUTTON
} 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] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'};
+ if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) { #just added
+ $Apache::londefdef::table[-1]{'length'} .= $1.','; #just added
+ } #just added
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{'.$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();
+ if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) { #just added
+ $Apache::londefdef::table[-1]{'length'} .= $1.','; #just added
+ } #just added
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{\textbf{'.$data.'}} '.$Apache::londefdef::table[-1]{'vinc'};
}
return $currentstring;
}
@@ -1384,12 +1439,49 @@ 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;
if ($src =~ m!(.*)/([^/]*)$!) {
@@ -1397,18 +1489,30 @@ EDITBUTTON
$path = $1.'/';
}
my $newsrc = $src;
- $newsrc =~ s/(\.gif|\.jpg)$/\.eps/;
- $file=~s/(\.gif|\.jpg)$/\.eps/;
+ $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;
+ }
+ #where can we find the picture?
if (-e $newsrc) {
if ($path) {
- $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics{'.$file.'}}';
+ $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
}
} else {
my $temp_file;
- my $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.dat";
+ 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{'.$file.'}}';
+ $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
}
}
return $currentstring;
@@ -1595,5 +1699,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__
|