version 1.279, 2005/07/11 09:49:59
|
version 1.286, 2005/09/19 10:59:08
|
Line 47 use Image::Magick;
|
Line 47 use Image::Magick;
|
use Apache::lonmenu(); |
use Apache::lonmenu(); |
use Apache::lonmeta(); |
use Apache::lonmeta(); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
|
use File::Basename; |
|
|
BEGIN { |
BEGIN { |
|
|
Line 166 sub start_html {
|
Line 166 sub start_html {
|
'\usepackage{textcomp}'. |
'\usepackage{textcomp}'. |
'\usepackage{makeidx}'. |
'\usepackage{makeidx}'. |
'\usepackage[dvips]{graphicx}'. |
'\usepackage[dvips]{graphicx}'. |
|
'\usepackage{wrapfig}'. |
'\usepackage{picins}'. |
'\usepackage{picins}'. |
'\usepackage{epsfig}'. |
'\usepackage{epsfig}'. |
'\usepackage{calc}'. |
'\usepackage{calc}'. |
Line 540 sub start_body {
|
Line 541 sub start_body {
|
$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; |
$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; |
} |
} |
$currentstring.='>'; |
$currentstring.='>'; |
|
&Apache::lontexconvert::jsMath_reset(); |
|
if ($env{'environment.texengine'} eq 'jsMath') { |
|
$currentstring.=&Apache::lontexconvert::jsMath_header(); |
|
} |
if ($env{'request.state'} ne 'published') { |
if ($env{'request.state'} ne 'published') { |
if ($env{'environment.remote'} eq 'off') { |
if ($env{'environment.remote'} eq 'off') { |
$currentstring.= |
$currentstring.= |
Line 1475 sub end_hr {
|
Line 1480 sub end_hr {
|
} |
} |
|
|
#-- <div> tag (end tag required) |
#-- <div> tag (end tag required) |
|
{ |
|
|
|
# Since div can be nested, the stack below is used |
|
# in 'tex' mode to store the ending strings |
|
# for the div stack. |
|
|
|
my @div_end_stack; |
|
|
sub start_div { |
sub start_div { |
my ($target,$token) = @_; |
my ($target,$token, $tagstack, $parstack, $parser, $safeeval) = @_; |
my $currentstring = &end_p(); # Close enclosing para. |
my $currentstring = &end_p(); # Close enclosing para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} |
} |
|
if ($target eq 'tex') { |
|
# 4 possible alignments: left, right, center, and -missing-. |
|
|
|
my $endstring = ''; |
|
|
|
my $align = lc(&Apache::lonxml::get_param('align', $parstack, |
|
$safeeval, undef, 1)); |
|
if ($align eq 'center') { |
|
$currentstring .= '\begin{center}'; |
|
$endstring = '\end{center}'; |
|
} |
|
elsif ($align eq 'right') { |
|
$currentstring .= '\begin{flushright}'; |
|
$endstring .= '\end{flushright}'; |
|
} elsif ($align eq 'left') { |
|
$currentstring .= '\begin{flushleft}'; |
|
$endstring = '\end{flushleft}'; |
|
} else { |
|
|
|
} |
|
$currentstring .= "\n"; # For human readability. |
|
$endstring = "\n$endstring\n"; # For human readability |
|
push(@div_end_stack, $endstring); |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 1489 sub end_div {
|
Line 1526 sub end_div {
|
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} |
} |
|
if ($target eq 'tex') { |
|
my $endstring = pop @div_end_stack; |
|
$currentstring .= $endstring; |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
} |
|
|
#-- <a> tag (end tag required) |
#-- <a> tag (end tag required) |
sub start_a { |
sub start_a { |
Line 1911 sub start_table {
|
Line 1953 sub start_table {
|
$Apache::londefdef::table[-1]{'vvinc'} = ''; |
$Apache::londefdef::table[-1]{'vvinc'} = ''; |
} |
} |
if ($#Apache::londefdef::table==0) { |
if ($#Apache::londefdef::table==0) { |
$Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}'; |
# Note that \newline seems to destroy the alignment envs. |
|
# $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}'; |
|
$Apache::londefdef::table[-1]{'output'}='\strut'.'\\\\'."\n".'\strut\setlength{\tabcolsep}{1 mm}'; |
} |
} |
$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} '; |
$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} '; |
$Apache::londefdef::table[-1]{'TeXlen'}=[]; |
$Apache::londefdef::table[-1]{'TeXlen'}=[]; |
Line 2134 sub end_table {
|
Line 2178 sub end_table {
|
} |
} |
$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' '; |
$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' '; |
} |
} |
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut '; |
# Note that \newline destroys alignment env's produced by e.g. <div> |
|
# $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut '; |
|
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut'.'\\\\'."\n".'\strut '; |
if ($#Apache::londefdef::table > 0) { |
if ($#Apache::londefdef::table > 0) { |
my $inmemory = $Apache::londefdef::table[-1]{'output'}; |
my $inmemory = $Apache::londefdef::table[-1]{'output'}; |
pop @Apache::londefdef::table; |
pop @Apache::londefdef::table; |
Line 2572 sub start_img {
|
Line 2618 sub start_img {
|
} elsif ($align eq "left") { |
} elsif ($align eq "left") { |
if ($latex_rendering eq "parpic") { |
if ($latex_rendering eq "parpic") { |
$currentstring = '\parpic[l]{'.$currentstring.'}'; |
$currentstring = '\parpic[l]{'.$currentstring.'}'; |
} else { # parbox rendering |
} else { # wrapfig render |
$currentstring = "\\strut\\newline\n". |
$currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}' |
'\parbox{'.$width_param.'mm}{'.$currentstring.'}'; |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
} |
} |
} elsif ($align eq "right") { |
} elsif ($align eq "right") { |
if ($latex_rendering eq "parpic") { |
if ($latex_rendering eq "parpic") { |
$currentstring = '\parpic[r]{'.$currentstring.'}'; |
$currentstring = '\parpic[r]{'.$currentstring.'}'; |
} else { # parbox rendering. |
} else { # wrapfig rendering |
$currentstring = '\parbox{'.$width_param.'mm}{\begin{flushright}' |
$currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}' |
.$currentstring.'\end{flushright}} \newline'."\n"; |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
|
|
} |
} |
} else { # Bottom is also default. |
} else { # Bottom is also default. |
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
Line 3920 sub image_height {
|
Line 3967 sub image_height {
|
sub get_eps_image { |
sub get_eps_image { |
my ($src)=@_; |
my ($src)=@_; |
my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src); |
my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src); |
|
|
|
# In order to prevent the substitution of the alt text, we need to |
|
# be sure the orig_src file is on system now so: |
|
|
|
if (! -e $orig_src) { |
|
&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal. |
|
} |
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); |
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); |
|
my ($spath, $sname, $sext) = fileparse($src, qr/\.(gif|png|jpg|jpeg)/i); |
$src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i; |
$src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i; |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
&Apache::lonxml::debug("Filelocation gives: $src"); |
&Apache::lonxml::debug("Filelocation gives: $src"); |
Line 3949 sub get_eps_image {
|
Line 4004 sub get_eps_image {
|
close FILE; |
close FILE; |
$src=~s|/home/httpd/html/res|/home/httpd/prtspool|; |
$src=~s|/home/httpd/html/res|/home/httpd/prtspool|; |
$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|; |
$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|; |
|
if ($sext ne "") { # Put the ext. back in to uniquify. |
|
$src =~ s/\.eps$/$sext.eps/; |
|
} |
} |
} |
} |
} |
} |
} |