--- loncom/xml/londefdef.pm 2002/07/16 21:03:26 1.74
+++ loncom/xml/londefdef.pm 2002/08/20 15:22:40 1.85
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.74 2002/07/16 21:03:26 sakharuk Exp $
+# $Id: londefdef.pm,v 1.85 2002/08/20 15:22:40 sakharuk Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -52,7 +52,7 @@ 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','th','td','blankspace','bubble','bubbles','bubbleline'));
+ &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','div','externallink','table','tr','th','td','blankspace','bubble','bubbles','bubbleline'));
}
@@ -91,6 +91,7 @@ sub start_m {
#&Apache::lonxml::debug("M is ends with:$currentstring:");
} elsif ($target eq 'tex') {
$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);
}
@@ -122,7 +123,8 @@ sub end_m {
} elsif ($target eq 'tex') {
@Apache::londefdef::table = ();
$currentstring .= '\documentclass[letterpaper]{article}
- \newcommand{\keephidden}[1]{}
+ \newcommand{\keephidden}[1]{}
+ \renewcommand{\deg}{$^{\circ}$}
\usepackage[dvips]{graphicx}
\usepackage{epsfig}\usepackage{calc}';
}
@@ -837,12 +839,14 @@ EDITBUTTON
}
#--
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 .= '\vskip 0 mm';
+ if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
+ $currentstring .= '\vskip 0 mm';
+ }
} elsif ($target eq 'latexsource') {
$currentstring .= '\\';
}
@@ -951,7 +955,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{\\underline ";
+ $currentstring .= '\underline{';
}
return $currentstring;
}
@@ -961,7 +965,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }";
+ $currentstring .= '}';
}
return $currentstring;
}
@@ -972,7 +976,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{\\underline ";
+ $currentstring .= '\underline{';
}
return $currentstring;
}
@@ -982,7 +986,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }";
+ $currentstring .= '}';
}
return $currentstring;
}
@@ -1035,7 +1039,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth - 8 mm][b]{\hrulefill}';
+ $currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth/2 ][b]{\hrulefill}\vskip 0 mm ';
}
return $currentstring;
}
@@ -1048,6 +1052,23 @@ EDITBUTTON
}
return $currentstring;
}
+#-- tag
+ sub start_div {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ $currentstring .= $token->[4];
+ }
+ return $currentstring;
+ }
+ sub end_div {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ $currentstring .= $token->[2];
+ }
+ return $currentstring;
+ }
#--
tag
sub start_a {
my ($target,$token) = @_;
@@ -1112,7 +1133,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{\\underline ";
+ $currentstring .= '\underline{';
}
return $currentstring;
}
@@ -1122,7 +1143,7 @@ EDITBUTTON
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }";
+ $currentstring .= '}';
}
return $currentstring;
}
@@ -1279,7 +1300,7 @@ EDITBUTTON
my $aa = {};
push @Apache::londefdef::table, $aa;
$Apache::londefdef::table[-1]{'row_number'} = -1;
- $Apache::londefdef::table[-1]{'output'} = '\begin{tabular} ';
+ $Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
unless (defined $border) { $border = 0; }
if ($border) {
@@ -1295,34 +1316,105 @@ EDITBUTTON
return $currentstring;
}
sub end_table {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
my $inmemory = '';
my $output = '';
+ #construct header of the table
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 .= '}';
+ #fill the 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+1;
- my $parboxlength = '(\textwidth';
- for (my $io=0; $io<=$#length;$io++) {
- if ($length[$io] ne '') {
- $parboxlength .= ' - '.$length[$io].' ';
+ #define the length of the table cells
+ my @lengthforoutput = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]);
+ my $how_many_columns = $#lengthforoutput + 1;
+ my $filled_columns = 0;
+ foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) {
+ my @length = split(/,/,$tempo_length);
+ my $nfilled_columns = 0;
+ for (my $ico=0;$ico<$how_many_columns;$ico++) {
+ if (not $lengthforoutput[$ico]=~m/\s*0\s*/) {$nfilled_columns++;}
}
+ if ($nfilled_columns > $filled_columns) {$filled_columns=$nfilled_columns;}
}
- $parboxlength .= ')/'.$how_many_columns.' - 7 mm';
+ my $temp_file;
+ my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.tbl";
+ if (-e $filename) {
+ $temp_file = Apache::File->new($filename);
+ my @tbl_file_content = <$temp_file>;
+ my ($one,$two) = split(/,/,$tbl_file_content[0]);
+ $how_many_columns+=$one-1;
+ $filled_columns+=$two;
+ } else {
+ $temp_file = Apache::File->new('>>'.$filename);
+ }
+ print $temp_file "$how_many_columns,$filled_columns\n";
+ foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) {
+ my @length = split(/,/,$tempo_length);
+ for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {
+ $lengthforoutput[$ico] =~ m/(\d*\.?\d*)\s*(\w+)/;
+ my $old_value = $1;
+ my $old_unit = $2;
+ if ($old_unit eq 'cm') {
+ $old_value = $old_value * 10;
+ } elsif ($old_unit eq 'in') {
+ $old_value = $old_value * 25.4;
+ } elsif ($old_unit eq 'pt') {
+ $old_value = $old_value * 25.4/72.27;
+ } elsif ($old_unit eq 'pc') {
+ $old_value = $old_value * 25.4/6.022;
+ }
+ $old_unit = 'mm';
+ $length[$ico] =~ m/(\d*\.?\d*)\s*(\w+)/;
+ my $new_value = $1;
+ my $new_unit = $2;
+ if ($new_unit eq 'cm') {
+ $new_value = $new_value * 10;
+ } elsif ($old_unit eq 'in') {
+ $new_value = $new_value * 25.4;
+ } elsif ($old_unit eq 'pt') {
+ $new_value = $new_value * 25.4/72.27;
+ } elsif ($old_unit eq 'pc') {
+ $new_value = $new_value * 25.4/6.022;
+ }
+ $new_unit = 'mm';
+ if ($old_value < $new_value) {
+ $lengthforoutput[$ico] = $new_value.' mm';
+ } else {
+ $lengthforoutput[$ico] = $old_value.' mm';
+ }
+ }
+ }
+ my $parboxlength = '(\textwidth';
+ for (my $io=0; $io<=$#lengthforoutput;$io++) {
+ $parboxlength .= ' - '.$lengthforoutput[$io].' ';
+ }
+ $parboxlength .= ')/($GLOBALnumberOFcolumns+1) - 3 mm';
+ $output =~ s/\\parbox{}{}/\\parbox{1 mm}{}/g;
+ $output =~ s/\\parbox{}{(\\textbf{\w?\.?})}/\\parbox{5 mm}{$1}/g; #for stupid tables with empty columns
$output =~ s/\\parbox{}/\\parbox{$parboxlength}/g;
+ my ($howmanyatall,$howmanyfilled) = (0,0);
+
+ my @tagar = @$tagstack;
+ my $signature = 1;
+ for (my $ico=0;$ico<$#tagar;$ico++) {
+ if ($tagar[$ico] eq 'table') { $signature = 0; }
+ }
+ if ($signature) {
+ my $totalnumber = $how_many_columns-$filled_columns-1;
+ $output =~ s/\$GLOBALnumberOFcolumns/$totalnumber/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'};
@@ -1332,6 +1424,9 @@ EDITBUTTON
$currentstring = $Apache::londefdef::table[-1]{'output'};
$currentstring =~ s/\\\\\s+\\\\/\\\\/g;
pop @Apache::londefdef::table;
+ if (-e $filename) {
+ unlink $filename;
+ }
}
}
return $currentstring;
@@ -1352,8 +1447,7 @@ EDITBUTTON
}
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
-
+ $Apache::londefdef::table[-1]{'length'} = '';
}
return $currentstring;
}
@@ -1363,7 +1457,9 @@ 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 ';
+# $currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
+ push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};
+
}
return $currentstring;
}
@@ -1388,15 +1484,25 @@ EDITBUTTON
sub end_td {
my ($target,$token) = @_;
my $currentstring = '';
+ my $tempolen = '';
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.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
+ if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm|in|pc|pt))/) {
+ $Apache::londefdef::table[-1]{'length'} .= $1.',';
+ $tempolen = $1;
+ } else {
+ if (length($data)<5) {
+ $Apache::londefdef::table[-1]{'length'} .= '7 mm,';
+ $tempolen = '5 mm';
+ } else {
+ $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
+ $tempolen = '';
+ }
+ }
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$tempolen.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
}
return $currentstring;
}
@@ -1426,9 +1532,11 @@ EDITBUTTON
} 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
+ 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;
@@ -1441,78 +1549,74 @@ EDITBUTTON
my $currentstring = '';
my $width_param = '';
my $height_param = '';
- my $scaling = .3;
+ 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/;
+ #if original gif/jpg file exist do following:
+ if (-e $src) {
+ #defines the default size of image
+ 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;
+ #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;
+ }
my $file;
my $path;
- if ($localfile =~ m!(.*)/([^/]*)$!) {
- $file = $2;
+ if ($src =~ 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;
+ }
+ my $newsrc = $src;
+ $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+ $file=~s/(\.gif|\.jpg)$/\.eps/i;
+ #where can we find the picture?
+ if (-e $newsrc) {
+ #eps counterpart for image exist
+ if ($path) {
+ $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
}
- }
- 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!(.*)/([^/]*)$!) {
- $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;
- }
- #where can we find the picture?
- if (-e $newsrc) {
- if ($path) {
- $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+ #there is no eps counterpart for image - check for ps one
+ $newsrc =~ s/\.eps$/\.ps/;
+ if (-e $newsrc) {
+ #ps counterpart for image exist
+ $file =~ s/\.eps$/\.ps/;
+ if ($path) {
+ $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+ }
+ } else {
+ #there aren't eps or ps - so create eps
+ 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.'}} ';
+ }
}
} else {
- 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.'}} ';
+ #original image file doesn't exist so check the alt attribute
+ my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+ if ($alt) {
+ $currentstring .= ' '.$alt.' ';
+ } else {
+ #there are no image and alt attribute
+ $currentstring .= ' THE ORIGINAL PROBLEM CONTAINS EMPTY IMG TAG WITHOUT IMAGE AND ALT ATTRIBUTE ';
+ }
}
}
return $currentstring;