--- loncom/xml/londefdef.pm 2003/10/14 14:40:33 1.181 +++ loncom/xml/londefdef.pm 2006/03/23 22:34:53 1.323 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.181 2003/10/14 14:40:33 sakharuk Exp $ +# $Id: londefdef.pm,v 1.323 2006/03/23 22:34:53 foxr Exp $ # # # Copyright Michigan State University Board of Trustees @@ -36,22 +36,19 @@ # The C source of the Code may not be distributed by the Licensee # to any other parties under any circumstances. # -# -# last modified 06/26/00 by Alexander Sakharuk -# 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer -# 01/18 Alex Sakharuk package Apache::londefdef; -use Apache::lonnet(); +use Apache::lonnet; use strict; use Apache::lonxml; use Apache::File(); use Image::Magick; use Apache::lonmenu(); use Apache::lonmeta(); - -$Apache::londefdef::TD_redirection=0; +use Apache::Constants qw(:common); +use File::Basename; +# use Data::Dumper; BEGIN { @@ -59,6 +56,31 @@ BEGIN { } +# +# Dumps all elements of the table structure. +# Need this 'cause evidently when given an array, Data::Dumper only seems +# to dump element 0. +# +#sub debug_dump_table { +# my $lastrow = $#Apache::londefdef::table; +# &Apache::lonnet::logthis("Dumping table: Last row index: $lastrow"); +# my $row; +# for ($row =0; $row <= $lastrow; $row++ ) { +# my $text = Dumper($Apache::londefdef::table[$row]); +# &Apache::lonnet::logthis("table [ $row ]".$text); +# } +#} +sub initialize_londefdef { + $Apache::londefdef::TD_redirection=0; + @Apache::londefdef::table = (); + $Apache::londefdef::select=0; + undef(@Apache::londefdef::description); + @Apache::londefdef::DD=(0); + @Apache::londefdef::DT=(0); + @Apache::londefdef::seenDT=(0); + $Apache::londefdef::list_index=0; +} + #======================= TAG SUBROUTINES ===================== #-- sub start_output { @@ -73,36 +95,50 @@ sub end_output { } #-- tag sub start_m { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $currentstring = ''; - if ($target eq 'web') { - $Apache::lonxml::prevent_entity_encode++; - my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); - $inside ='\\documentstyle{article}'.$inside; + my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); + if ($target eq 'web' || $target eq 'analyze') { &Apache::lonxml::debug("M is starting with:$inside:"); my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); if ($eval eq 'on') { $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); #&Apache::lonxml::debug("M is evaulated to:$inside:"); } - $currentstring = &Apache::lontexconvert::converted(\$inside); + my $tex = $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); + my $errormsg='
'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'
occured while attempting to convert this TeX: 
';
+	    $tex = &HTML::Entities::encode($tex,'<>&"');
+	    my ($linenumber) =
+		($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
+	    if (defined($linenumber)) {
+		my @tex=split("\n",$tex);
+		$tex[$linenumber]=''.
+		    $tex[$linenumber].'';
+		$tex=join("\n",@tex);
+	    }
+	    &Apache::lonxml::warning($errormsg.$tex.'
'); $Apache::lontexconvert::errorstring=''; } #&Apache::lonxml::debug("M is ends with:$currentstring:"); $Apache::lonxml::post_evaluate=0; } elsif ($target eq 'tex') { - $currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); + $currentstring = $inside; my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); if ($eval eq 'on') { $currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]); } if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';} + # detect simple math mode entry exits, and convert them + # to use \ensuremath + if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) { + $currentstring=~s/^(\s*)\$/$1/; + $currentstring=~s/\$(\s*)$/$1/; + $currentstring='\ensuremath{'.$currentstring.'}'; + } $Apache::lonxml::post_evaluate=0; - } else { - my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); } return $currentstring; } @@ -110,22 +146,20 @@ sub start_m { sub end_m { my ($target,$token) = @_; my $currentstring = ''; - if ($target eq 'web') { - $Apache::lonxml::prevent_entity_encode--; - } elsif ($target eq 'tex') { + if ($target eq 'tex') { $currentstring = ""; - } elsif ($target eq 'meta') { } return $currentstring; } sub start_tthoption { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $result; if ($target eq 'web') { - my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser); + my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser, + $style); $inside=~s/^\s*//; - if ($ENV{'browser.mathml'}) { + if ($env{'browser.mathml'}) { &tth::ttmoptions($inside); } else { &tth::tthoptions($inside); @@ -144,46 +178,41 @@ sub end_tthoption { sub start_html { my ($target,$token) = @_; my $currentstring = ''; - if ($ENV{'browser.mathml'}) { - &tth::ttminit(); - if ($ENV{'browser.unicode'}) { - &tth::ttmoptions('-L -u1'); - } else { - &tth::ttmoptions('-L -u0'); - } - } else { - &tth::tthinit(); - if ($ENV{'browser.unicode'}) { - &tth::tthoptions('-L -u1'); - } else { - &tth::tthoptions('-L -u0'); - } - } - if ($target eq 'web') { - $currentstring = &Apache::lonxml::xmlbegin(). - &Apache::lonxml::fontsettings(); - } elsif ($target eq 'tex') { - @Apache::londefdef::table = (); - $currentstring .= '\documentclass[letterpaper]{article}'; - if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';} - $currentstring .= '\newcommand{\keephidden}[1]{} - \renewcommand{\deg}{$^{\circ}$} - \usepackage{longtable} - \usepackage{textcomp} - \usepackage{makeidx} - \usepackage[dvips]{graphicx} - \usepackage{epsfig}\usepackage{calc} -\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}} -\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}'; + my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'}; + &Apache::lontexconvert::init_tth(); + if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) { + $currentstring = &Apache::lonxml::xmlbegin(); + } elsif ($target eq 'tex') { + $currentstring .= '\documentclass[letterpaper,twoside]{article}'; + if (($env{'form.latex_type'}=~'batchmode') || + (!$env{'request.role.adv'})) {$currentstring .='\batchmode';} + $currentstring .= '\newcommand{\keephidden}[1]{}'. + '\renewcommand{\deg}{$^{\circ}$}'. + '\usepackage{multirow}'. + '\usepackage{longtable}'. + '\usepackage{textcomp}'. + '\usepackage{makeidx}'. + '\usepackage[dvips]{graphicx}'. + '\usepackage{wrapfig}'. + '\usepackage{picins}'. + '\usepackage{epsfig}'. + '\usepackage{calc}'. + '\usepackage{amsmath}'. + '\usepackage{amssymb}'. + '\usepackage{amsfonts}'. + '\usepackage{amsthm}'. + '\usepackage{amscd}'. + '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'. + '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}'; } return $currentstring; } sub end_html { - my ($target,$token) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = &Apache::lonxml::xmlend(); + $currentstring = ''; } return $currentstring; } @@ -193,7 +222,7 @@ sub start_head { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + $currentstring = $token->[4].&Apache::lonxml::fontsettings(); } return $currentstring; } @@ -201,7 +230,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]; } @@ -344,7 +373,7 @@ sub start_title { } if ($target eq 'meta') { $currentstring=''; - &start_output(); + &start_output($target); } return $currentstring; } @@ -358,7 +387,7 @@ sub end_title { $currentstring .= '}'; } if ($target eq 'meta') { - &end_output(); + &end_output($target); $currentstring=''; } return $currentstring; @@ -366,13 +395,13 @@ sub end_title { #-- tag (end tag forbidden) sub start_meta { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $currentstring = ''; if ($target eq 'web') { my $args=''; if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } if ($args eq '') { - &Apache::lonxml::get_all_text("/meta",$parser); + &Apache::lonxml::get_all_text("/meta",$parser,$style); } else { $currentstring = $token->[4]; } @@ -399,7 +428,7 @@ sub start_meta { my $display=&Apache::lonxml::get_param ('display',$parstack,$safeeval,undef,1); if ($display) { - $display=&HTML::Entities::encode($display); + $display=&HTML::Entities::encode($display,'<>&"'); $currentstring.='<'.$name.'.display>'.$display. ''; } @@ -435,7 +464,7 @@ sub end_meta { # accessrule sub start_accessrule { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $currentstring = ''; my $eff=&Apache::lonxml::get_param ('effect',$parstack,$safeeval,undef,1); @@ -454,7 +483,7 @@ sub start_accessrule { my $args=''; if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } if ($args eq '') { - &Apache::lonxml::get_all_text("/accessrule",$parser); + &Apache::lonxml::get_all_text("/accessrule",$parser,$style); } else { $currentstring = $token->[4]; } @@ -482,21 +511,22 @@ sub end_accessrule { sub start_body { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; + if ($target eq 'web') { if ($Apache::lonhomework::parsing_a_problem) { &Apache::lonxml::warning(" tag found inside of tag this can cause problems."); 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) { @@ -506,7 +536,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'}); @@ -538,15 +568,25 @@ sub start_body { $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; } $currentstring.='>'; - if ($ENV{'request.state'} ne 'published') { + &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); } + $currentstring.=&Apache::lonxml::message_location(); } elsif ($target eq 'tex') { $currentstring = '\begin{document}'; } @@ -554,30 +594,36 @@ 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; } +# \begin{center} causes a new paragprah spacing that looks odd inside +# of a table cell +sub center_correction { return '\vspace*{-6 mm}'; } #--

tag (end tag required) sub start_center { - my ($target,$token) = @_; - my $currentstring = ''; + my ($target,$token,$tagstack) = @_; + 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}'; + if (&is_inside_of($tagstack, "table")) { + $currentstring .= ¢er_correction(); + } + $currentstring .= '\begin{center}'; } return $currentstring; } sub end_center { - my ($target,$token) = @_; + my ($target,$token,$tagstack) = @_; my $currentstring = ''; if ($target eq 'web') { $currentstring = $token->[2]; @@ -588,13 +634,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; } @@ -605,18 +653,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; @@ -625,10 +676,10 @@ sub start_strong { sub end_strong { my ($target,$token) = @_; my $currentstring = ''; - if ($target eq 'web') { - + if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { + &enable_para(); $currentstring = '}'; } return $currentstring; @@ -637,13 +688,13 @@ 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') { my $pre; - my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1)); + if ($align eq 'center') { $pre='\begin{center}'; } elsif ($align eq 'left') { $pre='\rlap{'; @@ -652,10 +703,10 @@ 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=''; - &start_output(); + $currentstring.=''; + &start_output($target); } return $currentstring; } @@ -666,9 +717,9 @@ sub end_h1 { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - my $post; + my $post='\vskip 0 mm '; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $post='\end{center}'; } elsif ($align eq 'left') { $post='} \hfill'.'\vskip 0 mm '; @@ -677,7 +728,7 @@ sub end_h1 { } $currentstring .= '}}'.$post; } elsif ($target eq 'meta') { - &end_output(); + &end_output($target); $currentstring=''; } return $currentstring; @@ -686,13 +737,13 @@ 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') { my $pre; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $pre='\begin{center}'; } elsif ($align eq 'left') { $pre='\rlap{'; @@ -701,7 +752,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; } @@ -712,9 +763,9 @@ sub end_h2 { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - my $post; + my $post='\vskip 0 mm '; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $post='\end{center}'; } elsif ($align eq 'left') { $post='} \hfill'.'\vskip 0 mm '; @@ -729,13 +780,13 @@ 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') { my $pre; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $pre='\begin{center}'; } elsif ($align eq 'left') { $pre='\rlap{'; @@ -744,7 +795,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; } @@ -755,9 +806,9 @@ sub end_h3 { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - my $post; + my $post='\vskip 0 mm '; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $post='\end{center}'; } elsif ($align eq 'left') { $post='} \hfill'.'\vskip 0 mm '; @@ -772,13 +823,13 @@ 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') { my $pre; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $pre='\begin{center}'; } elsif ($align eq 'left') { $pre='\rlap{'; @@ -787,7 +838,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; } @@ -798,9 +849,9 @@ sub end_h4 { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - my $post; + my $post='\vskip 0 mm '; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $post='\end{center}'; } elsif ($align eq 'left') { $post='} \hfill'.'\vskip 0 mm '; @@ -815,13 +866,13 @@ 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') { my $pre; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $pre='\begin{center}'; } elsif ($align eq 'left') { $pre='\rlap{'; @@ -830,7 +881,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; } @@ -841,9 +892,9 @@ sub end_h5 { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - my $post; + my $post='\vskip 0 mm '; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $post='\end{center}'; } elsif ($align eq 'left') { $post='} \hfill'.'\vskip 0 mm '; @@ -858,13 +909,13 @@ 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') { my $pre; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $pre='\begin{center}'; } elsif ($align eq 'left') { $pre='\rlap{'; @@ -873,7 +924,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; } @@ -884,9 +935,9 @@ sub end_h6 { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - my $post; + my $post='\vskip 0 mm '; my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); - if (($align eq 'center') || (not defined $align)) { + if ($align eq 'center') { $post='\end{center}'; } elsif ($align eq 'left') { $post='} \hfill'.'\vskip 0 mm '; @@ -1105,29 +1156,90 @@ 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') { - my $signal=1; - foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}} - if ($signal) {$currentstring .= '\par ';} + 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'; + $closing_string = '\end{center}'; + if (&is_inside_of($tagstack, "table")) { + $currentstring = ¢er_correction().$currentstring; + } + } elsif ($align eq 'right') { + $currentstring.="\n".'{\flushright '; +# $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{'; + $closing_string= "}\n"; + } elsif ($align eq 'left') { + $currentstring.= "\n".'{\flushleft '; +# $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{{'; + $closing_string = "}\n"; + } else { + $currentstring.='\par '; + if (&is_inside_of($tagstack, 'table')) { + $closing_string = '\vskip 0pt'; # Seems to be consistent with

in tables. + } else { + $closing_string = '\strut\\\\\strut '; + } + } + } 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) = @_; - my $currentstring = ''; - if ($target eq 'web') { - $currentstring .= $token->[2]; + # 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)=@_; @@ -1135,8 +1247,23 @@ sub start_br { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') { - $currentstring .= '\vskip 0.2 mm '; + my @tempo=@$tagstack; + my $signal=0; + # Not going to factor this to is_inside_of since that would require + # multiple stack traversals. + # + for (my $i=$#tempo;$i>=0;$i--) { + if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') || + ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul') || + ($tempo[$i] eq 'td') || ($tempo[$i] eq 'th')) { + $signal=1; + last; + } + } + if ($signal) { + $currentstring .= ' \vskip 0 mm '; + } elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') { + $currentstring .= '\strut \\\\ \strut '; } } return $currentstring; @@ -1232,11 +1359,9 @@ sub start_font { my $currentstring = ''; if ($target eq 'web') { my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval); - if ($face=~/symbol/i) { - $Apache::lonxml::prevent_entity_encode++; - } else { - if (($ENV{'browser.fontenhance'} eq 'on') || - ($ENV{'browser.blackwhite'} eq 'on')) { return ''; } + if ($face!~/symbol/i) { + if (($env{'browser.fontenhance'} eq 'on') || + ($env{'browser.blackwhite'} eq 'on')) { return ''; } } $currentstring = $token->[4]; } elsif ($target eq 'tex') { @@ -1252,8 +1377,6 @@ sub end_font { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $currentstring = ''; if ($target eq 'web') { - my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval); - if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode--;} $currentstring = $token->[2]; } elsif ($target eq 'tex') { my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval); @@ -1323,7 +1446,7 @@ sub start_sub { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= "\$_{ "; + $currentstring .= '\ensuremath{_{'; } return $currentstring; } @@ -1334,7 +1457,7 @@ sub end_sub { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - $currentstring .= " }\$"; + $currentstring .= '}}'; } return $currentstring; } @@ -1346,7 +1469,7 @@ sub start_sup { if ($target eq 'web') { $currentstring .= $token->[4]; } elsif ($target eq 'tex') { - $currentstring .= "\$^{ "; + $currentstring .= '\ensuremath{^{'; } return $currentstring; } @@ -1357,7 +1480,7 @@ sub end_sup { if ($target eq 'web') { $currentstring .= $token->[2]; } elsif ($target eq 'tex') { - $currentstring .= " }\$"; + $currentstring .= '}}'; } return $currentstring; } @@ -1365,7 +1488,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') { @@ -1403,12 +1526,47 @@ 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}'; + if (&is_inside_of($tagstack, "table")) { + $currentstring = ¢er_correction().$currentstring; + } + } + 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; } @@ -1417,16 +1575,23 @@ 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 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring .= $token->[4]; + 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); @@ -1458,25 +1623,36 @@ sub start_li { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,1); - if ($type=~/circle/) { - $currentstring .= ' \item[o] '; + my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); + my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0); + #FIXME need to support types i and I + if ($type=~/disc/) { + $currentstring .= ' \item[$\bullet$] '; + } elsif ($type=~/circle/) { + $currentstring .= ' \item[$\circ$] '; } elsif ($type=~/square/) { - $currentstring .= ' \item[$\Box$] '; - } elsif ($type ne '') { - $currentstring .= ' \item['.$type.'] '; + $currentstring .= ' \item[$\diamond$] '; + } elsif ($type eq '1') { + $currentstring .= ' \item['.($Apache::londefdef::list_index+1).'.]'; + } elsif ($type eq 'A') { + $currentstring .= ' \item['.('A'..'Z')[$Apache::londefdef::list_index].'.]'; + } elsif ($type eq 'a') { + $currentstring .= ' \item['.('a'..'z')[$Apache::londefdef::list_index].'.]'; + } elsif ($value ne '') { + $currentstring .= ' \item['.$value.'] '; } else { $currentstring .= ' \item '; } - } + $Apache::londefdef::list_index++; + } return $currentstring; } 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; } @@ -1510,28 +1686,29 @@ 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; if ($TeXtype eq 'disc') { - $currentstring .= ' \renewcommand{\labelitemi}{$\bullet$} - \renewcommand{\labelitemii}{$\bullet$} - \renewcommand{\labelitemiii}{$\bullet$} - \renewcommand{\labelitemiv}{$\bullet$}'; + $currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'. + '\renewcommand{\labelitemii}{$\bullet$}'. + '\renewcommand{\labelitemiii}{$\bullet$}'. + '\renewcommand{\labelitemiv}{$\bullet$}'; } elsif ($TeXtype eq 'circle') { - $currentstring .= ' \renewcommand{\labelitemi}{$\circ$} - \renewcommand{\labelitemii}{$\circ$} - \renewcommand{\labelitemiii}{$\circ$} - \renewcommand{\labelitemiv}{$\circ$}'; + $currentstring .= '\renewcommand{\labelitemi}{$\circ$}'. + '\renewcommand{\labelitemii}{$\circ$}'. + '\renewcommand{\labelitemiii}{$\circ$}'. + '\renewcommand{\labelitemiv}{$\circ$}'; } elsif ($TeXtype eq 'square') { - $currentstring .= ' \renewcommand{\labelitemi}{$\diamond$} - \renewcommand{\labelitemii}{$\diamond$} - \renewcommand{\labelitemiii}{$\diamond$} - \renewcommand{\labelitemiv}{$\diamond$}'; + $currentstring .= '\renewcommand{\labelitemi}{$\diamond$}'. + '\renewcommand{\labelitemii}{$\diamond$}'. + '\renewcommand{\labelitemiii}{$\diamond$}'. + '\renewcommand{\labelitemiv}{$\diamond$}'; } - $currentstring .= '\begin{itemize}'; + $currentstring .= '\strut \begin{itemize}'; } return $currentstring; } @@ -1542,10 +1719,10 @@ sub end_ul { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$} - \renewcommand{\labelitemii}{$\bullet$} - \renewcommand{\labelitemiii}{$\bullet$} - \renewcommand{\labelitemiv}{$\bullet$}'; + $currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'. + '\renewcommand{\labelitemii}{$\bullet$}'. + '\renewcommand{\labelitemiii}{$\bullet$}'. + '\renewcommand{\labelitemiv}{$\bullet$}\strut '; } return $currentstring; } @@ -1576,11 +1753,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; } @@ -1599,38 +1776,39 @@ 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); if ($type eq '1') { - $currentstring .= ' \renewcommand{\labelenumi}{\arabic{enumi}.} - \renewcommand{\labelenumii}{\arabic{enumii}.} - \renewcommand{\labelenumiii}{\arabic{enumiii}.} - \renewcommand{\labelenumiv}{\arabic{enumiv}.}'; + $currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'. + '\renewcommand{\labelenumii}{\arabic{enumii}.}'. + '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'. + '\renewcommand{\labelenumiv}{\arabic{enumiv}.}'; } elsif ($type eq 'A') { - $currentstring .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} - \renewcommand{\labelenumii}{\Alph{enumii}.} - \renewcommand{\labelenumiii}{\Alph{enumiii}.} - \renewcommand{\labelenumiv}{\Alph{enumiv}.}'; + $currentstring .= '\renewcommand{\labelenumi}{\Alph{enumi}.}'. + '\renewcommand{\labelenumii}{\Alph{enumii}.}'. + '\renewcommand{\labelenumiii}{\Alph{enumiii}.}'. + '\renewcommand{\labelenumiv}{\Alph{enumiv}.}'; } elsif ($type eq 'a') { - $currentstring .= ' \renewcommand{\labelenumi}{\alph{enumi}.} - \renewcommand{\labelenumii}{\alph{enumii}.} - \renewcommand{\labelenumiii}{\alph{enumiii}.} - \renewcommand{\labelenumiv}{\alph{enumiv}.} '; + $currentstring .= '\renewcommand{\labelenumi}{\alph{enumi}.}'. + '\renewcommand{\labelenumii}{\alph{enumii}.}'. + '\renewcommand{\labelenumiii}{\alph{enumiii}.}'. + '\renewcommand{\labelenumiv}{\alph{enumiv}.}'; } elsif ($type eq 'i') { - $currentstring .= ' \renewcommand{\labelenumi}{\roman{enumi}.} - \renewcommand{\labelenumii}{\roman{enumii}.} - \renewcommand{\labelenumiii}{\roman{enumiii}.} - \renewcommand{\labelenumiv}{\roman{enumiv}.} '; + $currentstring .= '\renewcommand{\labelenumi}{\roman{enumi}.}'. + '\renewcommand{\labelenumii}{\roman{enumii}.}'. + '\renewcommand{\labelenumiii}{\roman{enumiii}.}'. + '\renewcommand{\labelenumiv}{\roman{enumiv}.}'; } elsif ($type eq 'I') { - $currentstring .= ' \renewcommand{\labelenumi}{\Roman{enumi}.} - \renewcommand{\labelenumii}{\Roman{enumii}.} - \renewcommand{\labelenumiii}{\Roman{enumiii}.} - \renewcommand{\labelenumiv}{\Roman{enumiv}.} '; + $currentstring .= '\renewcommand{\labelenumi}{\Roman{enumi}.}'. + '\renewcommand{\labelenumii}{\Roman{enumii}.}'. + '\renewcommand{\labelenumiii}{\Roman{enumiii}.}'. + '\renewcommand{\labelenumiv}{\Roman{enumiv}.}'; } - $currentstring .= '\begin{enumerate}'; + $currentstring .= '\strut \begin{enumerate}'; } return $currentstring; } @@ -1641,10 +1819,10 @@ sub end_ol { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $currentstring = '\end{enumerate} \renewcommand{\labelenumi}{\arabic{enumi}.} - \renewcommand{\labelenumii}{\arabic{enumii}.} - \renewcommand{\labelenumiii}{\arabic{enumiii}.} - \renewcommand{\labelenumiv}{\arabic{enumiv}.}'; + $currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'. + '\renewcommand{\labelenumii}{\arabic{enumii}.}'. + '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'. + '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut '; } return $currentstring; } @@ -1652,14 +1830,16 @@ 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}'; - @Apache::londefdef::description=(); - $Apache::londefdef::DD_redirection=0; - $Apache::londefdef::DT_redirection=0; + $currentstring .= '\begin{description}'; + $Apache::londefdef::DL++; + push(@Apache::londefdef::description,[]); + $Apache::londefdef::DD[$Apache::londefdef::DL]=0; + $Apache::londefdef::DT[$Apache::londefdef::DL]=0; + $Apache::londefdef::seenDT[$Apache::londefdef::DL]=0; } return $currentstring; } @@ -1670,18 +1850,17 @@ sub end_dl { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - if ($Apache::londefdef::DT_redirection) { - my $data=&item_cleanup; - push @Apache::londefdef::description,'\item['.$data.']'; - $Apache::londefdef::DT_redirection=0; - } elsif ($Apache::londefdef::DD_redirection) { - $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection(); - } - foreach my $element (@Apache::londefdef::description) { + if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } + if ($Apache::londefdef::DD[-1]) { &end_dd(@_); } + foreach my $element (@{$Apache::londefdef::description[-1]}) { $currentstring.=' '.$element.' '; } - @Apache::londefdef::description=(); + pop(@Apache::londefdef::description); $currentstring.='\end{description}'; + delete($Apache::londefdef::DD[$Apache::londefdef::DL]); + delete($Apache::londefdef::DT[$Apache::londefdef::DL]); + delete($Apache::londefdef::seenDT[$Apache::londefdef::DL]); + $Apache::londefdef::DL--; } return $currentstring; } @@ -1693,16 +1872,11 @@ sub start_dt { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - if ($Apache::londefdef::DT_redirection) { - my $data=&item_cleanup; - push @Apache::londefdef::description,'\item['.$data.']'; - $Apache::londefdef::DT_redirection=0; - } elsif ($Apache::londefdef::DD_redirection) { - $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection(); - $Apache::londefdef::DD_redirection=0; - } + if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } + if ($Apache::londefdef::DD[-1]) { &end_dd(@_); } &Apache::lonxml::startredirection(); - $Apache::londefdef::DT_redirection=1; + $Apache::londefdef::DT[-1]++; + $Apache::londefdef::seenDT[-1]=1; } return $currentstring; } @@ -1713,9 +1887,11 @@ sub end_dt { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - my $data=&item_cleanup; - push @Apache::londefdef::description,'\item['.$data.']'; - $Apache::londefdef::DT_redirection=0; + if ($Apache::londefdef::DT[-1]) { + my $data=&item_cleanup(); + push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm'); + $Apache::londefdef::DT[-1]--; + } } return $currentstring; } @@ -1734,12 +1910,14 @@ sub start_dd { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - if ($Apache::londefdef::DT_redirection) { - my $data=&item_cleanup; - push @Apache::londefdef::description,'\item['.$data.']'; - $Apache::londefdef::DT_redirection=0; - } - $Apache::londefdef::DD_redirection=1; + if ($Apache::londefdef::DT[-1]) { &end_dt(@_); } + if ($Apache::londefdef::DD[-1]) { &end_dd(@_);} + if (!$Apache::londefdef::seenDT[-1]) { + push(@{$Apache::londefdef::description[-1]},'\item[\strut] \strut \vskip 0mm '); + } + push(@{$Apache::londefdef::description[-1]},''); + $Apache::londefdef::description[-1]->[-1].=' \strut '; + $Apache::londefdef::DD[-1]++; &Apache::lonxml::startredirection(); } return $currentstring; @@ -1751,50 +1929,79 @@ sub end_dd { if ($target eq 'web') { $currentstring = $token->[2]; } elsif ($target eq 'tex') { - $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection(); - $Apache::londefdef::DD_redirection=0; + $Apache::londefdef::description[-1]->[-1].= + &Apache::lonxml::endredirection().' \vskip 0mm '; + $Apache::londefdef::DD[-1]--; } return $currentstring; } #-- 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=''; - if (not defined @Apache::londefdef::table) { - $textwidth=&recalc($ENV{'form.textwidth'}); - $textwidth=~/(\d+\.?\d*)/; - $textwidth=0.95*$1; - } else { - $textwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); - } - my $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; - #table's width - my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); - if (not defined $TeXwidth) { - my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1); - if ($htmlwidth=~/%/) { - $htmlwidth=~/(\d+)/; - my $value=$1*$textwidth/100; - $Apache::londefdef::table[-1]{'width'}=$value; + #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=~/(\d+\.?\d*)/; + $textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame + } else { + if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) { + #the maximum width of nested table is determined by LATeX width of parent cell + $textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]; } else { - $Apache::londefdef::table[-1]{'width'}=$textwidth; + #try to use all space not used before (minus 5% for LaTeX table internal) - rather silly + $textwidth=$Apache::londefdef::table[-2]{'width'}; + for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) { + $textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i]; + } } - } elsif ($TeXwidth=~/%/) { + } + + # width either comes forced from the TeXwidth or the width parameters. + # in either case it can be a percentage or absolute width. + # in the width case we ignore absolute width + my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); + if (!defined($TeXwidth)) { + my $htmlwidth = &Apache::lonxml::get_param('width',$parstack, + $safeeval,undef,1); + if ($htmlwidth =~ /%/) { + $TeXwidth = $htmlwidth; + } else { + $TeXwidth = $textwidth; + } + } else { + $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1; + } + if ($TeXwidth=~/%/) { + $Apache::londefdef::table[-1]{'percent'}=1; $TeXwidth=~/(\d+)/; - my $value=$1*$textwidth/100; - $Apache::londefdef::table[-1]{'width'}=$value; + $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100; } else { - $Apache::londefdef::table[-1]{'width'}=$textwidth; - } + $Apache::londefdef::table[-1]{'width'}=$TeXwidth; + } + # In the end, however the table width cannot be wider than $textwidth... + + if ($Apache::londefdef::table[-1]{'width'} > $textwidth) { + $Apache::londefdef::table[-1]{'width'} = $textwidth; + } + #table's border - my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1); + my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); + my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0); unless (defined $border) { $border = 0; } if ($border) { $Apache::londefdef::table[-1]{'hinc'} = '\hline '; @@ -1805,8 +2012,22 @@ sub start_table { $Apache::londefdef::table[-1]{'vinc'} = '&'; $Apache::londefdef::table[-1]{'vvinc'} = ''; } - $Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} '; - $currentstring = '\keephidden{NEW TABLE ENTRY}'; + if ($#Apache::londefdef::table==0) { + # 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'}=[]; + $Apache::londefdef::table[-1]{'objectlen'}=[]; + $Apache::londefdef::table[-1]{'objectsignal'}=[]; + $Apache::londefdef::table[-1]{'maxlen'}=[]; + $Apache::londefdef::table[-1]{'minlen'}=[]; + $Apache::londefdef::table[-1]{'content'}=[]; + $Apache::londefdef::table[-1]{'align'}=[]; + $currentstring.='\keephidden{NEW TABLE ENTRY}'; + + } return $currentstring; } @@ -1819,66 +2040,299 @@ sub end_table { } elsif ($target eq 'tex') { my $inmemory = ''; my $output = ''; - #construct header of the table - my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'}; - for (my $in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) { - $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'}; + my $WARNING=''; + #width of columns from TeXwidth attributes + + for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { + for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { + if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) { + $Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]=$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]; + } + } } - $header_of_table .= '}'; - #define the length of the table cells - #always starts with TeXwidth (if defined everything else is ignored) - my @length_row_final = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[0]); - for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { - my @length_row = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[$in]); - for (my $jn=0;$jn<=$#length_row;$jn++) { - if ($length_row_final[$jn]<$length_row[$jn]) {$length_row_final[$jn]=$length_row[$jn];} - } - } - #continues trying estimate the width of raw data - my @length_raw_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]); - for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { - my @length_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[$in]); - for (my $jn=0;$jn<=$#length_row;$jn++) { - if ($length_raw_row[$jn]<$length_row[$jn]) {$length_raw_row[$jn]=$length_row[$jn];} - } - } - #comparing of TeXwidth and raw data width - my $available_length=$Apache::londefdef::table[-1]{'width'}; - my $needed=0; - for (my $jn=0;$jn<=$#length_row_final;$jn++) { - if ($length_row_final[$jn]!=0) { - $available_length=$available_length-$length_row_final[$jn]; - $needed++; - } - } - $needed=$#length_row_final-$needed+1; - for (my $jn=0;$jn<=$#length_row_final;$jn++) { - if ($length_row_final[$jn]==0) { - if ($length_raw_row[$jn]<$available_length) { - $length_row_final[$jn]=$length_raw_row[$jn]; - $available_length=$available_length-$length_raw_row[$jn]; - $needed--; + #free space and number of empty columns + my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0); + if ($#Apache::londefdef::table ne 0) {$available_space=0.9*$available_space;} + for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { + if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) { + $empty_columns++; + } else { + $available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]; + } + } + #boundaries for contents columns + my @min_len=();#columns can not be narrower + my @max_len=();#maximum length of column + for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { + my ($localmin,$localmax)=(0,0); + for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { + if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) { + $localmin=$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]; + } + if ($localmax<$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn]) { + $localmax=$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn]; + } + } + push @min_len, $localmin; + push @max_len, $localmax; + } + for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { + my $localmin=0,; + for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { + if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) { + $localmin=$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]; + } + } + if ($max_len[$jn]<$localmin) { + $max_len[$jn]=$localmin; + $Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1; + }#object size is bigger + if ($min_len[$jn]<$localmin) { + $min_len[$jn]=$localmin; + $Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1; + }#object size is bigger + if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) { + $min_len[$jn]=0; + $max_len[$jn]=0; + } + } + #final adjustment of column width + my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array + my @adjust=(); + #step 1. adjustment by maximum value + my $space_neeeded=0; + for (my $jn=0;$jn<=$#max_len;$jn++) { + $space_neeeded=$space_neeeded+$max_len[$jn]; + } + if ($space_neeeded<=$available_space) { + for (my $jn=0;$jn<=$#max_len;$jn++) { + if ($fwidth[$jn]==0) { + $fwidth[$jn]=$max_len[$jn]; + } + } + } else { + #step 2. adjustment by minimum value (estimation) + $space_neeeded=0; + for (my $jn=0;$jn<=$#min_len;$jn++) { + $space_neeeded+=$min_len[$jn]; + } + if ($space_neeeded>$available_space) { + $WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} '; + for (my $jn=0;$jn<=$#max_len;$jn++) { + if ($fwidth[$jn]==0) { + $fwidth[$jn]=$min_len[$jn]; + } + } + #check if we have objects which can be scaled + my $how_many_to_scale=0; + my @to_scale=(); + for (my $jn=0;$jn<=$#max_len;$jn++) { + if ($Apache::londefdef::table[-1]{'objectsignal'}[$jn] eq '1') { + $how_many_to_scale++; + push @to_scale, $jn; + } + } + if ($how_many_to_scale>0) { + my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale; + foreach my $jn (@to_scale) { + for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { + $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/; + if ($1 ne '') { + my $current_length=&recalc($1); + $current_length=~/(\d+\.?\d*)/; + $current_length=$current_length-$space_to_adjust; + $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/width=$current_length mm/; + } + $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/\[(\d+\.?\d*)\s*mm\]/; + if ($1 ne '') { + my $current_length=$1; + $current_length=$current_length-$space_to_adjust; + $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/\[(\d+\.?\d*)\s*mm\]/\[$current_length mm\]/; + } + } + $fwidth[$jn]=$fwidth[$jn]-$space_to_adjust; + } + } + } else { + #step 3. adjustment over minimal + corrections + my $enlarge_coef=$available_space/$space_neeeded; + my $acsessive=0; + for (my $jn=0;$jn<=$#min_len;$jn++) { + $adjust[$jn]=$min_len[$jn]*$enlarge_coef; + if ($adjust[$jn]>$max_len[$jn]) { + $fwidth[$jn]=$max_len[$jn]; + $acsessive=$acsessive+$adjust[$jn]-$max_len[$jn]; + $adjust[$jn]=0; + } } + if ($acsessive>0) { + #we have an excess of space and can redistribute it + my $notempty_columns=0; + for (my $jn=0;$jn<=$#min_len;$jn++) { + if ($adjust[$jn]!=0) { + $notempty_columns++; + } + } + my $per_column=$acsessive/$notempty_columns; + for (my $jn=0;$jn<=$#min_len;$jn++) { + if ($adjust[$jn]!=0) { + $adjust[$jn]+=$per_column; + $fwidth[$jn]=$adjust[$jn]; + } + } + } else { + for (my $jn=0;$jn<=$#min_len;$jn++) { + $fwidth[$jn]=$adjust[$jn]; + } + } + } + } + #use all available width if it is defined in % or as TeXwidth + if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) { + my $current=0; + for (my $i=0;$i<=$#fwidth;$i++) { + $current+=$fwidth[$i]; + } + my $coef=$Apache::londefdef::table[-1]{'width'}/$current; + for (my $i=0;$i<=$#fwidth;$i++) { + $fwidth[$i]*=$coef; } } - for (my $jn=0;$jn<=$#length_row_final;$jn++) { - if ($length_row_final[$jn]==0) { - $length_row_final[$jn]=0.9*$available_length/$needed; + #removing of empty columns if allowed + my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0); + if ($permission eq 'yes') { + my @cleaned_table=(); + my @cleaned_header=(); + my $colind=0; + for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) { + if ($fwidth[$jn]!=0) { + #we need to copy column + for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { + $cleaned_table[$in][$colind]=$Apache::londefdef::table[-1]{'content'}[$in][$jn]; + $cleaned_header[$colind]=$fwidth[$jn]; + } + $colind++; + } } + $Apache::londefdef::table[-1]{'content'}=\@cleaned_table; + @fwidth=@cleaned_header; + } + #construct header of the table + my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'}; + for (my $in=0;$in<=$#fwidth;$in++) { + $header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'}; } + $header_of_table .= '}'; #fill the table for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { - for (my $jn=0;$jn<=$#length_row_final;$jn++) { - my $substituted=$length_row_final[$jn]; - $Apache::londefdef::table[-1]{'rowdata'}[$in]=~s/TOBECHANGEDONNUMBER/$substituted mm/; - } - $output .= $Apache::londefdef::table[-1]{'rowdata'}[$in]; - chop $output; - $output .= ' \\\\ '; + my $have_rowspan = 0; + for (my $jn=0;$jn<=$#fwidth;$jn++) { + + #----------------------------------------------------------- + # I think this order of doing things will ensure that + # single rowspan, columspan and combined row/colspans will + # work correctly. LaTeX is delicate here. + # RF. + + # Start a rowspan if necessary: + + my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; + my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn]; + # + # Do the appropriate magic if this has a colspan + # + + if ($colspan > 1) { + $output .= '\multicolumn{'. + $colspan + .'}{|l|}{'; + } + + if ($rowspan > 1) { + $have_rowspan++; + $output .= '\multirow{'.$rowspan.'}[0]{'.$fwidth[$jn].'mm}{'; + } + if (($rowspan eq '^') || ($rowspan eq '_')) { + $have_rowspan++; + } + #-------------------------------------------------------------- + + if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { + $output.=¢er_correction().'\begin{center}'; + } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { + $output.=' \hfill \llap{' + } + $output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn]; + if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') { + $output.='\end{center}'; + } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') { + $output.='} '; + } + # Close off any open multirow: + + if ($rowspan > 1) { + $output .= '}'; + } + # Close off the colspan... + # + if ($colspan > 1) { + $output .= '}'; + $jn += $colspan-1; # Adjust for number of rows really left. + } + if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};} + } + # If have_rowspan > 0, and borders are on, then + # we need to do more than put an \hline at the bottom of row. + # we need to do the appropriate \cline to ensure that + # the spanned rows don't have \hlines through them. + + if (($Apache::londefdef::table[-1]{'hinc'} =~ /\\hline/) && $have_rowspan) { + $output .= ' \\\\ '; + for (my $jn=0; $jn<=$#fwidth;$jn++) { + my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn]; + if ($rowspan ne "^") { + if (($rowspan <= 1) || ($rowspan eq '_')) { + my $column = $jn+1; + $output .= '\cline{'.$column.'-'.$column.'} '; + } + } + } + + } else { + $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' '; + } } - $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm '; + # 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'}; + # Figure out max/and min width by summing us and then + # apply that to the current column of the table we nest in + # if it's larger than the current width or the current width + # is undefined. + # + my $min_nested_width = 0; + my $max_nested_width = 0; + for (my $col = 0; $col <= $Apache::londefdef::table[-1]{'counter_columns'}; $col++) { + $min_nested_width += $min_len[$col]; + $max_nested_width += $max_len[$col]; + + } + # Fudge in an extra 5 mm for borders etc: + + $min_nested_width += 5; + $max_nested_width += 5; + + my $outer_column = $Apache::londefdef::table[-2]{'counter_columns'}; + my $outer_row = $Apache::londefdef::table[-2]{'row_number'}; + if ($min_nested_width > $Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column]) { + $Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column] = $min_nested_width; + } + if ($max_nested_width > $Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column]) { + $Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column] = $max_nested_width; + } + pop @Apache::londefdef::table; push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory; } else { @@ -1898,31 +2352,44 @@ sub start_tr { $currentstring = $token->[4]; } elsif ($target eq 'tex') { $Apache::londefdef::table[-1]{'row_number'}++; - my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); + my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); if ($alignchar ne '') { - push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar; + push @ {$Apache::londefdef::table[-1]{'rows'} },substr($alignchar,0,1); } else { push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l'; } push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'}); + # + # Need to save the number of table columns to preserve the max # columns. + # + $Apache::londefdef::table[-1]{'prior_columns'} = $Apache::londefdef::table[-1]{'counter_columns'}; $Apache::londefdef::table[-1]{'counter_columns'} = -1; - $Apache::londefdef::table[-1]{'TeXlength'} = ''; - $Apache::londefdef::table[-1]{'length'} = ''; + push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, []; + push @ {$Apache::londefdef::table[-1]{'objectlen'}}, []; + push @ {$Apache::londefdef::table[-1]{'minlen'}}, []; + push @ {$Apache::londefdef::table[-1]{'maxlen'}}, []; + push @ {$Apache::londefdef::table[-1]{'content'}}, []; } return $currentstring; } 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); } - push @{ $Apache::londefdef::table[-1]{'TeXlengthrow'} },$Apache::londefdef::table[-1]{'TeXlength'}; - push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'}; + # Counter columns must be the maximum number of columns seen + # in the table so far so: + if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) { + $Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'}; + } + + + } return $currentstring; } @@ -1959,60 +2426,182 @@ sub tag_check { sub start_td_tex { my ($parstack,$parser,$safeeval) = @_; - my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); - if ($what_to_push eq '') { - $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);; + my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); + if ($alignchar eq '') { + $alignchar = $Apache::londefdef::table[-1]{'rows'}[-1]; } - push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push; + push @{ $Apache::londefdef::table[-1]{'align'}[$Apache::londefdef::table[-1]{'row_number'}] }, $alignchar; $Apache::londefdef::table[-1]{'counter_columns'}++; + my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); + if (defined $TeXwidth) { + my $current_length=&recalc($TeXwidth); + $current_length=~/(\d+\.?\d*)/; + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1; + } &Apache::lonxml::startredirection(); return ''; } sub end_td_tex { my ($parstack,$parser,$safeeval) = @_; - my $current_row = $Apache::londefdef::table[-1]{'row_number'}; - my $data=&Apache::lonxml::endredirection(); + my $current_row = $Apache::londefdef::table[-1]{'row_number'}; + my $current_column = $Apache::londefdef::table[-1]{'counter_columns'}; + my $data = &Apache::lonxml::endredirection(); + + # The rowspan array of the table indicates which cells are part of a span. + # n indicates the start of a span set of n rows. + # ^ indicates a cell that continues a span set. + # _ indicates the cell is at the bottom of a span set. + # If this and subsequent cells are part of a rowspan, we must + # push along the row until we find one that is not. + + while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column]) + && ($Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] =~ /[\^\_]/)) { + # Part of a span. + push @ {$Apache::londefdef::table[-1]{'content'}[-1]}, ''; + $current_column++; + } + $Apache::londefdef::table[-1]{'counter_columns'} = $current_column; + + + # Get the column and row spans. + # Colspan can be done via \multicolumn if I can figure out the data structs. + + my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 0); + if (!$colspan) { + $colspan = 1; + } + + my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 0); + if (!$rowspan) { + $rowspan = 1; + } + + + + for (my $c = 0; $c < $colspan; $c++) { + $Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column+$c] = $rowspan; + for (my $i = 1; $i < $rowspan; $i++) { + $Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column+$c] = '^'; + if ($i == ($rowspan-1)) { + $Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column+$c] = '_'; + } + } + } + my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); if (defined $TeXwidth) { - my $current_length=&recalc($TeXwidth); - $current_length=~/(\d+)/; - $Apache::londefdef::table[-1]{'TeXlength'} .= $1.','; - $Apache::londefdef::table[-1]{'length'} .= '0,'; + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; } else { - if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { - my $current_length=&recalc($1); - $current_length=~/(\d+\.?\d*)/; - $Apache::londefdef::table[-1]{'TeXlength'} .= $1.','; - $Apache::londefdef::table[-1]{'length'} .= '0,'; + if (($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) or ($data=~m/\[(\d+\.?\d*)\s*mm\]/)) { + my $garbage_data=$data; + my $fwidth=0; + while ($garbage_data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { + my $current_length=&recalc($1); + $current_length=~/(\d+\.?\d*)/; + if ($fwidth<$1) {$fwidth=$1;} + $garbage_data=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//; + } + while ($garbage_data=~m/\[(\d+\.?\d*)\s*mm\]/) { + my $current_length=$1; + if ($fwidth<$current_length) {$fwidth=$current_length;} + $garbage_data=~s/\[(\d+\.?\d*)\s*mm\]//; + } + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + } elsif ($data=~/\\parbox\{\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*\s*\}/ or $data=~/\\epsfxsize\s*=\s*\d+\.?\d*\s*(mm|cm|in|pc|pt)*/) { + my $garbage_data=$data; + my $fwidth=0; + while ($garbage_data=~/\\parbox\{\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)\s*\}/) { + my $current_length=&recalc($1); + $current_length=~/(\d+\.?\d*)/; + if ($fwidth<$1) {$fwidth=$1;} + $garbage_data=~s/\\parbox\{\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//; + } + while ($garbage_data=~/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { + my $current_length=&recalc($1); + $current_length=~/(\d+\.?\d*)/; + if ($fwidth<$1) {$fwidth=$1;} + $garbage_data=~s/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//; + } + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + $data=~s/\\\\\s*$//; } else { $data=~s/^\s+(\S.*)/$1/; $data=~s/(.*\S)\s+$/$1/; $data=~s/(\s)+/$1/; - my $current_length=0; + my ($current_length,$min_length)=(0,0); if ($data=~/\\vskip/) { my $newdata=$data; $newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g; my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata); foreach my $elementdata (@newdata) { - $elementdata=~s/^\s+(\S.*)/$1/; - $elementdata=~s/(.*\S)\s+$/$1/; - $elementdata=~s/(\s)+/$1/; - my $lengthnewdata=1.8*length($elementdata); + my $lengthnewdata=2.5*&LATEX_length($elementdata); if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;} + my @words=split(/ /,$elementdata); + foreach my $word (@words) { + my $lengthword=2.5*&LATEX_length($word); + if ($min_length<$lengthword) {$min_length=$lengthword;} + } } } else { - $current_length=1.8*length($data); + $current_length=2.5*&LATEX_length($data); + my @words=split(/ /,$data); + foreach my $word (@words) { + my $lengthword=2*&LATEX_length($word); + if ($min_length<$lengthword) {$min_length=$lengthword;} + } } - $Apache::londefdef::table[-1]{'length'} .= $current_length.','; - $Apache::londefdef::table[-1]{'TeXlength'} .= '0,'; + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length; } } - for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) { - $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; - } - @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'}; - return''; + # Substitute all of the tables nested in this cell in their appropriate places. + + + my $nested_count = $#{$Apache::londefdef::table[-1]{'include'}}; # This one is constant... + for (my $in=0; $in<=$nested_count; $in++) { + my $nested = shift @{$Apache::londefdef::table[-1]{'include'}}; + $nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/; + # $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; + $data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/; + + } + # Should be be killing off the 'include' elements as they're used up? + + push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; + + + + + # the colspan array will indicate how many columns will be spanned by this + # cell..this requires that counter_columns also be adjusted accordingly + # so that the next bunch of text goes in the right cell. Note that since + # counter_columns is incremented in the start_td_tex, we adjust by colspan-1. + # + + $Apache::londefdef::table[-1]{'counter_columns'} += $colspan -1; + for (my $i = 0; $i < ($colspan -1); $i++) { + push @ {$Apache::londefdef::table[-1]{'content'}[-1] },''; + } + for (my $r = 0; $r < $rowspan; $r++) { + $Apache::londefdef::table[-1]{'colspan'}[$current_row+$r][$current_column] = $colspan; + # Put empty text in spanned cols. + + } + + + + return ''; } sub end_td { @@ -2034,139 +2623,266 @@ sub start_th { if ($target eq 'web') { $currentstring = $token->[4]; } elsif ($target eq 'tex') { - my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); - if ($what_to_push eq '') { - $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);; - } - push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push; - $Apache::londefdef::table[-1]{'counter_columns'}++; - &Apache::lonxml::startredirection(); + $Apache::londefdef::TD_redirection = 1; + &tagg_check('tr','th',$tagstack,$parstack,$parser,$safeeval); } return $currentstring; } - + +sub tagg_check { + my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_; + my @ar=@$parstack; + for (my $i=$#ar-1;$i>=0;$i--) { + if (lc($$tagstack[$i]) eq $good_tag) { + &start_th_tex($parstack,$parser,$safeeval); + last; + } elsif (lc($$tagstack[$i]) eq $bad_tag) { + splice @ar, $i+1; + &end_th_tex(\@ar,$parser,$safeeval); + &start_th_tex($parstack,$parser,$safeeval); + last; + } + } + return ''; +} + +sub start_th_tex { + my ($parstack,$parser,$safeeval) = @_; + my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1); + if ($alignchar eq '') { + $alignchar = $Apache::londefdef::table[-1]{'rows'}[-1]; + } + push @{ $Apache::londefdef::table[-1]{'align'}[$Apache::londefdef::table[-1]{'row_number'}] }, $alignchar; + $Apache::londefdef::table[-1]{'counter_columns'}++; + my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); + if (defined $TeXwidth) { + my $current_length=&recalc($TeXwidth); + $current_length=~/(\d+\.?\d*)/; + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1; + } + &Apache::lonxml::startredirection(); + return ''; +} + +sub end_th_tex { + my ($parstack,$parser,$safeeval) = @_; + my $current_row = $Apache::londefdef::table[-1]{'row_number'}; + my $data=&Apache::lonxml::endredirection(); + my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); + if (defined $TeXwidth) { + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + } else { + if (($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) or ($data=~m/\[(\d+\.?\d*)\s*mm\]/)) { + my $garbage_data=$data; + my $fwidth=0; + while ($garbage_data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { + my $current_length=&recalc($1); + $current_length=~/(\d+\.?\d*)/; + if ($fwidth<$1) {$fwidth=$1;} + $garbage_data=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//; + } + while ($garbage_data=~m/\[(\d+\.?\d*)\s*mm\]/) { + my $current_length=$1; + if ($fwidth<$current_length) {$fwidth=$current_length;} + $garbage_data=~s/\[(\d+\.?\d*)\s*mm\]//; + } + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + } else { + $data=~s/^\s+(\S.*)/$1/; + $data=~s/(.*\S)\s+$/$1/; + $data=~s/(\s)+/$1/; + my ($current_length,$min_length)=(0,0); + if ($data=~/\\vskip/) { + my $newdata=$data; + $newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g; + my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata); + foreach my $elementdata (@newdata) { + my $lengthnewdata=2.5*&LATEX_length($elementdata); + if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;} + my @words=split(/ /,$elementdata); + foreach my $word (@words) { + my $lengthword=2.5*&LATEX_length($word); + if ($min_length<$lengthword) {$min_length=$lengthword;} + } + } + } else { + $current_length=2.5*&LATEX_length($data); + my @words=split(/ /,$data); + foreach my $word (@words) { + my $lengthword=2*&LATEX_length($word); + if ($min_length<$lengthword) {$min_length=$lengthword;} + } + } + push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0'; + push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length; + push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length; + } + } + for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) { + $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; + } + #make data bold + $data='\textbf{'.$data.'}'; + push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; + return''; +} + 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') { - my $current_row = $Apache::londefdef::table[-1]{'row_number'}; - my $data=&Apache::lonxml::endredirection(); - my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0); - if (defined $TeXwidth) { - my $current_length=&recalc($TeXwidth); - $current_length=~/(\d+)/; - $Apache::londefdef::table[-1]{'TeXlength'} .= $1.','; - $Apache::londefdef::table[-1]{'length'} .= '0,'; - } else { - if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) { - my $current_length=&recalc($1); - $current_length=~/(\d+)/; - $Apache::londefdef::table[-1]{'TeXlength'} .= $1.','; - $Apache::londefdef::table[-1]{'length'} .= '0,'; - } else { - $data=~/^\s*(\S.*)/; - $data=$1; - $data=~/(.*\S)\s*$/; - $data=$1; - my $current_length=2*length($data); - $Apache::londefdef::table[-1]{'length'} .= $current_length.','; - $Apache::londefdef::table[-1]{'TeXlength'} .= '0,'; - } - } - for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) { - $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; - } - $data='\textbf{'.$data.'}'; - @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'}; + $Apache::londefdef::TD_redirection =0; + &end_th_tex($parstack,$parser,$safeeval); } return $currentstring; } + #-- tag (end tag forbidden) +# +# Render the tag. +# has the following attributes (in addition to the +# standard HTML ones: +# TeXwrap - Governs how the tex target will try to wrap text around +# horizontally aligned images. +# TeXwidth - The width of the image when rendered for print (mm). +# TeXheight - The height of the image when rendered for print (mm) +# (Note there seems to also be support for this as a % of page size) +# sub start_img { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval, undef,1); - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; + if (not $src and ($target eq 'web' or $target eq 'tex')) { + my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style); + return ''; + } + &Apache::lonxml::extlink($src); my $currentstring = ''; - my $width_param = ''; - my $height_param = ''; my $scaling = .3; + + # Render unto browsers that which are the browser's... + if ($target eq 'web') { - if ($ENV{'browser.imagesuppress'} ne 'on') { - $currentstring.= $token->[4]; + if ($env{'browser.imagesuppress'} ne 'on') { + my $enc = ('yes' eq + lc(&Apache::lonxml::get_param('encrypturl',$parstack, + $safeeval))); + $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, + $enc); } else { - my $alttag= &Apache::lonxml::get_param - ('alt',$parstack,$safeeval,undef,1); - unless ($alttag) { - $alttag=&Apache::lonmeta::alttag - ($Apache::lonxml::pwd[-1],$src); + my $alttag = &Apache::lonxml::get_param('alt',$parstack,$safeeval, + undef,1); + if (!$alttag) { + $alttag = &Apache::lonmeta::alttag($Apache::lonxml::pwd[-1], + $src); } $currentstring.='[IMAGE: '.$alttag.']'; } + + # and render unto TeX that which is LaTeX + } elsif ($target eq 'tex') { - $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); - &image_replication($src); + # + # The alignment will require some superstructure to be put around + # the \includegraphics stuff. At present we can only partially + # simulate the alignments offered by html. + # + # + my $align = lc(&Apache::lonxml::get_param('align', + $parstack, + $safeeval, + undef,1)); + if(!$align) { + $align = "bottom"; # This is html's default so it's ours too. + } + # + &Apache::lonxml::debug("Alignemnt = $align"); + # LaTeX's image/text wrapping is really bad since it wants to + # make figures float. + # The user has the optional parameter (applicable only to l/r + # alignment to use the picins/parpic directive to get wrapped text + # this is also imperfect.. that's why we give them a choice... + # so they can't yell at us for our choice. + # + my $latex_rendering = &Apache::lonxml::get_param('TeXwrap', + $parstack, + $safeeval, + undef,0); + # &Apache::lonxml::debug("LaTeX rendering = $latex_rendering"); + if(!$latex_rendering) { + $latex_rendering = "texwrap"; + } + # using texwrap inside a table does not work. So, if after all of this, + # texwrap is on, we turn it off if we detect we're in a table: + # + if (($latex_rendering eq 'texwrap') && &is_inside_of($tagstack, "table")) { + $latex_rendering = 'parpic'; + } + + # &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); + #if original gif/jpg/png file exist do following: - if (-e $src) { - #defines the default size of image - my $image = Image::Magick->new; - my $current_figure = $image->Read($src); - $width_param = $image->Get('width') * $scaling;; - $height_param = $image->Get('height') * $scaling;; - undef $image; - #do we have any specified size of the picture? - my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); - my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); - my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, - undef,1); - if ($TeXwidth ne '') { - if ($TeXwidth=~/(\d+)\s*\%/) { - $width_param = $1*$ENV{'form.textwidth'}/100; - } else { - $width_param = $TeXwidth; - } - } elsif ($TeXheight ne '') { - $width_param = $TeXheight/$height_param*$width_param; - } elsif ($width ne '') { - $width_param = $width*$scaling; - } - if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}} - my $file; - my $path; - if ($src =~ m!(.*)/([^/]*)$!) { - $file = $2; - $path = $1.'/'; - } - my $newsrc = $src; - $newsrc =~ s/\.(gif|jpg|png)$/.eps/i; - $file=~s/\.(gif|jpg|png)$/.eps/i; - #where can we find the picture? - if (-e $newsrc) { - #eps counterpart for image exist - if ($path) { - $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; + 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($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 + # 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}'; } - } else { - #there is no eps counterpart for image - check for ps one - $newsrc =~ s/\.eps$/\.ps/; - if (-e $newsrc) { - #ps counterpart for image exist - $file =~ s/\.eps$/\.ps/; - if ($path) { - $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; - } - } else { - #there aren't eps or ps - so create eps - my $temp_file; - my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; - $temp_file = Apache::File->new('>>'.$filename); - print $temp_file "$src\n"; - $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; + } 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.'}'; } } 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); @@ -2174,13 +2890,80 @@ sub start_img { $alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src); } - if ($alt) { - $currentstring .= ' '.$alt.' '; - } else { - # tag will care about replication + if ($alt) { $currentstring .= ' '.$alt.' '; } + } + + # And here's where the semi-quote breaks down: allow the user + # to edit the beast as well by rendering the problem for edit: + } elsif ($target eq 'edit') { + $currentstring .=&Apache::edit::tag_start($target,$token); + $currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). + &Apache::edit::browse('src',undef,'alt').' '. + &Apache::edit::search('src',undef,'alt').'
        '; + $currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'
        '; + $currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5); + $currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'
        '; + $currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5); + $currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5); + $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); + $currentstring .=&Apache::edit::select_arg('Encyrpt URL:','encrypturl', + ['no','yes'], $token, 2); + $currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval); + my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval); + my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); + my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); + + + $currentstring .= ''.$alt.'[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); + my $ctag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'src','alt','align', + 'TeXwidth','TeXheight', 'TeXwrap', + 'width','height','encrypturl'); + my ($nsrc,$nwidth,$nheight)= + ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'}); + my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc); + &image_replication($loc); + my ($iwidth,$iheight); + if (-e $loc) { + my $image = Image::Magick->new; + $image->Read($loc); + ($iwidth, $iheight) = ($image->Get('width'), + $image->Get('height')); + } + if ($osrc ne $nsrc || (!$nwidth && !$nheight)) { + # changed image or no size specified, + # if they didn't explicitly change the + # width or height use the ones from the image + if ($iwidth && $iheight) { + if ($owidth == $nwidth || (!$nwidth && !$nheight)) { + $token->[2]{'width'} = $iwidth;$ctag=1; + } + if ($oheight == $nheight || (!$nwidth && !$nheight)) { + $token->[2]{'height'}=$iheight;$ctag=1; + } } } + my ($cwidth,$cheight)=($token->[2]{'width'},$token->[2]{'height'}); + # if we don't have a width or height + if ($iwidth && $cwidth && !$cheight) { + $token->[2]{'height'}=int(($cwidth/$iwidth)*$iheight);$ctag=1; + } + if ($iheight && $cheight && !$cwidth) { + $token->[2]{'width'}=int(($cheight/$iheight)*$iwidth);$ctag=1; + } + if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);} } + return $currentstring; } @@ -2200,16 +2983,17 @@ sub start_applet { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,undef,1); - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$code; - + &Apache::lonxml::extlink($code); my $archive=&Apache::lonxml::get_param('archive',$parstack,$safeeval, undef,1); - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$archive; - + &Apache::lonxml::extlink($archive); my $currentstring = ''; if ($target eq 'web') { - if ($ENV{'browser.appletsuppress'} ne 'on') { - $currentstring = $token->[4]; + if ($env{'browser.appletsuppress'} ne 'on') { + $currentstring = &Apache::lonenc::encrypt_ref($token, + {'code'=>$code, + 'archive'=>$archive} + ); } else { my $alttag= &Apache::lonxml::get_param('alt',$parstack, $safeeval,undef,1); @@ -2248,11 +3032,11 @@ sub end_applet { sub start_embed { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; + &Apache::lonxml::extlink($src); my $currentstring = ''; if ($target eq 'web') { - if ($ENV{'browser.embedsuppress'} ne 'on') { - $currentstring = $token->[4]; + if ($env{'browser.embedsuppress'} ne 'on') { + $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); } else { my $alttag=&Apache::lonxml::get_param ('alt',$parstack,$safeeval,undef,1); @@ -2279,16 +3063,27 @@ sub end_embed { #-- tag (end tag forbidden) sub start_param { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; - if (&Apache::lonxml::get_param - ('name',$parstack,$safeeval,undef,1)=~/^cabbase$/i) { - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - &Apache::lonxml::get_param('value',$parstack,$safeeval,undef,1); - } - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); + if (&Apache::lonxml::get_param('name',$parstack, + $safeeval,undef,1)=~/^cabbase$/i) { + my $value=&Apache::lonxml::get_param('value',$parstack, + $safeeval,undef,1); + &Apache::lonxml::extlink($value); + } + + my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); + &Apache::lonxml::extlink($src); my $currentstring = ''; if ($target eq 'web') { - $currentstring = $token->[4]; + my %toconvert; + my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); + if ($src) { $toconvert{'src'}= $src; } + my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval, + undef,1); + if ($name=~/^cabbase$/i) { + $toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack, + $safeeval,undef,1); + } + $currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert); } elsif ($target eq 'tex') { } return $currentstring; @@ -2308,10 +3103,9 @@ sub end_param { sub start_allow { my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); - $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - &Apache::lonnet::clutter($src); - &image_replication($src); + &Apache::lonxml::extlink($src); + + if ($target eq 'tex') { &image_replication($src); } my $result; if ($target eq 'edit') { $result .=&Apache::edit::tag_start($target,$token); @@ -2335,10 +3129,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).''; } @@ -2404,11 +3198,12 @@ 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') {
 	$currentstring .= '\begin{verbatim}';
