loncom/xml/londefdef.pm - diff

Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.181 and 1.268

-version 1.181, 2003/10/14 14:40:33
+version 1.268, 2005/04/22 20:59:31
  Line 36
  # 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();
+ use Apache::Constants qw(:common);
- $Apache::londefdef::TD_redirection=0;
  BEGIN {
- Line 59  BEGIN {
+ Line 55  BEGIN {
  }
+ 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 =====================
  #-- <output>
  sub start_output {
- Line 73  sub end_output {
+ Line 80  sub end_output {
  }
  #-- <m> 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') {
+     my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
- 	$Apache::lonxml::prevent_entity_encode++;
+     if ($target eq 'web' || $target eq 'analyze') {
- 	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
- 	$inside ='\\documentstyle{article}'.$inside;
  	&Apache::lonxml::debug("M is starting with:$inside:");
  	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
  	if ($eval eq 'on') {
- Line 94  sub start_m {
+ Line 99  sub start_m {
  	#&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/^\$//;
+ 	    $currentstring=~s/\$$//;
+ 	    $currentstring='\ensuremath{'.$currentstring.'}';
+ 	}
  	$Apache::lonxml::post_evaluate=0;
-     } else {
- 	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
      }
      return $currentstring;
  }
- Line 110  sub start_m {
+ Line 120  sub start_m {
  sub end_m {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'tex') {
- 	$Apache::lonxml::prevent_entity_encode--;
-     } elsif ($target eq 'tex') {
  	$currentstring = "";
-     } elsif ($target eq 'meta') {
      }
      return $currentstring;
  }
- Line 125  sub start_tthoption {
+ Line 132  sub start_tthoption {
      if ($target eq 'web') {
  	my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser);
  	$inside=~s/^\s*//;
- 	if ($ENV{'browser.mathml'}) {
+ 	if ($env{'browser.mathml'}) {
  	    &tth::ttmoptions($inside);
  	} else {
  	    &tth::tthoptions($inside);
- Line 144  sub end_tthoption {
+ Line 151  sub end_tthoption {
  sub start_html {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($ENV{'browser.mathml'}) {
+     my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
- 	&tth::ttminit();
+     &Apache::lontexconvert::init_tth();
- 	if ($ENV{'browser.unicode'}) {
+     if ($target eq 'web' || $target eq 'edit') {
- 	    &tth::ttmoptions('-L -u1');
+ 	$currentstring = &Apache::lonxml::xmlbegin();
- 	} 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';}
+ 	if (($env{'form.latex_type'}=~'batchmode') ||
- 	$currentstring .= '\newcommand{\keephidden}[1]{}
+             (!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
-                            \renewcommand{\deg}{$^{\circ}$}
+ 	$currentstring .= '\newcommand{\keephidden}[1]{}'.
-                            \usepackage{longtable}
+                           '\renewcommand{\deg}{$^{\circ}$}'.
-                            \usepackage{textcomp}
+                           '\usepackage{longtable}'.
-                            \usepackage{makeidx}
+                           '\usepackage{textcomp}'.
-                            \usepackage[dvips]{graphicx}
+                           '\usepackage{makeidx}'.
-                            \usepackage{epsfig}\usepackage{calc}
+                           '\usepackage[dvips]{graphicx}'.
- \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}}
+ 			  '\usepackage{picins}'.
- \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}}';
+                           '\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 = '</html>';
      }
      return $currentstring;
  }
  Line 193  sub start_head {
      my ($target,$token) = @_;
      my $currentstring = '';
      if ($target eq 'web') {
- 	$currentstring = $token->[4];
+ 	$currentstring = $token->[4].&Apache::lonxml::fontsettings();
      }
      return $currentstring;
  }
  Line 201  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];
      }
  Line 344  sub start_title {
      }
      if ($target eq 'meta') {
  	$currentstring='<title>';
- 	&start_output();
+ 	&start_output($target);
      }
      return $currentstring;
  }
  Line 358  sub end_title {
  	$currentstring .= '}';
      }
      if ($target eq 'meta') {
- 	&end_output();
+ 	&end_output($target);
  	$currentstring='</title>';
      }
      return $currentstring;
  Line 399  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.
                                 '</'.$name.'.display>';
              }
  Line 482  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("<body> tag found inside of <problem> tag this can cause problems.");
  	    return '';
  	}
  	if (!$Apache::lonxml::registered &&
- 	    $ENV{'request.state'} eq 'published') {
+ 	    $env{'request.state'} eq 'published') {
  	    $currentstring.='<head>'.
  		&Apache::lonmenu::registerurl(undef,$target).'</head>';
  	}
  # 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) {
- Line 506  sub start_body {
+ Line 507  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'});
- Line 533  sub start_body {
+ Line 534  sub start_body {
  	$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
  	    ';'.$onUnload;
- 	$currentstring .= '<'.$token->[1];
+ 	if ($env{'request.state'} ne 'construct') {
+ 	    $currentstring .= '<'.$token->[1];
+ 	}
  	foreach (keys %{$token->[2]}) {
  	    $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
  	}
- 	$currentstring.='>';
+ 	if ($env{'request.state'} ne 'construct') {
- 	if ($ENV{'request.state'} ne 'published') {
+ 	    $currentstring.='>';
+ 	}
+ 	if ($env{'request.state'} ne 'published') {
+ 	    my $remote=($env{'environment.remote'} ne 'off');
+ 	    $currentstring=&Apache::loncommon::bodytag(undef,undef,
+ 						       $currentstring,$remote);
  	    $currentstring.=(<<EDITBUTTON);
  		<form method="post">
- 		<input type="submit" name="editmode" value="Edit" />
+ 		<input type="submit" name="editmode" accesskey="e" value="Edit" />
  		</form>
  EDITBUTTON
  	} else {
  	    $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
  	}
+ 	$currentstring.=&Apache::lonxml::message_location();
      } elsif ($target eq 'tex') {
  	$currentstring = '\begin{document}';
      }
- Line 554  EDITBUTTON
+ Line 563  EDITBUTTON
  }
  sub end_body {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
      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}';
      }
- Line 625  sub start_strong {
+ Line 634  sub start_strong {
  sub end_strong {
      my ($target,$token) = @_;
      my $currentstring = '';
      if ($target eq 'web') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring = '}';
- Line 642  sub start_h1 {
+ Line 650  sub start_h1 {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	my $pre;
- 	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
+ 	my $align=lc(&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{';
- Line 655  sub start_h1 {
+ Line 663  sub start_h1 {
  	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';
      } elsif ($target eq 'meta') {
  	$currentstring='<subject>';
- 	&start_output();
+ 	&start_output($target);
      }
      return $currentstring;
  }
- Line 666  sub end_h1 {
+ Line 674  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 ';
- Line 677  sub end_h1 {
+ Line 685  sub end_h1 {
  	}
  	$currentstring .= '}}'.$post;
      } elsif ($target eq 'meta') {
- 	&end_output();
+ 	&end_output($target);
  	$currentstring='</subject>';
      }
      return $currentstring;
- Line 692  sub start_h2 {
+ Line 700  sub start_h2 {
      } 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{';
- Line 712  sub end_h2 {
+ Line 720  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 ';
- Line 735  sub start_h3 {
+ Line 743  sub start_h3 {
      } 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{';
- Line 755  sub end_h3 {
+ Line 763  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 ';
- Line 778  sub start_h4 {
+ Line 786  sub start_h4 {
      } 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{';
- Line 798  sub end_h4 {
+ Line 806  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 ';
- Line 821  sub start_h5 {
+ Line 829  sub start_h5 {
      } 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{';
- Line 841  sub end_h5 {
+ Line 849  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 ';
- Line 864  sub start_h6 {
+ Line 872  sub start_h6 {
      } 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{';
- Line 884  sub end_h6 {
+ Line 892  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 ';
- Line 1106  sub end_q {
+ Line 1114  sub end_q {
  }
  #-- <p> 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 .= $token->[4];
      } elsif ($target eq 'tex') {
- 	my $signal=1;
+ 	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
- 	foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}}
+ 	if ($align eq 'center') {
- 	if ($signal) {$currentstring .= '\par ';}
+ 	    $currentstring='\begin{center}\par';
+ 	} elsif ($align eq 'right') {
+ 	    $currentstring='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
+ 	} elsif ($align eq 'left') {
+ 	    $currentstring='\noindent\makebox['.$env{'form.textwidth'}.']{\rlap{';
+ 	} else {
+             $currentstring='\par ';
+         }
+ 	my $signal=1;#<p> does not work inside <b>...</b>
+ 	foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}
+ 	if (!$signal) {$currentstring = '';}
+ 	}
      }
      return $currentstring;
  }
  sub end_p {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
      if ($target eq 'web') {
  	$currentstring .= $token->[2];
+     } elsif ($target eq 'tex') {
+ 	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
+ 	if (not defined $align) {
+ 	    $currentstring.='\strut\\\\\strut ';
+ 	} elsif ($align eq 'center') {
+ 	    $currentstring .= '\end{center}';
+ 	} elsif ($align eq 'right') {
+ 	    $currentstring .= '}}';
+ 	} elsif ($align eq 'left') {
+ 	    $currentstring .= '}\hfill}';
+ 	}
      }
      return $currentstring;
  }
- Line 1135  sub start_br {
+ Line 1166  sub start_br {
      if ($target eq 'web') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
+ 	my @tempo=@$tagstack;
- 	    $currentstring .= '\vskip 0.2 mm ';
+ 	my $signal=0;
+ 	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;
- Line 1232  sub start_font {
+ Line 1275  sub start_font {
      my $currentstring = '';
      if ($target eq 'web') {
  	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
- 	if ($face=~/symbol/i) {
+ 	if ($face!~/symbol/i) {
- 	    $Apache::lonxml::prevent_entity_encode++;
+ 	    if (($env{'browser.fontenhance'} eq 'on') ||
- 	} else {
+ 		($env{'browser.blackwhite'} eq 'on')) { return ''; }
- 	    if (($ENV{'browser.fontenhance'} eq 'on') ||
- 		($ENV{'browser.blackwhite'} eq 'on')) { return ''; }
  	}
  	$currentstring = $token->[4];
      }  elsif ($target eq 'tex') {
- Line 1252  sub end_font {
+ Line 1293  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);
- Line 1323  sub start_sub {
+ Line 1362  sub start_sub {
      if ($target eq 'web') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring .= "\$_{ ";
+ 	$currentstring .= '\ensuremath{_{';
      }
      return $currentstring;
  }
- Line 1334  sub end_sub {
+ Line 1373  sub end_sub {
      if ($target eq 'web') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
- 	$currentstring .= " }\$";
+ 	$currentstring .= '}}';
      }
      return $currentstring;
  }
- Line 1346  sub start_sup {
+ Line 1385  sub start_sup {
      if ($target eq 'web') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring .= "\$^{ ";
+ 	$currentstring .= '\ensuremath{^{';
      }
      return $currentstring;
  }
- Line 1357  sub end_sup {
+ Line 1396  sub end_sup {
      if ($target eq 'web') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
- 	$currentstring .= " }\$";
+ 	$currentstring .= '}}';
      }
      return $currentstring;
  }
- Line 1426  sub start_a {
+ Line 1465  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);
- Line 1458  sub start_li {
+ Line 1499  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);
+ 	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
- 	if ($type=~/circle/) {
+ 	my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0);
- 	    $currentstring .= ' \item[o] ';
+ 	#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$] ';
+ 	    $currentstring .= ' \item[$\diamond$] ';
- 	} elsif ($type ne '') {
+ 	} elsif ($type eq '1') {
- 	    $currentstring .= ' \item['.$type.'] ';
+ 	    $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;
  }
- Line 1515  sub start_ul {
+ Line 1567  sub start_ul {
  	$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$}
+ 	    $currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'.
-                                 \renewcommand{\labelitemii}{$\bullet$}
+                               '\renewcommand{\labelitemii}{$\bullet$}'.
-                                 \renewcommand{\labelitemiii}{$\bullet$}
+                               '\renewcommand{\labelitemiii}{$\bullet$}'.
-                                 \renewcommand{\labelitemiv}{$\bullet$}';
+                               '\renewcommand{\labelitemiv}{$\bullet$}';
  	} elsif ($TeXtype eq 'circle') {
- 	    $currentstring .= ' \renewcommand{\labelitemi}{$\circ$}
+ 	    $currentstring .= '\renewcommand{\labelitemi}{$\circ$}'.
-                                 \renewcommand{\labelitemii}{$\circ$}
+                               '\renewcommand{\labelitemii}{$\circ$}'.
-                                 \renewcommand{\labelitemiii}{$\circ$}
+                               '\renewcommand{\labelitemiii}{$\circ$}'.
-                                 \renewcommand{\labelitemiv}{$\circ$}';
+                               '\renewcommand{\labelitemiv}{$\circ$}';
  	} elsif ($TeXtype eq 'square') {
- 	    $currentstring .= ' \renewcommand{\labelitemi}{$\diamond$}
+ 	    $currentstring .= '\renewcommand{\labelitemi}{$\diamond$}'.
-                                 \renewcommand{\labelitemii}{$\diamond$}
+                               '\renewcommand{\labelitemii}{$\diamond$}'.
-                                 \renewcommand{\labelitemiii}{$\diamond$}
+                               '\renewcommand{\labelitemiii}{$\diamond$}'.
-                                 \renewcommand{\labelitemiv}{$\diamond$}';
+                               '\renewcommand{\labelitemiv}{$\diamond$}';
  	}
- 	$currentstring .= '\begin{itemize}';
+ 	$currentstring .= '\strut \begin{itemize}';
      }
      return $currentstring;
  }
- Line 1542  sub end_ul {
+ Line 1595  sub end_ul {
      if ($target eq 'web') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
- 	$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}
+ 	$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'.
-                                 \renewcommand{\labelitemii}{$\bullet$}
+                                '\renewcommand{\labelitemii}{$\bullet$}'.
-                                 \renewcommand{\labelitemiii}{$\bullet$}
+                                '\renewcommand{\labelitemiii}{$\bullet$}'.
-                                 \renewcommand{\labelitemiv}{$\bullet$}';
+                                '\renewcommand{\labelitemiv}{$\bullet$}\strut ';
      }
      return $currentstring;
  }
- Line 1603  sub start_ol {
+ Line 1656  sub start_ol {
      if ($target eq 'web') {
  	$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}.}
+ 	    $currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'.
-                                 \renewcommand{\labelenumii}{\arabic{enumii}.}
+                               '\renewcommand{\labelenumii}{\arabic{enumii}.}'.
-                                 \renewcommand{\labelenumiii}{\arabic{enumiii}.}
+                               '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
-                                 \renewcommand{\labelenumiv}{\arabic{enumiv}.}';
+                               '\renewcommand{\labelenumiv}{\arabic{enumiv}.}';
  	} elsif ($type eq 'A') {
- 	    $currentstring .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
+ 	    $currentstring .= '\renewcommand{\labelenumi}{\Alph{enumi}.}'.
-                                 \renewcommand{\labelenumii}{\Alph{enumii}.}
+                               '\renewcommand{\labelenumii}{\Alph{enumii}.}'.
-                                 \renewcommand{\labelenumiii}{\Alph{enumiii}.}
+                               '\renewcommand{\labelenumiii}{\Alph{enumiii}.}'.
-                                 \renewcommand{\labelenumiv}{\Alph{enumiv}.}';
+                               '\renewcommand{\labelenumiv}{\Alph{enumiv}.}';
  	} elsif ($type eq 'a') {
- 	    $currentstring .= ' \renewcommand{\labelenumi}{\alph{enumi}.}
+ 	    $currentstring .= '\renewcommand{\labelenumi}{\alph{enumi}.}'.
-                                 \renewcommand{\labelenumii}{\alph{enumii}.}
+                               '\renewcommand{\labelenumii}{\alph{enumii}.}'.
-                                 \renewcommand{\labelenumiii}{\alph{enumiii}.}
+                               '\renewcommand{\labelenumiii}{\alph{enumiii}.}'.
-                                 \renewcommand{\labelenumiv}{\alph{enumiv}.} ';
+                               '\renewcommand{\labelenumiv}{\alph{enumiv}.}';
  	} elsif ($type eq 'i') {
- 	    $currentstring .= ' \renewcommand{\labelenumi}{\roman{enumi}.}
+ 	    $currentstring .= '\renewcommand{\labelenumi}{\roman{enumi}.}'.
-                                 \renewcommand{\labelenumii}{\roman{enumii}.}
+                               '\renewcommand{\labelenumii}{\roman{enumii}.}'.
-                                 \renewcommand{\labelenumiii}{\roman{enumiii}.}
+                               '\renewcommand{\labelenumiii}{\roman{enumiii}.}'.
-                                 \renewcommand{\labelenumiv}{\roman{enumiv}.} ';
+                               '\renewcommand{\labelenumiv}{\roman{enumiv}.}';
  	} elsif ($type eq 'I') {
- 	    $currentstring .= ' \renewcommand{\labelenumi}{\Roman{enumi}.}
+ 	    $currentstring .= '\renewcommand{\labelenumi}{\Roman{enumi}.}'.
-                                 \renewcommand{\labelenumii}{\Roman{enumii}.}
+                               '\renewcommand{\labelenumii}{\Roman{enumii}.}'.
-                                 \renewcommand{\labelenumiii}{\Roman{enumiii}.}
+                               '\renewcommand{\labelenumiii}{\Roman{enumiii}.}'.
-                                 \renewcommand{\labelenumiv}{\Roman{enumiv}.} ';
+                               '\renewcommand{\labelenumiv}{\Roman{enumiv}.}';
  	}
- 	$currentstring .= '\begin{enumerate}';
+ 	$currentstring .= '\strut \begin{enumerate}';
      }
      return $currentstring;
  }
- Line 1641  sub end_ol {
+ Line 1695  sub end_ol {
      if ($target eq 'web') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
- 	$currentstring = '\end{enumerate} \renewcommand{\labelenumi}{\arabic{enumi}.}
+ 	$currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'.
-                                           \renewcommand{\labelenumii}{\arabic{enumii}.}
+                                         '\renewcommand{\labelenumii}{\arabic{enumii}.}'.
-                                           \renewcommand{\labelenumiii}{\arabic{enumiii}.}
+                                         '\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
-                                           \renewcommand{\labelenumiv}{\arabic{enumiv}.}';
+                                         '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut ';
      }
      return $currentstring;
  }
- Line 1657  sub start_dl {
+ Line 1711  sub start_dl {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring = '\begin{description}';
- 	@Apache::londefdef::description=();
+ 	$Apache::londefdef::DL++;
- 	$Apache::londefdef::DD_redirection=0;
+ 	push(@Apache::londefdef::description,[]);
- 	$Apache::londefdef::DT_redirection=0;
+ 	$Apache::londefdef::DD[$Apache::londefdef::DL]=0;
+ 	$Apache::londefdef::DT[$Apache::londefdef::DL]=0;
+ 	$Apache::londefdef::seenDT[$Apache::londefdef::DL]=0;
      }
      return $currentstring;
  }
- Line 1670  sub end_dl {
+ Line 1726  sub end_dl {
      if ($target eq 'web') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
- 	if ($Apache::londefdef::DT_redirection) {
+ 	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
- 	    my $data=&item_cleanup;
+ 	if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
- 	    push @Apache::londefdef::description,'\item['.$data.']';
+ 	foreach my $element (@{$Apache::londefdef::description[-1]}) {
- 	    $Apache::londefdef::DT_redirection=0;
- 	} elsif ($Apache::londefdef::DD_redirection) {
- 	    $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
- 	}
- 	foreach my $element (@Apache::londefdef::description) {
  	    $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;
  }
- Line 1693  sub start_dt {
+ Line 1748  sub start_dt {
      if ($target eq 'web') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
- 	if ($Apache::londefdef::DT_redirection) {
+ 	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
- 	    my $data=&item_cleanup;
+ 	if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
- 	    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;
- 	}
  	&Apache::lonxml::startredirection();
- 	$Apache::londefdef::DT_redirection=1;
+ 	$Apache::londefdef::DT[-1]++;
+ 	$Apache::londefdef::seenDT[-1]=1;
      }
      return $currentstring;
  }
- Line 1713  sub end_dt {
+ Line 1763  sub end_dt {
      if ($target eq 'web') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
- 	my $data=&item_cleanup;
+ 	if ($Apache::londefdef::DT[-1]) {
- 	push @Apache::londefdef::description,'\item['.$data.']';
+ 	    my $data=&item_cleanup();
- 	$Apache::londefdef::DT_redirection=0;
+ 	    push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm');
+ 	    $Apache::londefdef::DT[-1]--;
+ 	}
      }
      return $currentstring;
  }
- Line 1734  sub start_dd {
+ Line 1786  sub start_dd {
      if ($target eq 'web') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
- 	if ($Apache::londefdef::DT_redirection) {
+ 	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
- 	    my $data=&item_cleanup;
+ 	if ($Apache::londefdef::DD[-1]) { &end_dd(@_);}
- 	    push @Apache::londefdef::description,'\item['.$data.']';
+ 	if (!$Apache::londefdef::seenDT[-1]) {
- 	    $Apache::londefdef::DT_redirection=0;
+ 	    push(@{$Apache::londefdef::description[-1]},'\item[\strut] \strut \vskip 0mm ');
  	}
- 	$Apache::londefdef::DD_redirection=1;
+ 	push(@{$Apache::londefdef::description[-1]},'');
+ 	$Apache::londefdef::description[-1]->[-1].=' \strut ';
+ 	$Apache::londefdef::DD[-1]++;
  	&Apache::lonxml::startredirection();
      }
      return $currentstring;
- Line 1751  sub end_dd {
+ Line 1805  sub end_dd {
      if ($target eq 'web') {
  	$currentstring = $token->[2];
      }  elsif ($target eq 'tex') {
- 	$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
+ 	$Apache::londefdef::description[-1]->[-1].=
- 	$Apache::londefdef::DD_redirection=0;
+ 	    &Apache::lonxml::endredirection().' \vskip 0mm ';
+ 	$Apache::londefdef::DD[-1]--;
      }
      return $currentstring;
  }
  #-- <table> tag (end tag required)
+ #list of supported attributes: border,width,TeXwidth
  sub start_table {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-     my $textwidth='';
+     my ($textwidth,$currentstring)=('','');
-     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 = '';
      if ($target eq 'web') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
  	my $aa = {};
  	push @Apache::londefdef::table, $aa;
  	$Apache::londefdef::table[-1]{'row_number'} = -1;
-         #table's width
+         #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 {
+               #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];
+ 		}
+ 	    }
+ 	}
  	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=~/%/) {
+                 $Apache::londefdef::table[-1]{'percent'}=1;
  		$htmlwidth=~/(\d+)/;
- 		my $value=$1*$textwidth/100;
+ 		$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;;
- 		$Apache::londefdef::table[-1]{'width'}=$value;
  	    } else {
  		$Apache::londefdef::table[-1]{'width'}=$textwidth;
  	    }
  	} elsif ($TeXwidth=~/%/) {
+ 	    $Apache::londefdef::table[-1]{'percent'}=1;
  	    $TeXwidth=~/(\d+)/;
- 	    my $value=$1*$textwidth/100;
+             $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
-             $Apache::londefdef::table[-1]{'width'}=$value;
  	} else {
- 	    $Apache::londefdef::table[-1]{'width'}=$textwidth;
+ 	    $Apache::londefdef::table[-1]{'forcetablewidth'}=1;
+ 	    $Apache::londefdef::table[-1]{'width'}=$TeXwidth;
  	}
          #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 ';
- Line 1805  sub start_table {
+ Line 1871  sub start_table {
  	    $Apache::londefdef::table[-1]{'vinc'} = '&';
  	    $Apache::londefdef::table[-1]{'vvinc'} = '';
  	}
- 	$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
+ 	if ($#Apache::londefdef::table==0) {
- 	$currentstring = '\keephidden{NEW TABLE ENTRY}';
+ 	    $Apache::londefdef::table[-1]{'output'}='\strut\newline\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;
  }
- Line 1819  sub end_table {
+ Line 1895  sub end_table {
      } elsif ($target eq 'tex') {
  	my $inmemory = '';
  	my $output = '';
- 	#construct header of the table
+ 	my $WARNING='';
- 	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
+         #width of columns from TeXwidth attributes
- 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
+ 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
- 	    $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
+ 	    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 .= '}';
+         #free space and number of empty columns
- 	#define the length of the table cells
+ 	my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0);
- 	#always starts with TeXwidth (if defined everything else is ignored)
+ 	if ($#Apache::londefdef::table ne 0) {$available_space=0.9*$available_space;}
- 	my @length_row_final = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[0]);
+ 	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
- 	for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
+ 	    if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) {
- 	    my @length_row = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[$in]);
+ 		$empty_columns++;
- 	    for (my $jn=0;$jn<=$#length_row;$jn++) {
+ 	    } else {
- 		if ($length_row_final[$jn]<$length_row[$jn]) {$length_row_final[$jn]=$length_row[$jn];}
+ 		$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];
  	    }
  	}
- 	#continues trying estimate the width of raw data
+         #boundaries for contents columns
- 	my @length_raw_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]);
+ 	my @min_len=();#columns can not be narrower
- 	for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
+ 	my @max_len=();#maximum length of column
- 	    my @length_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[$in]);
+ 	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
- 	    for (my $jn=0;$jn<=$#length_row;$jn++) {
+ 		my ($localmin,$localmax)=(0,0);
- 		if ($length_raw_row[$jn]<$length_row[$jn]) {$length_raw_row[$jn]=$length_row[$jn];}
+ 		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];
-         #comparing of TeXwidth and raw data width
+ 		    }
- 	my $available_length=$Apache::londefdef::table[-1]{'width'};
+ 		    if ($localmax<$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn]) {
- 	my $needed=0;
+ 			$localmax=$Apache::londefdef::table[-1]{'maxlen'}[$in][$jn];
- 	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
+ 		    }
- 	    if ($length_row_final[$jn]!=0) {
+ 		}
- 		$available_length=$available_length-$length_row_final[$jn];
+ 		push @min_len, $localmin;
- 		$needed++;
+ 		push @max_len, $localmax;
- 	    }
+ 	}
- 	}
+ 	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
- 	$needed=$#length_row_final-$needed+1;
+ 	    my $localmin=0,;
- 	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
+ 	    for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
- 	    if ($length_row_final[$jn]==0) {
+ 		if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {
- 		if ($length_raw_row[$jn]<$available_length) {
+ 		    $localmin=$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn];
- 		    $length_row_final[$jn]=$length_raw_row[$jn];
+ 		}
- 		    $available_length=$available_length-$length_raw_row[$jn];
+ 	    }
- 		    $needed--;
+ 	    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];
+ 		    }
  		}
  	    }
  	}
- 	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
+         #use all available width if it is defined in % or as TeXwidth
- 	    if ($length_row_final[$jn]==0) {
+         if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) {
- 		$length_row_final[$jn]=0.9*$available_length/$needed;
+ 	    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;
+ 	    }
+ 	}
+         #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++) {
+ 	    for (my $jn=0;$jn<=$#fwidth;$jn++) {
- 		my $substituted=$length_row_final[$jn];
+ 		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- 		$Apache::londefdef::table[-1]{'rowdata'}[$in]=~s/TOBECHANGEDONNUMBER/$substituted mm/;
+ 		    $output.='\vspace*{-6 mm}\begin{center}';
- 	    }
+ 		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
- 	    $output .=  $Apache::londefdef::table[-1]{'rowdata'}[$in];
+ 		    $output.=' \hfill \llap{'
- 	    chop $output;
+ 		}
- 	    $output .= ' \\\\ ';
+ 		$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
+ 		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+ 		    $output.='\end{center}\vspace*{-6 mm}';
+ 		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+ 		    $output.='} ';
+ 		}
+                 if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}
+ 	    }
+ 	    $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 ';
+ 	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
  	if ($#Apache::londefdef::table > 0) {
  	    my $inmemory = $Apache::londefdef::table[-1]{'output'};
  	    pop @Apache::londefdef::table;
- Line 1898  sub start_tr {
+ Line 2117  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'});
  	$Apache::londefdef::table[-1]{'counter_columns'} = -1;
- 	$Apache::londefdef::table[-1]{'TeXlength'} = '';
+ 	push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];
-  	$Apache::londefdef::table[-1]{'length'} = '';
+ 	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;
  }
- Line 1921  sub end_tr {
+ Line 2143  sub end_tr {
  	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'};
      }
      return $currentstring;
  }
- Line 1959  sub tag_check {
+ Line 2179  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);
+     my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
-     if ($what_to_push eq '') {
+     if ($alignchar eq '') {
- 	$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
+ 	$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 '';
  }
- Line 1975  sub end_td_tex {
+ Line 2201  sub end_td_tex {
      my $data=&Apache::lonxml::endredirection();
      my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
      if (defined $TeXwidth) {
- 	my $current_length=&recalc($TeXwidth);
+ 	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
- 	$current_length=~/(\d+)/;
+ 	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
- 	$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
+ 	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
- 	$Apache::londefdef::table[-1]{'length'} .= '0,';
      } else {
- 	if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
+ 	if (($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) or ($data=~m/\[(\d+\.?\d*)\s*mm\]/)) {
- 	    my $current_length=&recalc($1);
+ 	    my $garbage_data=$data;
- 	    $current_length=~/(\d+\.?\d*)/;
+ 	    my $fwidth=0;
- 	    $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
+             while ($garbage_data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
- 	    $Apache::londefdef::table[-1]{'length'} .= '0,';
+ 		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/;
+ 		    my $lengthnewdata=2.5*&LATEX_length($elementdata);
- 		    $elementdata=~s/(.*\S)\s+$/$1/;
- 		    $elementdata=~s/(\s)+/$1/;
- 		    my $lengthnewdata=1.8*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.',';
+ 	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
- 	    $Apache::londefdef::table[-1]{'TeXlength'} .= '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'};
+     push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
      return'';
  }
- Line 2034  sub start_th {
+ Line 2301  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);
+ 	$Apache::londefdef::TD_redirection = 1;
- 	if ($what_to_push eq '') {
+ 	&tagg_check('tr','th',$tagstack,$parstack,$parser,$safeeval);
- 	    $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();
      }
      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 = '';
      if ($target eq 'web') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
- 	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
+         $Apache::londefdef::TD_redirection =0;
- 	my $data=&Apache::lonxml::endredirection();
+ 	&end_th_tex($parstack,$parser,$safeeval);
- 	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'};
      }
      return $currentstring;
  }
  #-- <img> tag (end tag forbidden)
+ #
+ #  Render the <IMG> tag.
+ #     <IMG> 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 $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
  					 undef,1);
+     if (not $src and ($target eq 'web' or $target eq 'tex')) {
+ 	my $inside = &Apache::lonxml::get_all_text("/img",$parser);
+ 	return '';
+     }
      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$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') {
+ 	if ($env{'browser.imagesuppress'} ne 'on') {
- 	    $currentstring.= $token->[4];
+ 	    $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
  	} else {
  	    my $alttag= &Apache::lonxml::get_param
  		('alt',$parstack,$safeeval,undef,1);
- Line 2105  sub start_img {
+ Line 2460  sub start_img {
  	    }
  	    $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 = "parbox";
+ 	}
+ 	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
  	#if original gif/jpg/png file exist do following:
- 	if (-e $src) {
+ 	my $origsrc=$src;
- 	    #defines the default size of image
+ 	my ($path,$file) = &get_eps_image($src);
- 	    my $image = Image::Magick->new;
+ 	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
- 	    my $current_figure = $image->Read($src);
+ 	&Apache::lonxml::debug("path = $path file = $file src = $src");
- 	    $width_param = $image->Get('width') * $scaling;;
+ 	if (-e $src) {
- 	    $height_param = $image->Get('height') * $scaling;;
+ 	    &Apache::lonxml::debug("$src exists");
- 	    undef $image;
+ 	    my ($height_param,$width_param)=
- 	    #do we have any specified size of the picture?
+ 		&image_size($origsrc,0.3,$parstack,$safeeval);
- 	    my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
+ 	    my $destpath = $path;
- 	    my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);
+ 	    $destpath    =~ s/ /\_/g; # Spaces in path cause LaTex to vomit.
- 	    my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
+ 	    my $destfile = $file;
- 						   undef,1);
+ 	    $destfile    =~ s/ /\_/g;
- 	    if ($TeXwidth ne '') {
+ 	    my $size;
- 		if ($TeXwidth=~/(\d+)\s*\%/) {
+ 	    if ($width_param)  { $size.='width='.$width_param.' mm,'; }
- 		    $width_param = $1*$ENV{'form.textwidth'}/100;
+ 	    if ($height_param) { $size.='height='.$height_param.' mm]'; }
- 		} else {
+ 	    $size='['.$size;
- 		    $width_param = $TeXwidth;
+ 	    $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 {    	                                 # parbox rendering
+ 		    $currentstring = "\\strut\\newline\n".
+ 			'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
  		}
- 	    } elsif ($TeXheight ne '') {
+ 	    } elsif ($align eq "right")  {
- 		$width_param = $TeXheight/$height_param*$width_param;
+ 		if ($latex_rendering eq "parpic") {
- 	    } elsif ($width ne '') {
+ 		    $currentstring = '\parpic[r]{'.$currentstring.'}';
- 		$width_param = $width*$scaling;
+ 		} else {	                                 # parbox rendering.
- 	    }
+ 		    $currentstring = '\parbox{'.$width_param.'mm}{\begin{flushright}'
- 	    if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}}
+ 			             .$currentstring.'\end{flushright}} \newline'."\n";
- 	    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.'} ';
- 		}
- 	    } 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.'} ';
  		}
+ 	    } 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);
- Line 2174  sub start_img {
+ Line 2556  sub start_img {
  		$alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
  	    }
- 	    if ($alt) {
+ 	    if ($alt) { $currentstring .= ' '.$alt.' '; }
- 		$currentstring .= ' '.$alt.' ';
+ 	}
- 	    } else {
- 		#<allow> tag will care about replication
+ 	# 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').'<br />';
+ 	$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
+ 	$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
+ 	$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />';
+ 	$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::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 .= '<img src="'.$src.'" alt="'.$alt.'" ';
+ 	if ($width) { $currentstring.=' width="'.$width.'" '; }
+ 	if ($height) { $currentstring.=' height="'.$height.'" '; }
+ 	$currentstring .= ' />';
+     } elsif ($target eq 'modified') {
+ 	my ($osrc,$owidth,$oheight)=
+ 	    ($token->[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');
+ 	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;
  }
- Line 2208  sub start_applet {
+ Line 2655  sub start_applet {
      my $currentstring = '';
      if ($target eq 'web') {
- 	if ($ENV{'browser.appletsuppress'} ne 'on') {
+ 	if ($env{'browser.appletsuppress'} ne 'on') {
- 	    $currentstring = $token->[4];
+ 	    $currentstring = &Apache::lonenc::encrypt_ref($token,
+ 							  {'code'=>$code,
+ 							   'archive'=>$archive}
+ 							  );
  	} else {
  	    my $alttag= &Apache::lonxml::get_param('alt',$parstack,
  						   $safeeval,undef,1);
- Line 2251  sub start_embed {
+ Line 2701  sub start_embed {
      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
      my $currentstring = '';
      if ($target eq 'web') {
- 	if ($ENV{'browser.embedsuppress'} ne 'on') {
+ 	if ($env{'browser.embedsuppress'} ne 'on') {
- 	    $currentstring = $token->[4];
+ 	    $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
  	} else {
  	    my $alttag=&Apache::lonxml::get_param
  		('alt',$parstack,$safeeval,undef,1);
- Line 2288  sub start_param {
+ Line 2738  sub start_param {
  	&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
      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;
- Line 2311  sub start_allow {
+ Line 2770  sub start_allow {
      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
  	&Apache::lonnet::clutter($src);
-     &image_replication($src);
+     if ($target eq 'tex') { &image_replication($src); }
      my $result;
      if ($target eq 'edit') {
  	$result .=&Apache::edit::tag_start($target,$token);
- Line 2338  sub start_frameset {
+ Line 2797  sub start_frameset {
      my $currentstring = '';
      if ($target eq 'web') {
  	if (!$Apache::lonxml::registered &&
- 	    $ENV{'request.state'} eq 'published') {
+ 	    $env{'request.state'} eq 'published') {
  	    $currentstring.='<head>'.
  		&Apache::lonmenu::registerurl(undef,$target).'</head>';
  	}
- Line 3296  sub end_hideweboutput {
+ Line 3755  sub end_hideweboutput {
  sub image_replication {
      my $src = shift;
-     if (not -e $src) {
+     if (not -e $src) { &Apache::lonnet::repcopy($src); }
- 	#replicates image itself
+     #replicates eps or ps
- 	&Apache::lonnet::repcopy($src);
+     my $epssrc = my $pssrc = $src;
- 	#replicates eps or ps
+     $epssrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
- 	my $newsrc = $src;
+     $pssrc  =~ s/\.(gif|jpg|jpeg|png)$/.ps/i;
- 	$newsrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
+     if (not -e $epssrc && not -e $pssrc) {
- 	if (not -e $newsrc) {
+ 	my $result=&Apache::lonnet::repcopy($epssrc);
- 	    if (&Apache::lonnet::repcopy($newsrc) ne 'OK') {
+ 	if ($result ne 'ok') { &Apache::lonnet::repcopy($pssrc); }
- 		$newsrc =~ s/\.eps$/\.ps/;
+     }
- 		&Apache::lonnet::repcopy($newsrc);
+     return '';
+ }
+ 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') * $scaling;;
+     my $height_param = $image->Get('height') * $scaling;
+     &Apache::lonxml::debug("Image magick says: $src :  Height = $height_param width = $width_param");
+     undef($image);
+     #do we have any specified LaTeX size of the picture?
+     my $toget='TeXwidth';
+     if ($cis) {
+ 	$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_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);
+     &Apache::lonxml::debug("get_eps_image: Original image: $orig_src<BR />");
+     $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
+     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+     &Apache::lonxml::debug("Filelocation gives; $src <BR />");
+     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
+ 	    if (not -e $src ||
+ 		&Apache::lonnet::repcopy($src) 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. <BR/>");
+ 		print FILE "$newsrc\n";
+ 		close FILE;
+ 		$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
+ 		$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
  	    }
  	}
      }
-     return '';
+     my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
+     &Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />");
+     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;
  }
  sub recalc {
- Line 3330  sub recalc {
+ Line 3928  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;
+ }
 ;
  __END__

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.181
changed lines
	Added in v.1.268