--- loncom/xml/londefdef.pm 2006/09/25 10:41:15 1.339
+++ loncom/xml/londefdef.pm 2007/02/27 23:44:53 1.355
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.339 2006/09/25 10:41:15 foxr Exp $
+# $Id: londefdef.pm,v 1.355 2007/02/27 23:44:53 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 {
@@ -1226,11 +1227,10 @@ sub start_br {
}
if ($signal eq 1) {
$currentstring .= ' \vskip 0 mm ';
- } elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
+ } else {
$currentstring .= '\strut \\\\ \strut ';
- } else { # Honor break in simple
- $currentstring .= '}} \strut \\\\ \strut \ensuremath{^{';
}
+
}
return $currentstring;
}
@@ -1412,7 +1412,7 @@ sub start_sub {
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\ensuremath{_{';
+ $currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{';
}
return $currentstring;
}
@@ -1435,7 +1435,7 @@ sub start_sup {
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\ensuremath{^{';
+ $currentstring .= '\raisebox{\smallskipamount}{\scriptsize{';
}
return $currentstring;
}
@@ -1558,17 +1558,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;
}
@@ -1579,6 +1568,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;
}
@@ -1916,8 +1919,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) {
@@ -1991,7 +1993,7 @@ sub start_table {
$Apache::londefdef::table[-1]{'minlen'}=[];
$Apache::londefdef::table[-1]{'content'}=[];
$Apache::londefdef::table[-1]{'align'}=[];
- $currentstring.='\keephidden{NEW TABLE ENTRY}';
+ $currentstring.=' \keephidden{NEW TABLE ENTRY}';
}
@@ -2245,6 +2247,12 @@ sub end_table {
}
$have_rowspan++;
$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 {
@@ -2846,55 +2854,32 @@ 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.'} ';
+ my $closure;
+ ($currentstring, $closure) = &align_latex_image($align,
+ $latex_rendering,
+ $currentstring,
+ $width_param,
+ $height_param);
+ $currentstring .= $closure;
+
} else {
&Apache::lonxml::debug("$src does not exist");
#original image file doesn't exist so check the alt attribute
@@ -2922,7 +2907,7 @@ 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);
+ ['', '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();
@@ -4229,7 +4214,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");
@@ -4254,17 +4239,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
");
return ($path.'/',$file);
}
@@ -4276,15 +4277,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.'} ';
@@ -4348,6 +4349,78 @@ 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.
+# Returns:
+# The 1/2 wrapped image and the stuff required to close the
+# wrappage. This allows e.g. randomlabel to insert more stuff
+# into the closure.
+#
+sub align_latex_image {
+ my ($align, $latex_rendering, $image, $width, $height) = @_;
+ my $currentstring; # The 1/2 wrapped image.
+ my $closure; # The closure of the wrappage.
+ # 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..
+ $currentstring = "\n% figurewrapping \n";
+ if ($align eq "top") {
+ $currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
+ $closure = '}';
+ } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
+ my $offset = $height/2;
+ $currentstring .= '\raisebox{-'.$offset.'mm}{'.$image;
+ $closure = '}';
+ } elsif ($align eq "left") {
+ if ($latex_rendering eq "parpic") {
+ $currentstring .= '\parpic[l]{'.$image;
+ $closure = '}';
+ } elsif ($latex_rendering eq "parbox") {
+ $currentstring .= '\begin{minipage}[l]{'.$width.'mm}'
+ .$image;
+ $closure = '\end{minipage}';
+ } elsif ($latex_rendering eq "wrapfigure"
+ || $latex_rendering ne 'none') { # wrapfig render
+ $currentstring .=
+ '\begin{wrapfigure}{l}{'.$width.'mm}'
+ .'\scalebox{1.0}{'.$image;
+ $closure = '}\end{wrapfigure}';
+ }
+ } elsif ($align eq "right") {
+ if ($latex_rendering eq "parpic") {
+ $currentstring .= '\parpic[r]{'.$image;
+ $closure = '}';
+ } elsif ($latex_rendering eq "parbox") {
+ $currentstring .= '\begin{minipage}[r]{'.$width.'mm}'
+ .$image;
+ $closure = '\end{minipage}';
+ } elsif ($latex_rendering eq "wrapfigure"
+ || $latex_rendering ne 'none') { # wrapfig render
+ $currentstring .=
+ '\begin{wrapfigure}{r}{'.$width.'mm}'
+ .'\scalebox{1.0}{'.$image;
+ $closure = '}\end{wrapfigure}';
+ }
+ } else { # Bottom is also default.
+ # $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}';
+ $currentstring .= "{$image";
+ $closure = '}';
+ }
+ $currentstring .= "\n% end wrappage\n";
+ $closure = "\n% Begin closure\n".$closure."\n% End closure\n";
+ return ($currentstring, $closure);
+}
# is_inside_of $tagstack $tag
# This sub returns true if the current state of Xml processing