+	&Apache::lonxml::disable_LaTeX_substitutions();
     } 
     return $currentstring;
 }
@@ -2420,6 +3215,7 @@ sub end_pre {
 	$currentstring .= $token->[2];
     } elsif ($target eq 'tex') {
 	$currentstring .= '\end{verbatim}';
+	&Apache::lonxml::enable_LaTeX_substitutions();
     }
     return $currentstring;
 }
@@ -2467,7 +3263,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.' ';
@@ -2620,9 +3416,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;
 }
@@ -2904,9 +3700,12 @@ sub end_legend {
 
 #--  tag (end tag forbidden)
 sub start_link {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
+	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
+					    undef,1);
+	&Apache::lonxml::extlink($href);
 	$currentstring = $token->[4];     
     } 
     return $currentstring;
@@ -2943,9 +3742,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;
 }
@@ -3141,9 +3940,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;
 }
@@ -3296,22 +4095,216 @@ sub end_hideweboutput {
 
 sub image_replication {
     my $src = shift;
-    if (not -e $src) {
-	#replicates image itself
-	&Apache::lonnet::repcopy($src);
-	#replicates eps or ps 
-	my $newsrc = $src;
-	$newsrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
-	if (not -e $newsrc) {
-	    if (&Apache::lonnet::repcopy($newsrc) ne 'OK') {
-		$newsrc =~ s/\.eps$/\.ps/;
-		&Apache::lonnet::repcopy($newsrc);
+    if (not -e $src) { &Apache::lonnet::repcopy($src); }
+    #replicates eps or ps 
+    my $epssrc = my $pssrc = $src;
+    $epssrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
+    $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); }
+    }
+    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;
+
+    #do we have any specified LaTeX size of the picture?
+    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); }
+    my $TeXheight = &Apache::lonxml::get_param($toget,$parstack,
+					       $safeeval,$depth,$cis);
+    #do we have any specified web size of the picture?
+    my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
+					   $depth,1);
+    if ($TeXwidth) { 
+	my $old_width_param=$width_param;
+	if ($TeXwidth=~/(\d+)\s*\%/) {
+	    $width_param = $1*$env{'form.textwidth'}/100;
+	} else { 
+	    $width_param = $TeXwidth;
+	}
+	if ($TeXheight) {
+	    $height_param = $TeXheight;
+	} elsif ($old_width_param) {
+	    $height_param=$TeXwidth/$old_width_param*$height_param;
+	}
+    } elsif ($TeXheight) {
+	$height_param = $TeXheight;
+	if ($height_param) {
+	    $width_param  = $TeXheight/$height_param*$width_param;
+	}
+    } elsif ($width) {
+	my $old_width_param=$width_param;
+	$width_param = $width*$scaling;
+	if ($old_width_param) {
+	    $height_param=$width_param/$old_width_param*$height_param;
+	}
+    }
+    if ($width_param > $env{'form.textwidth'}) {
+        my $old_width_param=$width_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);
+}
+
+sub image_width {
+    my ($height, $width) = &image_size(@_);
+    return $width;
+}
+#  Not yet 100% sure this is correct in all circumstances..
+#  due to my uncertainty about mods to image_size.
+#
+sub image_height {
+    my ($height, $width) = &image_size(@_);
+    return $height;
+}
+
+sub get_eps_image {
+    my ($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) {
+	&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/;
+	    &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");
+		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/;
+		}
 	    }
 	}
     }
