--- loncom/xml/londefdef.pm 2006/08/01 18:48:14 1.331
+++ loncom/xml/londefdef.pm 2007/01/22 11:28:08 1.353
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.331 2006/08/01 18:48:14 albertel Exp $
+# $Id: londefdef.pm,v 1.353 2007/01/22 11:28:08 foxr Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -48,6 +48,7 @@ use Apache::lonmenu();
use Apache::lonmeta();
use Apache::Constants qw(:common);
use File::Basename;
+use LONCAPA();
# use Data::Dumper;
BEGIN {
@@ -561,8 +562,12 @@ sub end_body {
}
# \begin{center} causes a new paragprah spacing that looks odd inside
-# of a table cell
-sub center_correction { return '\vspace*{-6 mm}'; }
+# of a table cell. Same at the end of a \center but with a slightly
+# larger space .. hence center_correction and center_end_correction.
+#
+sub center_correction { return '\vspace*{-6 mm}'; }
+sub center_end_correction { return '\vspace*{-7 mm}'; }
+
#-- <center> tag (end tag required)
sub start_center {
my ($target,$token,$tagstack) = @_;
@@ -585,6 +590,9 @@ sub end_center {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
$currentstring = '\end{center}';
+ if (&is_inside_of($tagstack, "table")) {
+ $currentstring .= ¢er_end_correction();
+ }
}
return $currentstring;
}
@@ -1154,7 +1162,7 @@ sub start_p {
$currentstring .= &end_p(); # close off prior para if in progress.
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
if ($align eq 'center') {
- $currentstring .='\begin{center}\par';
+ $currentstring .='\begin{center}\par ';
$closing_string = '\end{center}';
if (&is_inside_of($tagstack, "table")) {
$currentstring = ¢er_correction().$currentstring;
@@ -1210,16 +1218,19 @@ sub start_br {
#
for (my $i=$#tempo;$i>=0;$i--) {
if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') ||
- ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul') ||
- ($tempo[$i] eq 'td') || ($tempo[$i] eq 'th')) {
+ ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul')) {
$signal=1;
- last;
+ }
+ if (($tempo[$i] eq 'td') || ($tempo[$i] eq 'th')) {
+ $signal = 1;
}
}
- if ($signal) {
+ if ($signal eq 1) {
$currentstring .= ' \vskip 0 mm ';
} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
$currentstring .= '\strut \\\\ \strut ';
+ } else { # Honor break in simple <sup></sup>
+ $currentstring .= '}} \strut \\\\ \strut \ensuremath{^{';
}
}
return $currentstring;
@@ -1548,17 +1559,6 @@ sub start_a {
my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
undef,1);
$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
- } elsif ($target eq 'tex') {
- my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
- my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
- if ($a=~/\S/) {
- $a=~s/([^\\])%/$1\\\%/g;
- $currentstring .= '\ref{URI: '.$a.'}';
- } elsif ($b=~/\S/) {
- $currentstring .= '\ref{Anchor: '.$b.'}';
- } else {
- $currentstring.='';
- }
}
return $currentstring;
}
@@ -1569,6 +1569,20 @@ sub end_a {
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring .= $token->[2];
}
+ if ($target eq 'tex') {
+ my $href =
+ &Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
+ my $name =
+ &Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
+ if ($href =~ /\S/) {
+ $href =~ s/([^\\])%/$1\\\%/g;
+ $currentstring .= ' ({\tt URI:'.&Apache::lonxml::latex_special_symbols($href).'})';
+ } elsif ($name =~ /\S/) {
+ $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
+ } else {
+ $currentstring.='';
+ }
+ }
return $currentstring;
}
@@ -1906,8 +1920,7 @@ sub start_table {
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- my $aa = {};
- push @Apache::londefdef::table, $aa;
+ push(@Apache::londefdef::table, {});
$Apache::londefdef::table[-1]{'row_number'} = -1;
#maximum table's width (default coincides with text line length)
if ($#Apache::londefdef::table==0) {
@@ -1981,7 +1994,13 @@ sub start_table {
$Apache::londefdef::table[-1]{'minlen'}=[];
$Apache::londefdef::table[-1]{'content'}=[];
$Apache::londefdef::table[-1]{'align'}=[];
- $currentstring.='\keephidden{NEW TABLE ENTRY}';
+ if (&is_inside_of($tagstack, 'sup')) {
+ $currentstring .= '}} \\\\ \ensuremath{^{ ';
+ }
+ if (&is_inside_of($tagstack, 'sub')) {
+ $currentstring .= '}} \\\\ \ensuremath{_{ ';
+ }
+ $currentstring.=' \keephidden{NEW TABLE ENTRY}';
}
@@ -2199,35 +2218,87 @@ sub end_table {
#
if ($colspan > 1) {
+ my $spanwidth = 0;
+ for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
+ $spanwidth += $fwidth[$spancol];
+ }
$output .= '\multicolumn{'.
$colspan
- .'}{|l|}{';
+ ."}";
+ if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+ $output .= '{|c|}{';
+ } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+ $output .= '{|r|}{';
+ }
+ else {
+ $output .= "{|p{$spanwidth mm}|}{";
+ }
+
}
+ # Rowspan... if colspan is 1, and there's an alignment we'll need
+ # to kick in a multicolumn in order to get the alignment spec.
+ # this must precede the multirow or LaTex gets quite upset.
+ # Naturally if colspan > 1 we've already done that above ^
+ #
+ my $multirow_aligned = 0;
if ($rowspan > 1) {
+ if ($colspan == 1) {
+ if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+ $output .= '\multicolumn{1}{|c|}{';
+ $multirow_aligned = 1;
+ } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+ $output .= '\multicolumn{1}{|r|}{';
+ $multirow_aligned = 1;
+ }
+ }
$have_rowspan++;
- $output .= '\multirow{'.$rowspan.'}[0]{'.$fwidth[$jn].'mm}{';
+ $output .= '\multirow{'.$rowspan.'}[0]{*}{';
+
+ $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
+ s{^\s*\\par\s*}{};
+ $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
+ s{\s*\\vskip\s*0pt\s*$}{};
+
+ #
+ # If we did not throw in a multicolumn to align, then add
+ # an extra {
+ # so we close correctly without having to keep additional state
+ # around
+ #
+ if (!$multirow_aligned) {
+ $output .= '{';
+ }
}
if (($rowspan eq '^') || ($rowspan eq '_')) {
$have_rowspan++;
}
#--------------------------------------------------------------
- if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- $output.=¢er_correction().'\begin{center}';
- } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
- $output.=' \hfill \llap{'
+
+ # For right and center alignment of single cells.
+ # we are going to use a multicolumn with a span of 1 to specify alignment.
+ #
+ if ($colspan == 1 && $rowspan == 1) {
+ if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+ $output .= '\multicolumn{1}{|c|}{';
+ } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+ $output .= '\multicolumn{1}{|r|}{';
+ }
}
+
$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
- if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- $output.='\end{center}';
- } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
- $output.='} ';
+
+ if (($colspan == 1 && $rowspan == 1) &&
+ (($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') ||
+ ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r'))) {
+ $output .= '}';
}
+
# Close off any open multirow:
if ($rowspan > 1) {
- $output .= '}';
+ $output .= '}}';
}
# Close off the colspan...
#
@@ -2790,55 +2861,28 @@ sub start_img {
#if original gif/jpg/png file exist do following:
my $origsrc=$src;
my ($path,$file) = &get_eps_image($src);
+ # &Apache::lonnet::logthis("Image source: $src result: $path $file");
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
&Apache::lonxml::debug("path = $path file = $file src = $src");
if (-e $src) {
&Apache::lonxml::debug("$src exists");
my ($height_param,$width_param)=
&image_size($origsrc,0.3,$parstack,$safeeval);
- my $destpath = $path;
- $destpath =~ s/ /\_/g; # Spaces in path cause LaTex to vomit.
- my $destfile = $file;
- $destfile =~ s/ /\_/g;
my $size;
if ($width_param) { $size.='width='.$width_param.' mm,'; }
if ($height_param) { $size.='height='.$height_param.' mm]'; }
+ # Default size if not able to extract that (e.g. eps image).
+
+ # &Apache::lonnet::logthis("Size = $size");
+
$size='['.$size;
$size=~s/,$/]/;
- $currentstring .= '\graphicspath{{'.$destpath.'}}'
- .'\includegraphics'.$size.'{'.$destfile.'} ';
-
- # If there's an alignment specification we need to honor it here.
- # For the horizontal alignments, we will also honor the
- # value of the latex specfication. The default is parbox,
- # and that's used for illegal values too.
- #
- # Even though we set a default alignment value, the user
- # could have given us an illegal value. In that case we
- # just use the default alignment of bottom..
- if ($align eq "top") {
- $currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}';
- } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
- my $offset = $height_param/2;
- $currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}';
- } elsif ($align eq "left") {
- if ($latex_rendering eq "parpic") {
- $currentstring = '\parpic[l]{'.$currentstring.'}';
- } else { # wrapfig render
- $currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}'
- .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
- }
- } elsif ($align eq "right") {
- if ($latex_rendering eq "parpic") {
- $currentstring = '\parpic[r]{'.$currentstring.'}';
- } else { # wrapfig rendering
- $currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}'
- .'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
-
- }
- } else { # Bottom is also default.
- # $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
- }
+ $currentstring .= '\graphicspath{{'.$path.'}}'
+ .'\includegraphics'.$size.'{'.$file.'} ';
+ $currentstring = &align_latex_image($align, $latex_rendering,
+ $currentstring,
+ $width_param, $height_param);
+
} else {
&Apache::lonxml::debug("$src does not exist");
#original image file doesn't exist so check the alt attribute
@@ -2866,8 +2910,8 @@ sub start_img {
$currentstring .=&Apache::edit::select_arg('Alignment:','align',
['','bottom','middle','top','left','right'],$token,5);
$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
- ['', 'parbox', 'parpic'], $token, 2);
- $currentstring .=&Apache::edit::select_arg('Encyrpt URL:','encrypturl',
+ ['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
+ $currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
['no','yes'], $token, 2);
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval);
@@ -3358,6 +3402,9 @@ sub start_blockquote {
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring .= $token->[4];
}
+ if ($target eq 'tex') {
+ $currentstring .= '\begin{quote}';
+ }
return $currentstring;
}
@@ -3367,6 +3414,9 @@ sub end_blockquote {
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring = $token->[2];
}
+ if ($target eq 'tex') {
+ $currentstring = '\end{quote}';
+ }
return $currentstring;
}
@@ -4167,7 +4217,7 @@ sub get_eps_image {
&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
}
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
- my ($spath, $sname, $sext) = fileparse($src, qr/\.(gif|png|jpg|jpeg)/i);
+ my ($spath, $sname, $sext) = &fileparse($src, qr/\.(gif|png|jpg|jpeg)/i);
$src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
&Apache::lonxml::debug("Filelocation gives: $src");
@@ -4192,17 +4242,33 @@ sub get_eps_image {
my $newsrc=$orig_src;
$newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
&Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");
- print FILE "$newsrc\n";
- close FILE;
+ print FILE ("$newsrc\n");
+ close(FILE);
$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
if ($sext ne "") { # Put the ext. back in to uniquify.
$src =~ s/\.eps$/$sext.eps/;
}
+
}
+
}
+ } else {
+ # If the postscript file has spaces in its name,
+ # LaTeX will gratuitiously vomit. Therefore
+ # queue such files for copy with " " replaced by "_".
+ # printout.pm will know them by their .ps or .eps extensions.
+ my $newsrc = $orig_src;
+ $newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
+ open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+ print FILE "$src\n";
+ close FILE;
+ $src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
+ $src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
}
my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
+ $path =~ s/ /\_/g;
+ $file =~ s/ /\_/g;
&Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />");
return ($path.'/',$file);
}
@@ -4214,15 +4280,15 @@ sub eps_generation {
print $temp_file "$src\n";
my $newsrc = $src;
$newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
- $newsrc=~s/\/home\/httpd\/html\/res//;
- $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;
- $newsrc=~s/\/\.\//\//;
- $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
- if ($newsrc=~/\/home\/httpd\/lonUsers\//) {
- $newsrc=~s/\/home\/httpd\/lonUsers//;
- $newsrc=~s/\/([^\/]+)\/(\w)\/(\w)\/(\w)\//\/$1\//;
+ $newsrc=~s{/home/httpd/html/res}{};
+ $newsrc=~s{/home/($LONCAPA::username_re)/public_html/}{/$1/};
+ $newsrc=~s{/\./}{/};
+ $newsrc=~s{/([^/]+)\.(ps|eps)}{/};
+ if ($newsrc=~m{/home/httpd/lonUsers/}) {
+ $newsrc=~s{/home/httpd/lonUsers}{};
+ $newsrc=~s{/($LONCAPA::domain_re)/./././}{/$1/};
}
- if ($newsrc=~/\/userfiles\//) {
+ if ($newsrc=~m{/userfiles/}) {
return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
} else {
return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
@@ -4286,6 +4352,62 @@ sub LATEX_length {
return $value;
}
+# Wrap image 'stuff' inside of the LaTeX required to implement
+# alignment:
+# align_tex_image(align, latex_rendering, image)
+# Where:
+# align - The HTML alignment specification.
+# latex_rendering - rendering hint for latex.
+# image - The LaTeX needed to insert the image itsef.
+# width,height - dimensions of the image.
+#
+sub align_latex_image {
+ my ($align, $latex_rendering, $image, $width, $height) = @_;
+ my $currentstring; # The result.
+
+ # If there's an alignment specification we need to honor it here.
+ # For the horizontal alignments, we will also honor the
+ # value of the latex specfication. The default is parbox,
+ # and that's used for illegal values too.
+ #
+ # Even though we set a default alignment value, the user
+ # could have given us an illegal value. In that case we
+ # just use the default alignment of bottom..
+ if ($align eq "top") {
+ $currentstring = '\raisebox{-'.$height.'mm}{'.$image.'}';
+ } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
+ my $offset = $height/2;
+ $currentstring = '\raisebox{-'.$offset.'mm}{'.$image.'}';
+ } elsif ($align eq "left") {
+ if ($latex_rendering eq "parpic") {
+ $currentstring = '\parpic[l]{'.$image.'}';
+ } elsif ($latex_rendering eq "parbox") {
+ $currentstring = '\begin{minipage}[l]{'.$width.'mm}'
+ .$image.'\end{minipage}';
+ } elsif ($latex_rendering eq "wrapfigure"
+ || $latex_rendering ne 'none') { # wrapfig render
+ $currentstring =
+ '\begin{wrapfigure}{l}{'.$width.'mm}'
+ .'\scalebox{1.0}{'.$image.'}\end{wrapfigure}';
+ }
+ } elsif ($align eq "right") {
+ if ($latex_rendering eq "parpic") {
+ $currentstring = '\parpic[r]{'.$image.'}';
+ } elsif ($latex_rendering eq "parbox") {
+ $currentstring = '\begin{minipage}[r]{'.$width.'mm}'
+ .$image.'\end{minipage}';
+ } elsif ($latex_rendering eq "wrapfigure"
+ || $latex_rendering ne 'none') { # wrapfig render
+ $currentstring =
+ '\begin{wrapfigure}{r}{'.$width.'mm}'
+ .'\scalebox{1.0}{'.$image.'}\end{wrapfigure}';
+ }
+ } else { # Bottom is also default.
+ # $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}';
+ $currentstring = $image;
+ }
+ return $currentstring;
+}
# is_inside_of $tagstack $tag
# This sub returns true if the current state of Xml processing