--- loncom/xml/londefdef.pm 2005/02/25 05:54:01 1.258 +++ loncom/xml/londefdef.pm 2005/09/19 10:59:08 1.286 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.258 2005/02/25 05:54:01 albertel Exp $ +# $Id: londefdef.pm,v 1.286 2005/09/19 10:59:08 foxr Exp $ # # # Copyright Michigan State University Board of Trustees @@ -39,7 +39,7 @@ package Apache::londefdef; -use Apache::lonnet(); +use Apache::lonnet; use strict; use Apache::lonxml; use Apache::File(); @@ -47,7 +47,7 @@ use Image::Magick; use Apache::lonmenu(); use Apache::lonmeta(); use Apache::Constants qw(:common); - +use File::Basename; BEGIN { @@ -90,7 +90,8 @@ sub start_m { $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); #&Apache::lonxml::debug("M is evaulated to:$inside:"); } - $currentstring = &Apache::lontexconvert::converted(\$inside); + my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval); + $currentstring = &Apache::lontexconvert::converted(\$inside,$display); if ($Apache::lontexconvert::errorstring) { &Apache::lonxml::warning("tth error: ". $Apache::lontexconvert::errorstring); @@ -132,7 +133,7 @@ sub start_tthoption { if ($target eq 'web') { my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser); $inside=~s/^\s*//; - if ($ENV{'browser.mathml'}) { + if ($env{'browser.mathml'}) { &tth::ttmoptions($inside); } else { &tth::tthoptions($inside); @@ -151,21 +152,21 @@ sub end_tthoption { sub start_html { my ($target,$token) = @_; my $currentstring = ''; - my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'}; + my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'}; &Apache::lontexconvert::init_tth(); - if ($target eq 'web' || $target eq 'edit') { + if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) { $currentstring = &Apache::lonxml::xmlbegin(); } elsif ($target eq 'tex') { - @Apache::londefdef::table = (); $currentstring .= '\documentclass[letterpaper]{article}'; - if (($ENV{'form.latex_type'}=~'batchmode') || - (!$ENV{'request.role.adv'})) {$currentstring .='\batchmode';} + if (($env{'form.latex_type'}=~'batchmode') || + (!$env{'request.role.adv'})) {$currentstring .='\batchmode';} $currentstring .= '\newcommand{\keephidden}[1]{}'. '\renewcommand{\deg}{$^{\circ}$}'. '\usepackage{longtable}'. '\usepackage{textcomp}'. '\usepackage{makeidx}'. '\usepackage[dvips]{graphicx}'. + '\usepackage{wrapfig}'. '\usepackage{picins}'. '\usepackage{epsfig}'. '\usepackage{calc}'. @@ -184,7 +185,7 @@ sub end_html { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = &Apache::lonxml::xmlend($target,$parser); + $currentstring = ''; } return $currentstring; } @@ -202,7 +203,7 @@ sub start_head { sub end_head { my ($target,$token) = @_; my $currentstring = ''; - if ($target eq 'web' && $ENV{'request.state'} eq 'published') { + if ($target eq 'web' && $env{'request.state'} eq 'published') { $currentstring = &Apache::lonmenu::registerurl(undef,$target). $token->[2]; } @@ -490,15 +491,15 @@ sub start_body { return ''; } if (!$Apache::lonxml::registered && - $ENV{'request.state'} eq 'published') { + $env{'request.state'} eq 'published') { $currentstring.=''. &Apache::lonmenu::registerurl(undef,$target).''; } # Accessibility - if ($ENV{'browser.imagesuppress'} eq 'on') { + if ($env{'browser.imagesuppress'} eq 'on') { delete($token->[2]->{'background'}); } - if ($ENV{'browser.fontenhance'} eq 'on') { + if ($env{'browser.fontenhance'} eq 'on') { my $style=''; foreach my $key (keys(%{$token->[2]})) { if ($key =~ /^style$/i) { @@ -508,7 +509,7 @@ sub start_body { } $token->[2]->{'style'}=$style.'; font-size: x-large;'; } - if ($ENV{'browser.blackwhite'} eq 'on') { + if ($env{'browser.blackwhite'} eq 'on') { delete($token->[2]->{'font'}); delete($token->[2]->{'link'}); delete($token->[2]->{'alink'}); @@ -535,23 +536,25 @@ sub start_body { $token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents(). ';'.$onUnload; - if ($ENV{'request.state'} ne 'construct') { - $currentstring .= '<'.$token->[1]; - } + $currentstring .= '<'.$token->[1]; foreach (keys %{$token->[2]}) { $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; } - if ($ENV{'request.state'} ne 'construct') { - $currentstring.='>'; - } - if ($ENV{'request.state'} ne 'published') { - my $remote=($ENV{'environment.remote'} ne 'off'); - $currentstring=&Apache::loncommon::bodytag(undef,undef, - $currentstring,$remote); + $currentstring.='>'; + &Apache::lontexconvert::jsMath_reset(); + if ($env{'environment.texengine'} eq 'jsMath') { + $currentstring.=&Apache::lontexconvert::jsMath_header(); + } + if ($env{'request.state'} ne 'published') { + if ($env{'environment.remote'} eq 'off') { + $currentstring.= + &Apache::lonmenu::constspaceform(). + &Apache::lonmenu::menubuttons(1,'web',1); + } $currentstring.=(< - - +
+ +
EDITBUTTON } else { $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1); @@ -564,12 +567,12 @@ EDITBUTTON } sub end_body { - my ($target,$token) = @_; - my $currentstring = ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my $currentstring = &end_p(); # Close off unclosed

if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring .= &Apache::lonxml::xmlend($target,$parser); } elsif ($target eq 'tex') { - $currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}'; + $currentstring .= '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}'; } return $currentstring; } @@ -577,11 +580,11 @@ sub end_body { #--

