--- loncom/xml/londefdef.pm 2002/09/16 17:40:09 1.88
+++ loncom/xml/londefdef.pm 2002/11/15 15:01:16 1.101
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.88 2002/09/16 17:40:09 sakharuk Exp $
+# $Id: londefdef.pm,v 1.101 2002/11/15 15:01:16 sakharuk Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -109,28 +109,38 @@ sub end_m {
return $currentstring;
}
#-- <html> tag
- 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}
+sub start_html {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($ENV{'browser.mathml'}) {
+ &tth::ttminit();
+ if ($ENV{'browser.unicode'}) {
+ &tth::ttmoptions('-L -u1');
+ } else {
+ &tth::ttmoptions('-L -u0');
+ }
+ } else {
+ &tth::tthinit();
+ if ($ENV{'browser.unicode'}) {
+ &tth::tthoptions('-L -u1');
+ } else {
+ &tth::tthoptions('-L -u0');
+ }
+ }
+ if ($target eq 'web') {
+ $currentstring = &Apache::lonxml::xmlbegin().
+ &Apache::lonxml::fontsettings();
+ } elsif ($target eq 'tex') {
+ @Apache::londefdef::table = ();
+ $currentstring .= '\documentclass[letterpaper]{article}
\newcommand{\keephidden}[1]{}
\renewcommand{\deg}{$^{\circ}$}
\usepackage[dvips]{graphicx}
\usepackage{epsfig}\usepackage{calc}
\newenvironment{choicelist}{\begin{enumerate}}{\end{enumerate}}';
- }
- return $currentstring;
- }
+ }
+ return $currentstring;
+}
sub end_html {
my ($target,$token) = @_;
my $currentstring = '';
@@ -330,7 +340,6 @@ sub end_m {
#-- <body> tag
sub start_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-# my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
if (!$Apache::lonxml::registered) {
@@ -846,7 +855,7 @@ EDITBUTTON
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
- $currentstring .= '\vskip 0 mm';
+ $currentstring .= '\vskip 0.2 mm';
}
} elsif ($target eq 'latexsource') {
$currentstring .= '\\';
@@ -1291,30 +1300,37 @@ EDITBUTTON
return $currentstring;
}
#-- <table> tag
- sub start_table {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
- my $currentstring = '';
- 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'} = ' \noindent \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;
+sub start_table {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ my $currentstring = '';
+ 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'} = ' \noindent \begin{tabular} ';
+ my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1);
+ 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'} = '';
+ }
+ my $width;
+ foreach my $key (keys(%{$token->[2]})) {
+ if ($key =~ /^width$/i) {
+ $width = &Apache::lonxml::get_param($key,$parstack,$safeeval,undef,1);
+ }
}
+ if (defined($width)) { $Apache::londefdef::table[-1]{'width'}=$width; }
+ }
+ return $currentstring;
+}
sub end_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1338,28 +1354,9 @@ EDITBUTTON
}
#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;}
- }
- 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";
+ my $how_many_columns = $#lengthforoutput + 1; #total number of columns in the table
+ my $filled_columns = 0; #number of columns with information about width
+ my $available_space = ' ';
foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) {
my @length = split(/,/,$tempo_length);
for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {
@@ -1396,30 +1393,43 @@ EDITBUTTON
}
}
}
- my $parboxlength = '(\textwidth';
- for (my $io=0; $io<=$#lengthforoutput;$io++) {
- $parboxlength .= ' - '.$lengthforoutput[$io].' ';
+ for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {
+ if (not $lengthforoutput[$ico]=~m/^\s*0\s*\w*\s*$/) {
+ $filled_columns++;
+ $available_space = $available_space.' - '.$lengthforoutput[$ico];
+ }
}
- $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 $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,$three) = split(/,/,$tbl_file_content[0]);
+ $how_many_columns+=$one-1;
+ $filled_columns+=$two;
+ if($three=~/\S/) {$available_space = $available_space.' - '.$three;}
+ } else {
+ $temp_file = Apache::File->new('>>'.$filename);
+ }
+ print $temp_file "$how_many_columns,$filled_columns,$available_space\n";
+ $output =~ s/\\parbox{TOBECHANGEDONNUMBER}{}/\\parbox{1 mm}{}/g;
+ $output =~ s/\\parbox{TOBECHANGEDONNUMBER}/\\parbox{\$SpacePerColumn}/g;
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;
- }
+ my $NumberEmptyLength = $how_many_columns - $filled_columns;
+ my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
+ my $shorthand = ($filled_columns+1)*4;
+ $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/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;
+ $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory
} else {
$currentstring = $Apache::londefdef::table[-1]{'output'};
$currentstring =~ s/\\\\\s+\\\\/\\\\/g;
@@ -1439,7 +1449,7 @@ EDITBUTTON
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
$Apache::londefdef::table[-1]{'row_number'}++;
- my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
if ($alignchar ne '') {
push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
} else {
@@ -1457,7 +1467,6 @@ 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 ';
push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};
}
@@ -1469,8 +1478,8 @@ EDITBUTTON
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);
+ } elsif ($target eq 'tex') {
+ my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
if ($what_to_push eq '') {
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
}
@@ -1490,16 +1499,16 @@ 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|in|pc|pt))/) {
+ 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,';
+ $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
$tempolen = '5 mm';
} else {
$Apache::londefdef::table[-1]{'length'} .= '0 mm,';
- $tempolen = '';
+ $tempolen = 'TOBECHANGEDONNUMBER';
}
}
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$tempolen.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
@@ -1513,7 +1522,7 @@ EDITBUTTON
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);
+ my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
if ($what_to_push eq '') {
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
}
@@ -1544,17 +1553,18 @@ EDITBUTTON
#-- <img> tag
sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
- $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
- $token->[2]->{'src'};
+ my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
+ undef,1);
+ $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
my $currentstring = '';
my $width_param = '';
my $height_param = '';
- my $scaling = .3;
+ my $scaling = .3;
if ($target eq 'web') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
- my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+ &image_replication($src);
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
#if original gif/jpg file exist do following:
if (-e $src) {
@@ -1565,13 +1575,20 @@ EDITBUTTON
$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;
+ my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,
+ undef,1);
+ my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval,
+ undef,1);
+ my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
+ undef,1);
+ if ($TeXwidth ne '') {
+ if ($TeXwidth=~/(\d+)\s*\%/) {
+ $width_param = $1*$ENV{'form.textwidth'}/100;
+ } else {
+ $width_param = $TeXwidth;
+ }
+ } elsif ($TeXheight ne '') {
+ $width_param = $TeXheight/$height_param*$width_param;
} elsif ($width ne '') {
$width_param = $width*$scaling;
}
@@ -1588,7 +1605,7 @@ EDITBUTTON
if (-e $newsrc) {
#eps counterpart for image exist
if ($path) {
- $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+ $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
}
} else {
#there is no eps counterpart for image - check for ps one
@@ -1597,7 +1614,7 @@ EDITBUTTON
#ps counterpart for image exist
$file =~ s/\.eps$/\.ps/;
if ($path) {
- $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+ $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
}
} else {
#there aren't eps or ps - so create eps
@@ -1605,17 +1622,16 @@ EDITBUTTON
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.'}} ';
+ $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
}
}
} else {
#original image file doesn't exist so check the alt attribute
- my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+ my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
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 ';
+ #<allow> tag will care about replication
}
}
}
@@ -1711,20 +1727,31 @@ sub start_embed {
}
return $currentstring;
}
-
#-- <allow> tag
+sub start_allow {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+ $token->[2]->{'src'};
+ my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+ &image_replication($src);
+ my $result;
+ if ($target eq 'edit') {
+ $result .=&Apache::edit::tag_start($target,$token);
+ $result .=&Apache::edit::text_arg('File Spec:','src',$token,70);
+ $result .=&Apache::edit::end_row();#.&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'src');
+ if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
+}
- sub start_allow {
- my ($target,$token) = @_;
-
- $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
- $token->[2]->{'src'};
-
- return '';
- }
- sub end_allow {
- return '';
- }
+sub end_allow {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ if ( $target eq 'edit') { return (&Apache::edit::end_table()); }
+ return '';
+}
#-- Frames
sub start_frameset {
my ($target,$token) = @_;
@@ -1772,7 +1799,7 @@ sub start_embed {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
- my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+ my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
$currentstring .= '<b>'.$display.'</b>';;
}
return $currentstring;
@@ -1790,7 +1817,7 @@ sub start_embed {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
- my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+ my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
$currentstring .= '<b>'.$display.'</b>';;
}
return $currentstring;
@@ -1808,7 +1835,7 @@ sub start_embed {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'tex') {
- my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval);
+ my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
$currentstring .= '\vskip '.$howmuch.' ';
}
return $currentstring;
@@ -2518,5 +2545,22 @@ sub start_embed {
}
return $currentstring;
}
+
+sub image_replication {
+ my $src = shift;
+ if (not -e '/home/httpd/html'.$src) {
+ #replicates image itself
+ &Apache::lonnet::repcopy('/home/httpd/html'.$src);
+ #replicates eps or ps
+ my $newsrc = $src;
+ $newsrc =~ s/(.gif|.jpg)$/.eps/;
+ if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
+ $newsrc =~ s/\.ps$/\.eps/;
+ &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);
+ }
+ }
+ return '';
+}
+
1;
__END__