--- loncom/xml/londefdef.pm 2005/03/16 21:35:17 1.264 +++ loncom/xml/londefdef.pm 2005/07/10 21:43:35 1.278 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.264 2005/03/16 21:35:17 raeburn Exp $ +# $Id: londefdef.pm,v 1.278 2005/07/10 21:43:35 www 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(); @@ -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,15 +152,14 @@ 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}'. @@ -202,7 +202,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 +490,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 +508,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 +535,21 @@ 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.='>'; + 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); @@ -565,11 +563,11 @@ EDITBUTTON sub end_body { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - my $currentstring = ''; + my $currentstring = &end_p; # Close off unclosed

if ($target eq 'web') { - $currentstring = &Apache::lonxml::xmlend($target,$parser); + $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 +575,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; } @@ -646,7 +644,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 +659,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 +693,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 +708,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 +736,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 +751,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 +779,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 +794,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 +822,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 +837,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 +865,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 +880,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 +1112,64 @@ 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

+ #--

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

'; # Not sure this is correct. } elsif ($target eq 'tex') { 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 = '';} + foreach my $tag (@$tagstack) { + if (lc($tag) eq 'b') { + $signal=0; + } + } + if (!$signal) { + $currentstring = &end_p; # Just close the prior? Not sure this is correct + $closing_string = ''; # Probably correct? } - } - return $currentstring; -} -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}'; - } } return $currentstring; } +# +# End paragraph processing just requires that we output the +# closing string that was saved and blank it. +sub end_p { + my $current_string = $closing_string; + $closing_string = ''; # Not in a para anymore. + return $current_string; +} +} #--
tag (end tag forbidden) sub start_br { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -1277,8 +1287,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 +1415,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') { @@ -1445,7 +1455,7 @@ sub end_hr { #--
tag (end tag required) sub start_div { my ($target,$token) = @_; - my $currentstring = ''; + my $currentstring = &end_p; # Close enclosing para. if ($target eq 'web') { $currentstring .= $token->[4]; } @@ -1527,9 +1537,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 +1573,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 +1640,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 +1663,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 +1717,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 +1824,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 { @@ -1883,7 +1899,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; } @@ -2137,9 +2153,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 +2430,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 +2466,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 @@ -2498,19 +2514,25 @@ sub start_img { &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); + &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[width='.$width_param.' mm,height='.$height_param.'mm]{'.$destfile.'} '; + .'\includegraphics'.$size.'{'.$destfile.'} '; # If there's an alignment specification we need to honor it here. # For the horizontal alignments, we will also honor the @@ -2650,7 +2672,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} @@ -2696,7 +2718,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 @@ -2789,10 +2811,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).''; } @@ -2858,7 +2880,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') { @@ -2921,7 +2943,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.' '; @@ -3074,9 +3096,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; } @@ -3397,9 +3419,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; } @@ -3595,9 +3617,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; } @@ -3761,21 +3783,36 @@ sub image_replication { } 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) = @_; -sub image_size { - my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_; + # First apply the scaling... + + $height_param = $height_param * $scaling; + $width_param = $width_param * $scaling; - #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') * $scaling;; - my $height_param = $image->Get('height') * $scaling; - &Apache::lonxml::debug("Image magick says: $src : Height = $height_param width = $width_param"); - undef($image); #do we have any specified LaTeX size of the picture? my $toget='TeXwidth'; if ($cis) { @@ -3792,24 +3829,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); } @@ -3828,10 +3898,10 @@ sub image_height { sub get_eps_image { my ($src)=@_; my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src); - &Apache::lonxml::debug("get_eps_image: Original image: $orig_src
        "); + &Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i; $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); - &Apache::lonxml::debug("Filelocation gives; $src
        "); + &Apache::lonxml::debug("Filelocation gives: $src"); if (! -e $src) { &Apache::lonxml::debug("$src does not exist"); if (&Apache::lonnet::repcopy($src) ne 'ok' ) { @@ -3839,18 +3909,20 @@ sub get_eps_image { #if replication failed try to find ps file $src=~s/\.eps$/\.ps/; &Apache::lonxml::debug("Now looking for $src"); - #if no ps file try to replicate it - if (not -e $src && - &Apache::lonnet::repcopy($src) ne 'ok') { + #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.
        "); + &Apache::lonxml::debug("queueing $newsrc for dynamic eps production."); print FILE "$newsrc\n"; close FILE; $src=~s|/home/httpd/html/res|/home/httpd/prtspool|; @@ -3865,7 +3937,7 @@ sub get_eps_image { 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;