tag (end tag required) sub start_center { my ($target,$token) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close off any prior para. if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring = '\begin{center}'; + $currentstring .= '\begin{center}'; } return $currentstring; } @@ -598,13 +601,15 @@ sub end_center { } #-- tag (end tag required) +# NOTE: In TeX mode disables internal

sub start_b { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - $currentstring = '\textbf{'; + &disable_para(); + $currentstring .= '\textbf{'; } return $currentstring; } @@ -615,18 +620,21 @@ sub end_b { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = '}'; + &enable_para(); + $currentstring = '}'; } return $currentstring; } #-- tag (end tag required) +# NOTE: in TeX mode disables internal

sub start_strong { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { + &disable_para(); $currentstring = '\textbf{'; } return $currentstring; @@ -638,6 +646,7 @@ sub end_strong { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { + &enable_para(); $currentstring = '}'; } return $currentstring; @@ -646,7 +655,7 @@ sub end_strong { #--

tag (end tag required) sub start_h1 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close off any prior para. if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { @@ -661,9 +670,9 @@ sub start_h1 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; } elsif ($target eq 'meta') { - $currentstring=''; + $currentstring.=''; &start_output($target); } return $currentstring; @@ -695,7 +704,7 @@ sub end_h1 { #--

tag sub start_h2 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close off any prior para. if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { @@ -710,7 +719,7 @@ sub start_h2 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; } return $currentstring; } @@ -738,7 +747,7 @@ sub end_h2 { #--

tag sub start_h3 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close off any prior para. if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { @@ -753,7 +762,7 @@ sub start_h3 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; } return $currentstring; } @@ -781,7 +790,7 @@ sub end_h3 { #--

tag sub start_h4 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close off any prior para. if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { @@ -796,7 +805,7 @@ sub start_h4 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; } return $currentstring; } @@ -824,7 +833,7 @@ sub end_h4 { #--

tag sub start_h5 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close off any prior paras. if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { @@ -839,7 +848,7 @@ sub start_h5 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; } return $currentstring; } @@ -867,7 +876,7 @@ sub end_h5 { #--
tag sub start_h6 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close off any prior paras. if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { @@ -882,7 +891,7 @@ sub start_h6 { } my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); if (not defined $TeXsize) {$TeXsize="large";} - $currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; + $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; } return $currentstring; } @@ -1114,52 +1123,80 @@ sub end_q { return $currentstring; } +#

is a bit strange since it does not require a closing

+# However in latex, we must often output closing stuff to end +# environments and {}'s etc. Therefore we do all the work +# of figuring out the ending strings in the start tag processing, +# and provide a mechanism to output the stop text external +# to tag processing. +# +{ + + my $closing_string = ''; # String required to close

+ +# Some tags are

fragile meaning that

inside of them +# does not work within TeX mode. This is managed via the +# counter below: +# + + my $para_disabled = 0; + +sub disable_para { + $para_disabled++; +} +sub enable_para { + $para_disabled--; +} + + #--

tag (end tag optional) #optional attribute - align="center|left|right" sub start_p { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { + $currentstring .= &end_p(); # close off prior para if in progress. $currentstring .= $token->[4]; - } elsif ($target eq 'tex') { + if (! ($currentstring =~ /\//)) { + $closing_string = '

'; # Deal correctly with

e.g. + } + } elsif ($target eq 'tex' && !$para_disabled) { + $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}'; } elsif ($align eq 'right') { - $currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{'; + $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{'; + $closing_string= '}}'; } elsif ($align eq 'left') { - $currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{'; + $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{\rlap{'; + $closing_string = '}\hfill}'; } else { - $currentstring='\par '; + $currentstring.='\par '; + $closing_string = '\strut\\\\\strut '; } - my $signal=1;#

