--- loncom/xml/londefdef.pm 2006/09/19 10:57:11 1.337
+++ loncom/xml/londefdef.pm 2006/12/19 22:30:52 1.348
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.337 2006/09/19 10:57:11 foxr Exp $
+# $Id: londefdef.pm,v 1.348 2006/12/19 22:30:52 albertel 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 {
@@ -1228,6 +1229,8 @@ sub start_br {
$currentstring .= ' \vskip 0 mm ';
} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
$currentstring .= '\strut \\\\ \strut ';
+ } else { # Honor break in simple
+ $currentstring .= '}} \strut \\\\ \strut \ensuremath{^{';
}
}
return $currentstring;
@@ -1914,8 +1917,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) {
@@ -1989,7 +1991,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}';
}
@@ -2844,23 +2852,24 @@ 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.'} ';
+ $currentstring .= '\graphicspath{{'.$path.'}}'
+ .'\includegraphics'.$size.'{'.$file.'} ';
# If there's an alignment specification we need to honor it here.
# For the horizontal alignments, we will also honor the
@@ -2878,17 +2887,26 @@ sub start_img {
} elsif ($align eq "left") {
if ($latex_rendering eq "parpic") {
$currentstring = '\parpic[l]{'.$currentstring.'}';
- } else { # wrapfig render
- $currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}'
+ } elsif ($latex_rendering eq "parbox") {
+ $currentstring = '\begin{minipage}[l]{'.$width_param.'mm}'
+ .$currentstring.'\end{minipage}';
+ } elsif ($latex_rendering eq "wrapfigure"
+ || $latexrendering ne 'none') { # 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}'
+ } elsif ($latex_rendering eq "parbox") {
+ $currentstring = '\begin{minipage}[r]{'.$width_param.'mm}'
+ .$currentstring.'\end{minipage}';
+ } elsif ($latex_rendering eq "wrapfigure"
+ || $latexrendering ne 'none') { # wrapfig render
+ $currentstring =
+ '\begin{wrapfigure}{r}{'.$width_param.'mm}'
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
-
}
} else { # Bottom is also default.
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
@@ -2920,7 +2938,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();
@@ -3412,6 +3430,9 @@ sub start_blockquote {
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring .= $token->[4];
}
+ if ($target eq 'tex') {
+ $currentstring .= '\begin{quote}';
+ }
return $currentstring;
}
@@ -3421,6 +3442,9 @@ sub end_blockquote {
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring = $token->[2];
}
+ if ($target eq 'tex') {
+ $currentstring = '\end{quote}';
+ }
return $currentstring;
}
@@ -4221,7 +4245,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");
@@ -4246,17 +4270,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);
}
@@ -4268,15 +4308,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.'} ';