-    return '';
+    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 $temp_file = Apache::File->new('>>'.$filename); 
+    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\//;
+    }
+    if ($newsrc=~/\/userfiles\//) {
+	return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+    } else {
+	return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+    }
 }
 
+sub file_path {     
+    my $src=shift;
+    my ($file,$path); 
+    if ($src =~ m!(.*)/([^/]*)$!) {
+	$file = $2; 
+	$path = $1.'/'; 
+    } 
+    return $file,$path;
+}
+#  Converts a measurement in to mm from any of 
+#  the other valid LaTeX units of measure.
+#  If the units of measure are missing from the 
+#  parameter, it is assumed to be in and returned
+#  with mm units of measure
 sub recalc {
     my $argument = shift;
     if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';}
@@ -3330,5 +4323,53 @@ sub recalc {
     return $value.' mm';
 }
 
+sub LATEX_length {
+    my $garbage=shift;
+    $garbage=~s/^\s+$//;
+    $garbage=~s/^\s+(\S.*)/$1/;#space before 
+    $garbage=~s/(.*\S)\s+$/$1/;#space after 
+    $garbage=~s/(\s)+/$1/;#only one space
+    $garbage=~s/(\\begin{([^\}]+)}|\\end{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
+    $garbage=~s/(\$\_\{|\$\_|\$\^{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$
+    $garbage=~s/([^\\])\$/$1/g;#$
+    $garbage=~s/(\\ensuremath\{\_\{|\\ensuremath\{\_|\\ensuremath\{\^{|\\ensuremath\{\^|\})//g;#remove \ensuremath{...}
+   $garbage=~s/(\\alpha|\\beta|\\gamma|\\delta|\\epsilon|\\verepsilon|\\zeta|\\eta|\\theta|\\vartheta|\\iota|\\kappa|\\lambda|\\mu|\\nu|\\xi|\\pi|\\varpi|\\rho|\\varrho|\\sigma|\\varsigma|\\tau|\\upsilon|\\phi|\\varphi|\\chi|\\psi|\\omega|\\Gamma|\\Delta|\\Theta|\\Lambda|\\Xi|\\Pi|\\Sigma|\\Upsilon|\\Phi|\\Psi|\\Omega)/1/g;
+    $garbage=~s/(\\pm|\\mp|\\times|\\div|\\cdot|\\ast|\\star|\\dagger|\\ddagger|\\amalg|\\cap|\\cup|\\uplus|\\sqcap|\\sqcup|\\vee|\\wedge|\\oplus|\\ominus|\\otimes|\\circ|\\bullet|\\diamond|\\lhd|\\rhd|\\unlhd|\\unrhd|\\oslash|\\odot|\\bigcirc|\\Box|\\Diamond|\\bigtriangleup|\\bigtriangledown|\\triangleleft|\\triangleright|\\setminus|\\wr)/1/g;
+    $garbage=~s/(\\le|\\ll|\\leq|\\ge|\\geq|\\gg|\\neq|\\doreq|\\sim|\\simeq|\\subset|\\subseteq|\\sqsubset|\\sqsubseteq|\\in|\\vdash|\\models|\\supset|\\supseteq|\\sqsupset|\\sqsupseteq|\\ni|\\dash|\\perp|\\approx|\\cong|\\equiv|\\propto|\\prec|\\preceq|\\parallel|\\asymp|\\smile|\\frown|\\bowtie|\\succ|\\succeq|\\mid)/1/g;
+    $garbage=~s/(\\not<|\\\\not\\le|\\not\\prec|\\not\\preceq|\\not\\subset|\\not\\subseteq|\\not\\sqsubseteq|\\not\\in|\\not>|\\not\\ge|\\not\\succ|\\notsucceq|\\not\\supset|\\notsupseteq|\\not\\sqsupseteq|\\notin|\\not=|\\not\\equiv|\\not\\sim|\\not\\simeq|\\not\\approx|\\not\\cong|\\not\\asymp)/1/g;
+    $garbage=~s/(\\leftarrow|\\gets|\\Leftarrow|\\rightarrow|\\to|\\Rightarrow|\\leftrightarrow|\\Leftrightarrow|\\mapsto|\\hookleftarrow|\\leftharpoonup|\\leftkarpoondown|\\rightleftharpoons|\\longleftarrow|\\Longleftarrow|\\longrightarrow|\\Longrightarrow|\\longleftrightarrow|\\Longleftrightarrow|\\longmapsto|\\hookrightarrow|\\rightharpoonup|\\rightharpoondown|\\uparrow|\\Uparrow|\\downarrow|\\Downarrow|\\updownarrow|\\Updownarrow|\\nearrow|\\searrow|\\swarrow|\\nwarrow)/11/g;
+    $garbage=~s/(\\aleph|\\hbar|\\imath|\\jmath|\\ell|\\wp|\\Re|\\Im|\\mho|\\prime|\\emptyset|\\nabla|\\surd|\\partial|\\top|\\bot|\\vdash|\\dashv|\\forall|\\exists|\\neg|\\flat|\\natural|\\sharp|\\\||\\angle|\\backslash|\\Box|\\Diamond|\\triangle|\\clubsuit|\\diamondsuit|\\heartsuit|\\spadesuit|\\Join|\\infty)/11/g;
+    $garbage=~s/(\\hat{([^}]+)}|\\check{([^}]+)}|\\dot{([^}]+)}|\\breve{([^}]+)}|\\acute{([^}]+)}|\\ddot{([^}]+)}|\\grave{([^}]+)}|\\tilde{([^}]+)}|\\mathring{([^}]+)}|\\bar{([^}]+)}|\\vec{([^}]+)})/$1/g;
+    #remove some other LaTeX command
+    $garbage=~s|\\(\w+)\\|\\|g;	 
+    $garbage=~s|\\(\w+)(\s*)|$2|g;	 	 
+    $garbage=~s|\+|11|g;
+    my  $value=length($garbage);
+    return $value;
+}
+
+
+# is_inside_of $tagstack $tag
+#    This sub returns true if the current state of Xml processing
+#    is inside of the tag.   
+# Parameters:
+#     tagstack   - The tagstack from the parser.
+#     tag        - The tag (without the <>'s.).
+# Sample usage:
+#     if (is_inside_of($tagstack "table")) {
+#          # I'm in a table....
+#      }
+sub is_inside_of {
+    my ($tagstack, $tag) = @_;
+    my @stack = @$tagstack;
+    for (my $i = ($#stack - 1); $i >= 0; $i--) {
+	if ($stack[$i] eq $tag) {
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+
 1;
 __END__