does not work inside ... - foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;} - if (!$signal) {$currentstring = '';} - } + } return $currentstring; } - +# +# End paragraph processing just requires that we output the +# closing string that was saved and blank it. sub end_p { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; - if ($target eq 'web') { - $currentstring .= $token->[2]; - } elsif ($target eq 'tex') { - my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (not defined $align) { - $currentstring.='\strut\\\\\strut '; - } elsif ($align eq 'center') { - $currentstring .= '\end{center}'; - } elsif ($align eq 'right') { - $currentstring .= '}}'; - } elsif ($align eq 'left') { - $currentstring .= '}\hfill}'; - } + # Note only 'tex' mode uses disable_para and enable_para + # so we don't need to know the target in the check below: + + if (!$para_disabled) { + my $current_string = $closing_string; + $closing_string = ''; # Not in a para anymore. + return $current_string; + } else { + return ''; } - return $currentstring; -} +} +} #--
tag (end tag forbidden) sub start_br { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -1277,8 +1314,8 @@ sub start_font { if ($target eq 'web') { my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval); if ($face!~/symbol/i) { - if (($ENV{'browser.fontenhance'} eq 'on') || - ($ENV{'browser.blackwhite'} eq 'on')) { return ''; } + if (($env{'browser.fontenhance'} eq 'on') || + ($env{'browser.blackwhite'} eq 'on')) { return ''; } } $currentstring = $token->[4]; } elsif ($target eq 'tex') { @@ -1405,7 +1442,7 @@ sub end_sup { #--

tag (end tag forbidden) sub start_hr { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # End enclosing para. if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { @@ -1443,12 +1480,44 @@ sub end_hr { } #--
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 { - my ($target,$token) = @_; - my $currentstring = ''; + my ($target,$token, $tagstack, $parstack, $parser, $safeeval) = @_; + my $currentstring = &end_p(); # Close enclosing para. if ($target eq 'web') { $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; } @@ -1457,9 +1526,14 @@ sub end_div { my $currentstring = ''; if ($target eq 'web') { $currentstring .= $token->[2]; - } + } + if ($target eq 'tex') { + my $endstring = pop @div_end_stack; + $currentstring .= $endstring; + } return $currentstring; } +} #-- tag (end tag required) sub start_a { @@ -1527,9 +1601,9 @@ sub start_li { sub end_li { my ($target,$token) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # In case there's a

in the

  • if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring .= $token->[2]; } return $currentstring; } @@ -1563,9 +1637,9 @@ sub end_u { #--
      tag (end tag required) sub start_ul { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close off enclosing list. if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); $Apache::londefdef::list_index=0; @@ -1630,11 +1704,11 @@ sub end_menu { #-- tag (end tag required) sub start_dir { my ($target,$token) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # In case there's a

      prior to the list. if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring = " \\begin{itemize} "; + $currentstring .= " \\begin{itemize} "; } return $currentstring; } @@ -1653,9 +1727,9 @@ sub end_dir { #--

        tag (end tag required) sub start_ol { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # In case there's a

        prior to the list. if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { $Apache::londefdef::list_index=0; my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); @@ -1707,11 +1781,11 @@ sub end_ol { #--

        tag (end tag required) sub start_dl { my ($target,$token) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # In case there's a

        unclosed prior to the list. if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring = '\begin{description}'; + $currentstring .= '\begin{description}'; $Apache::londefdef::DL++; push(@Apache::londefdef::description,[]); $Apache::londefdef::DD[$Apache::londefdef::DL]=0; @@ -1814,19 +1888,25 @@ sub end_dd { } #-- tag (end tag required) +#
        also ends any prior

        that is not closed. +# but, unless I allow

        's to nest, that's the +# only way I could think of to allow

        in +#

        bodies +# #list of supported attributes: border,width,TeXwidth sub start_table { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my ($textwidth,$currentstring)=('',''); + my $textwidth = ''; + my $currentstring = &end_p(); if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring .= $token->[4]; } elsif ($target eq 'tex') { my $aa = {}; push @Apache::londefdef::table, $aa; $Apache::londefdef::table[-1]{'row_number'} = -1; #maximum table's width (default coincides with text line length) if ($#Apache::londefdef::table==0) { - $textwidth=&recalc($ENV{'form.textwidth'}); #result is always in mm + $textwidth=&recalc($env{'form.textwidth'}); #result is always in mm $textwidth=~/(\d+\.?\d*)/; $textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame } else { @@ -1873,7 +1953,9 @@ sub start_table { $Apache::londefdef::table[-1]{'vvinc'} = ''; } 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]{'TeXlen'}=[]; @@ -1883,7 +1965,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}'; } return $currentstring; } @@ -2096,7 +2178,9 @@ sub end_table { } $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.
        + # $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) { my $inmemory = $Apache::londefdef::table[-1]{'output'}; pop @Apache::londefdef::table; @@ -2137,9 +2221,9 @@ sub start_tr { sub end_tr { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close any pending

        in the row. if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring .= $token->[2]; } elsif ($target eq 'tex') { if ($Apache::londefdef::TD_redirection) { &end_td_tex($parstack,$parser,$safeeval); @@ -2414,9 +2498,9 @@ sub end_th_tex { sub end_th { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p(); # Close any open

        in the row. if ($target eq 'web') { - $currentstring = $token->[2]; + $currentstring .= $token->[2]; } elsif ($target eq 'tex') { $Apache::londefdef::TD_redirection =0; &end_th_tex($parstack,$parser,$safeeval); @@ -2450,7 +2534,7 @@ sub start_img { # Render unto browsers that which are the browser's... if ($target eq 'web') { - if ($ENV{'browser.imagesuppress'} ne 'on') { + if ($env{'browser.imagesuppress'} ne 'on') { $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); } else { my $alttag= &Apache::lonxml::get_param @@ -2495,16 +2579,28 @@ sub start_img { if(!$latex_rendering) { $latex_rendering = "parbox"; } - &Apache::lonxml::debug("LaTeX rendering = $latex_rendering"); + &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); #if original gif/jpg/png file exist do following: + my $origsrc=$src; my ($path,$file) = &get_eps_image($src); $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($src,0.3,$parstack,$safeeval); - $currentstring .= '\graphicspath{{'.$path.'}}' - .'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$file.'} '; + &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]'; } + $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 @@ -2522,21 +2618,23 @@ sub start_img { } elsif ($align eq "left") { if ($latex_rendering eq "parpic") { $currentstring = '\parpic[l]{'.$currentstring.'}'; - } else { # parbox rendering - $currentstring = "\\strut\\newline\n". - '\parbox{'.$width_param.'mm}{'.$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 { # parbox rendering. - $currentstring = '\parbox{'.$width_param.'mm}{\begin{flushright}' - .$currentstring.'\end{flushright}} \newline'."\n"; + } 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.'}'; } } else { + &Apache::lonxml::debug("$src does not exist"); #original image file doesn't exist so check the alt attribute my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1); @@ -2615,6 +2713,7 @@ sub start_img { } if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);} } + return $currentstring; } @@ -2642,7 +2741,7 @@ sub start_applet { my $currentstring = ''; if ($target eq 'web') { - if ($ENV{'browser.appletsuppress'} ne 'on') { + if ($env{'browser.appletsuppress'} ne 'on') { $currentstring = &Apache::lonenc::encrypt_ref($token, {'code'=>$code, 'archive'=>$archive} @@ -2688,7 +2787,7 @@ sub start_embed { $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; my $currentstring = ''; if ($target eq 'web') { - if ($ENV{'browser.embedsuppress'} ne 'on') { + if ($env{'browser.embedsuppress'} ne 'on') { $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); } else { my $alttag=&Apache::lonxml::get_param @@ -2781,10 +2880,10 @@ sub end_allow { #-- sub start_frameset { my ($target,$token) = @_; - my $currentstring = ''; + my $currentstring = ''; # Close any pending para. if ($target eq 'web') { if (!$Apache::lonxml::registered && - $ENV{'request.state'} eq 'published') { + $env{'request.state'} eq 'published') { $currentstring.=''. &Apache::lonmenu::registerurl(undef,$target).''; } @@ -2850,7 +2949,7 @@ sub end_xmp { #-- 

         (end tag required)
 sub start_pre {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
+    my $currentstring = &end_p();	# close off pending 
        
     if ($target eq 'web') {
 	$currentstring .= $token->[4];
     } elsif ($target eq 'tex') {
@@ -2913,7 +3012,7 @@ sub end_externallink {
 #-- 
 sub start_blankspace {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-    my $currentstring = '';
+    my $currentstring = &end_p();	# closes off any unclosed 
        
     if ($target eq 'tex') {
 	my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
 	$currentstring .= '\vskip '.$howmuch.' ';
@@ -3066,9 +3165,9 @@ sub end_blink {
 #-- 
         tag (end tag required)
 sub start_blockquote {
     my ($target,$token) = @_;
-    my $currentstring = '';
+    my $currentstring = &end_p();	# Close any unclosed 
        
     if ($target eq 'web') {
-	$currentstring = $token->[4];     
+	$currentstring .= $token->[4];     
     } 
     return $currentstring;
 }
@@ -3389,9 +3488,9 @@ sub end_marquee {
 #--  tag (end tag required)
 sub start_multicol {
     my ($target,$token) = @_;
-    my $currentstring = '';
+    my $currentstring = &end_p();	# Close any pending 
        
     if ($target eq 'web') {
-	$currentstring = $token->[4];     
+	$currentstring .= $token->[4];     
     } 
     return $currentstring;
 }
@@ -3587,9 +3686,9 @@ sub end_server {
 #--  tag (end tag forbidden)
 sub start_spacer {
     my ($target,$token) = @_;
-    my $currentstring = '';
+    my $currentstring = &end_p();	# Close off any open 
         tag.
     if ($target eq 'web') {
-	$currentstring = $token->[4];     
+	$currentstring .= $token->[4];     
     } 
     return $currentstring;
 }
@@ -3749,22 +3848,45 @@ sub image_replication {
     $pssrc  =~ s/\.(gif|jpg|jpeg|png)$/.ps/i;
     if (not -e $epssrc && not -e $pssrc) {
 	my $result=&Apache::lonnet::repcopy($epssrc);
-	if ($result ne OK) { &Apache::lonnet::repcopy($pssrc); }
+	if ($result ne 'ok') { &Apache::lonnet::repcopy($pssrc); }
     }
     return '';
 }
+#
+#   Get correct sizing parameter for an image given
+#   it's initial ht. and wid.  This allows sizing of
+#   images that are generated on-the-fly (e.g. gnuplot)
+#   as well as serving as a utility for image_size.
+# 
+#  Parameter:
+#        height_param
+#        width_param    - Initial picture dimensions.
+#        scaling        - A scale factor.
+#        parstack,      - the current stack of tag attributes 
+#                         from the xml parser
+#        safeeval,      - pointer to the safespace
+#        depth,         - from what level in the stack to look for attributes
+#                         (assumes -1 if unspecified)
+#        cis            - look for attrubutes case insensitively
+#                         (assumes false)
+#
+# Returns:
+#   height, width   - new dimensions.
+#
+sub resize_image {
+    my ($height_param, $width_param, $scaling,
+	$parstack, $safeeval, $depth, $cis) = @_;
+
+    # First apply the scaling...
+
+    $height_param = $height_param * $scaling;
+    $width_param  = $width_param  * $scaling;
 
-sub image_size {
-    my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
-    #size of image from gif/jpg/jpeg/png 
-    $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-    my $image = Image::Magick->new;
-    my $current_figure = $image->Read($src);
-    my $width_param = $image->Get('width') * $scaling;;
-    my $height_param = $image->Get('height') * $scaling;;
-    undef($image);
     #do we have any specified LaTeX size of the picture?
-    my $toget='TeXwidth'; if ($cis) { $toget=lc($toget); }
+    my $toget='TeXwidth'; 
+    if ($cis) { 
+	$toget=lc($toget); 
+    }
     my $TeXwidth = &Apache::lonxml::get_param($toget,$parstack,
 					      $safeeval,$depth,$cis);
     $toget='TeXheight'; if ($cis) { $toget=lc($toget); }
@@ -3776,24 +3898,57 @@ sub image_size {
     if ($TeXwidth) { 
 	my $old_width_param=$width_param;
 	if ($TeXwidth=~/(\d+)\s*\%/) {
-	    $width_param = $1*$ENV{'form.textwidth'}/100;
+	    $width_param = $1*$env{'form.textwidth'}/100;
 	} else { 
 	    $width_param = $TeXwidth;
 	}
-	$height_param=$TeXwidth/$old_width_param*$height_param;
+	if ($TeXheight) {
+	    $height_param = $TeXheight;
+	} elsif ($old_width_param) {
+	    $height_param=$TeXwidth/$old_width_param*$height_param;
+	}
     } elsif ($TeXheight) {
 	$height_param = $TeXheight;
-	$width_param  = $TeXheight/$height_param*$width_param;
+	if ($height_param) {
+	    $width_param  = $TeXheight/$height_param*$width_param;
+	}
     } elsif ($width) {
 	my $old_width_param=$width_param;
 	$width_param = $width*$scaling;
-        $height_param=$width_param/$old_width_param*$height_param;
+	if ($old_width_param) {
+	    $height_param=$width_param/$old_width_param*$height_param;
+	}
     }
-    if ($width_param > $ENV{'form.textwidth'}) {
+    if ($width_param > $env{'form.textwidth'}) {
         my $old_width_param=$width_param;
-	$width_param =0.95*$ENV{'form.textwidth'};
-        $height_param=$width_param/$old_width_param*$height_param;
+	$width_param =0.95*$env{'form.textwidth'};
+	if ($old_width_param) {
+	    $height_param=$width_param/$old_width_param*$height_param;
+	}
+    }
+
+    return ($height_param, $width_param);
+}
+
+sub image_size {
+    my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
+
+    #size of image from gif/jpg/jpeg/png 
+    my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+    if (-e $ressrc) {
+	$src = $ressrc;
     }
+    my $image = Image::Magick->new;
+    my $current_figure = $image->Read($src);
+    my $width_param = $image->Get('width');
+    my $height_param = $image->Get('height');
+    &Apache::lonxml::debug("Image magick says: $src :  Height = $height_param width = $width_param");
+    undef($image);
+
+    ($height_param, $width_param) = &resize_image($height_param, $width_param,
+						  $scaling, $parstack, $safeeval, 
+						  $depth, $cis);
+
     return ($height_param, $width_param);
 }
 
@@ -3811,35 +3966,58 @@ sub image_height {
 
 sub get_eps_image {
     my ($src)=@_;
-    my $orig_src=$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");
+    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");
     if (! -e $src) {
-	if (&Apache::lonnet::repcopy($src) ne OK ) {
+	&Apache::lonxml::debug("$src does not exist");
+	if (&Apache::lonnet::repcopy($src) ne 'ok' ) {
+	    &Apache::lonxml::debug("Repcopy of $src failed (1)");
 	    #if replication failed try to find ps file
 	    $src=~s/\.eps$/\.ps/;
-	    #if no ps file try to replicate it
-	    if (not -e $src &&
-		&Apache::lonnet::repcopy($src) ne OK) {
+	    &Apache::lonxml::debug("Now looking for $src");
+	    #if no ps file try to replicate it.
+	    my $didrepcopy = &Apache::lonnet::repcopy($src);
+	    &Apache::lonxml::debug("repcopy of $src ... $didrepcopy");
+	    if ( (not -e $src) ||
+		($didrepcopy ne 'ok')) {
+		&Apache::lonxml::debug("Failed to find or replicate $src");
+
 		#if replication failed try to produce eps file dynamically
 		$src=~s/\.ps$/\.eps/;
 		my $temp_file;
-		open(FILE,">>/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat");
+		open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
 		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;
 		$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/;
+		}
 	    }
 	}
     }
     my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
+    &Apache::lonxml::debug("get_eps_image returning: $path / $file
        ");
     return ($path.'/',$file);
 }
 
 sub eps_generation {
     my ($src,$file,$width_param) = @_;	     
-    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
+    my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
     my $temp_file = Apache::File->new('>>'.$filename); 
     print $temp_file "$src\n";
     my $newsrc = $src;