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.197 and 1.474

-version 1.197, 2004/01/30 17:31:06
+version 1.474, 2023/11/28 04:48:14
  Line 1
  # The LearningOnline Network with CAPA
  # Tags Default Definition Module
  #
  # $Id$
  #
  #
  # Copyright Michigan State University Board of Trustees
  #
  Line 25
  # /home/httpd/html/adm/gpl.txt
  #
  # http://www.lon-capa.org/
  ## Copyright for TtHfunc and TtMfunc by Ian Hutchinson.
  # TtHfunc and TtMfunc (the "Code") may be compiled and linked into
  # binary executable programs or libraries distributed by the
  # Michigan State University (the "Licensee"), but any binaries so
  # distributed are hereby licensed only for use in the context
  # of a program or computational system for which the Licensee is the
  # primary author or distributor, and which performs substantial
  # additional tasks beyond the translation of (La)TeX into HTML.
  # 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 Apache::lontable;
  use Image::Magick;
  use Apache::lonmenu();
  use Apache::lonmeta();
+ use Apache::lonlocal;
+ use Apache::loncommon();
  use Apache::Constants qw(:common);
+ use File::Basename;
+ use LONCAPA();
+ # use Data::Dumper;
  BEGIN {
-     &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr','hideweboutput'));
+     &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','style','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr','hideweboutput'));
  }
  sub initialize_londefdef {
      $Apache::londefdef::TD_redirection=0;
      @Apache::londefdef::table = ();
      $Apache::londefdef::select=0;
-     @Apache::londefdef::description=();
+     undef(@Apache::londefdef::description);
-     $Apache::londefdef::DD_redirection=0;
+     @Apache::londefdef::DD=(0);
-     $Apache::londefdef::DT_redirection=0;
+     @Apache::londefdef::DT=(0);
+     @Apache::londefdef::seenDT=(0);
+     $Apache::londefdef::list_index=0;
+     undef($Apache::londefdef::head);
+     undef($Apache::londefdef::title);
  }
  #======================= TAG SUBROUTINES =====================
- Line 86  sub start_m {
+ Line 91  sub start_m {
      my $currentstring = '';
      my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
      if ($target eq 'web' || $target eq 'analyze') {
- 	$Apache::lonxml::prevent_entity_encode++;
- 	$inside ='\\documentstyle{article}'.$inside;
  	&Apache::lonxml::debug("M is starting with:$inside:");
+         if (!($inside =~ /^\s*\$.*\$\s*$/ || $inside =~ /^\s*\\[([].*\\[)\]]\s*$/)) {
+             # Non-math LaTeX will not be rendered correctly with MathJax
+             # and it should be avoided anyway.
+             # On top of that, MathJax will render math without $, but
+             # it will fail with tth. This is worth a warning.
+             # (even though some people might just use latex for printing)
+             &Apache::lonxml::warning(&mt('Missing $ in [_1].','&lt;m&gt;'));
+         } elsif (($env{'browser.type'} eq 'safari') && ($env{'form.editxmltext'}) &&
+                  (($env{'form.problemmode'} eq 'view') || ($env{'form.problemmode'} eq 'discard'))) {
+             my $delimiter;
+             if ($inside =~ /\$$/) {
+                 $delimiter = '$';
+             } elsif ($inside =~ /\\([)\]])$/) {
+                 $delimiter = $1;
+             }
+             if ($delimiter) {
+                 &Apache::lonxml::warning(&mt('Insert a space between [_1] and [_2].',
+                                              $delimiter,'&lt;/m&gt;'));
+             }
+         }
  	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:");
+ 	    #&Apache::lonxml::debug("M is evaluated 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: ".
+ 	    my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occurred while attempting to convert this TeX: <pre>';
- 				     $Apache::lontexconvert::errorstring);
+ 	    $tex = &HTML::Entities::encode($tex,'<>&"');
+ 	    my ($linenumber) =
+ 		($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
+ 	    if (defined($linenumber)) {
+ 		my @tex=split("\n",$tex);
+ 		$tex[$linenumber]='<b><font color="red">'.
+ 		    $tex[$linenumber].'</font></b>';
+ 		$tex=join("\n",@tex);
+ 	    }
+ 	    &Apache::lonxml::warning($errormsg.$tex.'</pre>');
  	    $Apache::lontexconvert::errorstring='';
  	}
  	#&Apache::lonxml::debug("M is ends with:$currentstring:");
  	$Apache::lonxml::post_evaluate=0;
      } elsif ($target eq 'tex') {
  	$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 ... unless there's a \verb inside.
+ 	if (! ($currentstring=~/\\verb/)) {
+ 	    if ($currentstring=~/^\s*\$[^\$].*\$\s*$/) {
+ 		$currentstring=~s/^(\s*)\$/$1/;
+ 		$currentstring=~s/\$(\s*)$/$1/;
+ 		$currentstring='\ensuremath{'.$currentstring.'}';
+ 	    }
+ 	}
  	$Apache::lonxml::post_evaluate=0;
      }
      return $currentstring;
- Line 117  sub start_m {
+ Line 161  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;
  }
  sub start_tthoption {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
      my $result;
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	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);
- Line 151  sub end_tthoption {
+ Line 193  sub end_tthoption {
  sub start_html {
      my ($target,$token) = @_;
      my $currentstring = '';
-     my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};
+     if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
-     &Apache::lontexconvert::init_tth();
+ 	# start_body() takes care of emitting the <html>
-     if ($target eq 'web' || $target eq 'edit') {
+     } elsif ($target eq 'tex') {
- 	$currentstring = &Apache::lonxml::xmlbegin().
- 	    &Apache::lonxml::fontsettings();
+ 	$currentstring .= &latex_header();
-     } 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}}';
      }
      return $currentstring;
  }
  sub end_html {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = &Apache::lonxml::xmlend();
+ 	# end_body takes care of the </html>
      }
      return $currentstring;
  }
- Line 186  sub end_html {
+ Line 215  sub end_html {
  sub start_head {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	&Apache::lonxml::startredirection();
      }
      return $currentstring;
  }
  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).
+ 	($target eq 'webgrade' && $env{'request.state'} eq 'published')) {
- 	    $token->[2];
+ 	# in case there is a </head> but no <head>
-     }
+ 	if ($Apache::lonxml::redirection) {
+ 	    $Apache::londefdef::head = &Apache::lonxml::endredirection();
+ 	}
+     }
      return $currentstring;
  }
- Line 206  sub end_head {
+ Line 238  sub end_head {
  sub start_map {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_map {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 225  sub end_map {
+ Line 257  sub end_map {
  sub start_select {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }  elsif ($target eq 'tex') {
  	$Apache::londefdef::select=0;
      }
- Line 236  sub start_select {
+ Line 268  sub start_select {
  sub end_select {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 246  sub end_select {
+ Line 278  sub end_select {
  sub start_option {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
  	$Apache::londefdef::select++;
  	if ($Apache::londefdef::select == 1) {
- Line 262  sub start_option {
+ Line 294  sub start_option {
  sub end_option {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }  elsif ($target eq 'tex') {
  	$currentstring='}';
      }
- Line 274  sub end_option {
+ Line 306  sub end_option {
  sub start_input {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_input {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 293  sub end_input {
+ Line 325  sub end_input {
  sub start_textarea {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_textarea {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 312  sub end_textarea {
+ Line 344  sub end_textarea {
  sub start_form {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_form {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
  #-- <title> tag (end tag required)
  sub start_title {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	$Apache::londefdef::title =
+ 	    &Apache::lonxml::get_all_text('/title',$parser,$style);
      } elsif ($target eq 'tex') {
- 	$currentstring .= '\keephidden{Title of the document:  '
+ 	$currentstring .= '\keephidden{Title of the document:  ';
      }
      if ($target eq 'meta') {
  	$currentstring='<title>';
- Line 346  sub start_title {
+ Line 379  sub start_title {
  sub end_title {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[2];
+ 	# start_title takes care of swallowing the title
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
      }
      if ($target eq 'meta') {
  	&end_output($target);
  	$currentstring='</title>';
      }
      return $currentstring;
  }
  #-- <meta> 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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	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];
  	}
+         if ($env{'form.grade_imsexport'}) {
+             $currentstring = '';
+         }
      } elsif ($target eq 'meta') {
  	unless (&Apache::lonxml::get_param
  		('http-equiv',$parstack,$safeeval,undef,1)) {
- Line 393  sub start_meta {
+ Line 429  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 404  sub start_meta {
+ Line 440  sub start_meta {
  	if ((not defined $content) && (not defined $name)) {
  	    &Apache::lonxml::startredirection();
  	}
+     } elsif ($target eq 'edit') {
+ 	$currentstring .= &Apache::edit::tag_start($target,$token);
+ 	$currentstring .= &Apache::edit::text_arg('Name:','name',$token,30);
+ 	$currentstring .= &Apache::edit::text_arg('Content:','content',$token,70);
+ 	$currentstring .= &Apache::edit::end_row();
+     } elsif ($target eq 'modified') {
+ 	my $constructtag =
+ 	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 					'name','content');
+ 	if ($constructtag) { $currentstring = &Apache::edit::rebuild_tag($token); }
      }
      return $currentstring;
  }
- Line 411  sub start_meta {
+ Line 457  sub start_meta {
  sub end_meta {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	my $args='';
  	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
  	if ($args ne '') {
- Line 427  sub end_meta {
+ Line 473  sub end_meta {
      return $currentstring;
  }
+ sub insert_meta {
+     return '
+     <meta />';
+ }
+ #-- <start> tag
+ sub start_style {
+ 	my ($target, $token, $tagstack, $parstack, $parser, $safeeval, $style) = @_;
+ 	my $currentstring = '';
+ 	if ($target eq 'tex') {
+ 		Apache::lonxml::startredirection();
+ 	} else {
+ 		$currentstring = $token->[4];
+ 	}
+ 	return $currentstring;
+ }
+ sub end_style {
+ 	my ($target, $token, $tagstack, $parstack, $parser, $safeeval) = @_;
+ 	my $currentstring = '';
+ 	if ($target eq 'tex') {
+ 		Apache::lonxml::endredirection();
+ 	} else {
+ 		$currentstring = $token->[2];
+ 	}
+ 	return $currentstring;
+ }
  # 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
+     my $eff  =&Apache::lonxml::get_param('effect',$parstack,$safeeval,undef,1);
- 	('effect',$parstack,$safeeval,undef,1);
+     my $realm=&Apache::lonxml::get_param('realm', $parstack,$safeeval,undef,1);
-     my $realm=&Apache::lonxml::get_param
+     my $role =&Apache::lonxml::get_param('role',  $parstack,$safeeval,undef,1);
- 	('realm',$parstack,$safeeval,undef,1);
+     my $type =&Apache::lonxml::get_param('type',  $parstack,$safeeval,undef,1);
-     my $role=&Apache::lonxml::get_param
- 	('role',$parstack,$safeeval,undef,1);
+     my ($dom,$crs,$sec,$separator);
-     $realm=~s/\s+//g;
+     if ($type eq 'user') {
-     $realm=~s/\//\_/g;
+ 	($dom,$crs,$sec)=split(m{/},$realm);
-     $realm=~s/^\_//;
+ 	$crs = &LONCAPA::clean_username($crs);
-     $realm=~s/\W/\;/g;
+ 	$separator = '/';
-     $role=~s/\s+//g;
+     } else {
-     $role=~s/\//\_/g;
+ 	($dom,$crs,$sec)=split(/\_/,$realm);
-     $role=~s/\W/\;/g;
+ 	$crs = &LONCAPA::clean_courseid($crs);
+ 	$separator = '_';
+     }
+     $dom = &LONCAPA::clean_domain($dom);
+     $sec =~s/\W//;
+     $realm = $dom;
+     if ($crs =~ /\S/) { $realm .= $separator.$crs; }
+     if ($sec =~ /\S/) { $realm .= $separator.$sec; }
+     $role=~s/\W//g;
      if ($target eq 'web') {
  	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];
  	}
      }
      if ($target eq 'meta') {
- 	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.'</rule>';
+ 	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.':'.$type.'</rule>';
      }
      return $currentstring;
  }
- Line 468  sub end_accessrule {
+ Line 555  sub end_accessrule {
  	if ($args ne '') {
  	    $currentstring = $token->[4];
  	}
      }
      return $currentstring;
  }
+ sub generate_css_links {
+     my $links;
+     my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
+     if ($css_href =~ /\S/) {
+ 	&Apache::lonxml::extlink($css_href);
+ 	$links .=
+ 	    '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
+     }
+     return $links;
+ }
  #-- <body> tag (end tag required)
  sub start_body {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	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') {
- 	    $currentstring.='<head>'.
- 		&Apache::lonmenu::registerurl(undef,$target).'</head>';
- 	}
- # Accessibility
- 	if ($ENV{'browser.imagesuppress'} eq 'on') {
- 	    delete($token->[2]->{'background'});
- 	}
- 	if ($ENV{'browser.fontenhance'} eq 'on') {
- 	    my $style='';
- 	    foreach my $key (keys(%{$token->[2]})) {
- 		if ($key =~ /^style$/i) {
- 		    $style.=$token->[2]->{$key}.';';
- 		    delete($token->[2]->{$key});
- 		}
- 	    }
- 	    $token->[2]->{'style'}=$style.'; font-size: x-large;';
- 	}
- 	if ($ENV{'browser.blackwhite'} eq 'on') {
- 	    delete($token->[2]->{'font'});
- 	    delete($token->[2]->{'link'});
- 	    delete($token->[2]->{'alink'});
- 	    delete($token->[2]->{'vlink'});
- 	    delete($token->[2]->{'bgcolor'});
- 	    delete($token->[2]->{'background'});
- 	}
- # Overload loads
- 	my $onLoad='';
- 	foreach my $key (keys(%{$token->[2]})) {
- 	    if ($key =~ /^onload$/i) {
- 		$onLoad.=$token->[2]->{$key}.';';
- 		delete($token->[2]->{$key});
- 	    }
- 	}
- 	$token->[2]->{'onload'}=&Apache::lonmenu::loadevents().';'.$onLoad;
- 	my $onUnload='';
- 	foreach my $key (keys(%{$token->[2]})) {
- 	    if ($key =~ /^onunload$/i) {
- 		$onUnload.=$token->[2]->{$key}.';';
- 		delete($token->[2]->{$key});
- 	    }
- 	}
- 	$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
- 	    ';'.$onUnload;
- 	$currentstring .= '<'.$token->[1];
+ 	if (&is_inside_of($tagstack, "head")) {
- 	foreach (keys %{$token->[2]}) {
+ 	    &end_head(@_);
- 	    $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
- 	}
- 	$currentstring.='>';
- 	if ($ENV{'request.state'} ne 'published') {
- 	    $currentstring.=(<<EDITBUTTON);
- 		<form method="post">
- 		<input type="submit" name="editmode" value="Edit" />
- 		</form>
- EDITBUTTON
- 	} else {
- 	    $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
  	}
-     } elsif ($target eq 'tex') {
- 	$currentstring = '\begin{document}';
+ 	my $extra_head = &generate_css_links();
-     }
+     # Breadcrumbs
+     &Apache::lonhtmlcommon::clear_breadcrumbs();
+     if ($env{'request.state'} eq 'construct') {
+         my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+         my $text = 'Authoring Space';
+         my $href = &Apache::loncommon::authorspace($url);
+         if ($env{'request.course.id'}) {
+             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+             if ($href eq "/priv/$cdom/$cnum/") {
+                 $text = 'Course Authoring Space';
+             }
+         }
+         &Apache::lonhtmlcommon::add_breadcrumb({
+             'text'  => $text,
+             'href'  => $href,
+         });
+         &Apache::lonhtmlcommon::add_breadcrumb({
+             'text'  => 'HTML Editor',
+             'href'  => '',
+         });
+         # breadcrumbs (and tools) will be created
+         # in start_page->bodytag->innerregister
+     } else {
+         # FIXME Where are we?
+     }
+         my $args = {'add_entries'    => $token->[2],
+                     'force_register' => 1,};
+         if ($target eq 'web') {
+             $args->{'print_suppress'} = 1;
+             if ($env{'request.use_absolute'}) {
+                 $args->{'use_absolute'} = $env{'request.use_absolute'};
+             }
+             if ($env{'form.only_body'}) {
+                 $args->{'only_body'} = 1;
+             }
+         }
+ 	$currentstring =
+ 	    &Apache::loncommon::start_page($Apache::londefdef::title,
+ 					   $Apache::londefdef::head
+ 					      .$extra_head,$args);
+         my $header = '';
+         if ($env{'request.state'} ne 'published' &&
+             $env{'request.state'} ne 'construct') {
+             $header=&Apache::lonmenu::constspaceform();
+         }
+         if ($env{'request.state'} ne 'published') {
+             unless ($env{'form.inhibitmenu'} eq 'yes') {
+                 $header.=&edit_controls();
+             }
+         }
+         if ($env{'request.state'} eq 'construct') {
+             unless ($env{'form.inhibitmenu'} eq 'yes') {
+                 $currentstring.=&Apache::loncommon::head_subbox(
+                                     &Apache::loncommon::CSTR_pageheader()
+                                    .$header);
+             }
+         } elsif ($env{'request.state'} eq 'edit') {
+             $currentstring.=&Apache::loncommon::head_subbox($header);
+         }
+         $currentstring.=&Apache::lonxml::message_location();
+     } elsif ($target eq 'tex') {
+         $currentstring = '';   #  '\begin{document}' is in header.
+     }
      return $currentstring;
  }
+ sub edit_controls {
+     my ($nochgview) = @_;
+     my $result = &Apache::lonxml::seteditor_javascript().'
+ <form method="post" action="">
+ <div class="LC_edit_problem_header">'."\n";
+     unless ($nochgview) {
+         $result .= '
+ <div class="LC_edit_problem_header_row1">'.
+ &Apache::lonxml::renderingoptions().'
+ <input type="submit" name="changeproblemmode" value="'.&mt('Change View').'" />
+ </div>';
+     }
+     $result .= '
+ <div>
+ <input type="hidden" name="editmode" value="" />
+ <input type="button" name="editordefault" accesskey="e" value="'.&mt('Edit').
+ '" onclick="seteditmode(this.form,'."'edit'".');" />'."\n";
+     if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+         my $uri = $env{'request.uri'};
+         if ($uri =~ /\.(xml|html|htm|xhtml|xhtm)$/) {
+             my %editors = &Apache::loncommon::permitted_editors();
+             if ($editors{'daxe'}) {
+                 my $daxeurl = '/daxepage'.$uri;
+                 $result .= '<input type="button" name="editordaxe" value="'.&mt('Edit with Daxe').
+                            '" onclick="seteditmode(this.form,'."'daxe'".');" />'."\n";
+             }
+         }
+     }
+     if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
+         my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+         if ($url =~ /\.html?$/i) {
+             my ($cdom,$cnum);
+             if ($env{'request.course.id'}) {
+                 $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                 $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                 if ($env{'request.filename'} =~ m{/userfiles/supplemental/default|\d+/}) {
+                     if (&Apache::lonnet::is_course_upload($env{'request.filename'},
+                                                           $cnum,$cdom)) {
+                         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                                                 ['folderpath','title']);
+                     }
+                 }
+             }
+             my ($symb,$itemtitle,$displayfile,$caller);
+             if ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}) {
+                 $itemtitle = &mt('Syllabus');
+                 $caller = "/public/$cdom/$cnum/syllabus";
+             } else {
+                 $caller = $url;
+                 ($symb,$itemtitle,$displayfile) =
+                     &Apache::lonxml::get_courseupload_hierarchy($url,
+                                                                 $env{'form.folderpath'},
+                                                                 $env{'form.title'});
+             }
+             if (($symb ne '') || ($env{'httpref.'.$url} ne '') ||
+                 ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/})) {
+                   $result .= ('&nbsp;' x 3).
+                              &Apache::lonhtmlcommon::dependencies_button()."\n".
+                              &Apache::lonhtmlcommon::dependencycheck_js($symb,
+                                  $itemtitle,$url,$env{'form.folderpath'},$caller)."\n";
+             }
+         }
+     }
+     $result .= '</div>
+ </div>
+ </form>
+ ';
+     return $result;
+ }
  sub end_body {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# Close off unclosed <p>
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[2];
+ 	$currentstring .= &Apache::loncommon::end_page({'discussion' => 1});
      } 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.  Same at the end of a \center but with a slightly
+ # larger space .. hence center_correction and center_end_correction.
+ #
+ sub center_correction { return '\vspace*{-6 mm}'; }
+ sub center_end_correction { return '\vspace*{-7 mm}'; }
  #-- <center> tag (end tag required)
  sub start_center {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# Close off any prior para.
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring = '\begin{center}';
+ 	if (&is_inside_of($tagstack, "table")) {
+ 	    $currentstring .= &center_correction();
+ 	}
+ 	$currentstring .= '\begin{center}';
      }
      return $currentstring;
  }
  sub end_center {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring = '\end{center}';
+ 	if (&is_inside_of($tagstack, "table")) {
+ 	    $currentstring .= &center_end_correction();
+ 	}
      }
      return $currentstring;
  }
  #-- <b> tag (end tag required)
+ #      NOTE: In TeX mode disables internal <p>
  sub start_b {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring = '\textbf{';
+ 	&disable_para();
-     }
+ 	$currentstring .= '\textbf{';
+     }
      return $currentstring;
  }
  sub end_b {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
- 	$currentstring = '}';
+ 	&enable_para();
-     }
+ 	$currentstring = '}';
+     }
      return $currentstring;
  }
  #-- <strong> tag (end tag required)
+ #    NOTE: in TeX mode disables internal <p>
  sub start_strong {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring = '\textbf{';
+ 	&disable_para();
-     }
+ 	$currentstring = '\textbf{';
+     }
      return $currentstring;
  }
  sub end_strong {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
- 	$currentstring = '}';
+ 	&enable_para();
+ 	$currentstring = '}';
      }
      return $currentstring;
  }
- Line 630  sub end_strong {
+ Line 828  sub end_strong {
  #-- <h1> 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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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 645  sub start_h1 {
+ Line 843  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='<subject>';
+ 	$currentstring.='<subject>';
  	&start_output($target);
      }
      return $currentstring;
- Line 656  sub start_h1 {
+ Line 854  sub start_h1 {
  sub end_h1 {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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);
+ 	my $align=lc(&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 672  sub end_h1 {
+ Line 870  sub end_h1 {
      } elsif ($target eq 'meta') {
  	&end_output($target);
  	$currentstring='</subject>';
      }
      return $currentstring;
  }
  #-- <h2> 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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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{';
- Line 694  sub start_h2 {
+ Line 892  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;
  }
  sub end_h2 {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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 715  sub end_h2 {
+ Line 913  sub end_h2 {
  	    $post='}'.'\vskip 0 mm ';
  	}
  	$currentstring .= '}}'.$post;
      }
      return $currentstring;
  }
  #-- <h3> 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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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{';
- Line 737  sub start_h3 {
+ Line 935  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;
  }
  sub end_h3 {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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 758  sub end_h3 {
+ Line 956  sub end_h3 {
  	    $post='}'.'\vskip 0 mm ';
  	}
  	$currentstring .= '}}'.$post;
      }
      return $currentstring;
  }
  #-- <h4> 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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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{';
- Line 780  sub start_h4 {
+ Line 978  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;
  }
  sub end_h4 {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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 801  sub end_h4 {
+ Line 999  sub end_h4 {
  	    $post='}'.'\vskip 0 mm ';
  	}
  	$currentstring .= '}}'.$post;
      }
      return $currentstring;
  }
  #-- <h5> 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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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{';
- Line 823  sub start_h5 {
+ Line 1021  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;
  }
  sub end_h5 {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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 844  sub end_h5 {
+ Line 1042  sub end_h5 {
  	    $post='}'.'\vskip 0 mm ';
  	}
  	$currentstring .= '}}'.$post;
      }
      return $currentstring;
  }
  #-- <h6> 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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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{';
- Line 866  sub start_h6 {
+ Line 1064  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;
  }
  sub end_h6 {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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 887  sub end_h6 {
+ Line 1085  sub end_h6 {
  	    $post='}'.'\vskip 0 mm ';
  	}
  	$currentstring .= '}}'.$post;
      }
      return $currentstring;
  }
- Line 895  sub end_h6 {
+ Line 1093  sub end_h6 {
  sub start_cite {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\textit{';
- Line 906  sub start_cite {
+ Line 1104  sub start_cite {
  sub end_cite {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
- Line 918  sub end_cite {
+ Line 1116  sub end_cite {
  sub start_i {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\textit{';
- Line 929  sub start_i {
+ Line 1127  sub start_i {
  sub end_i {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
      }
      return $currentstring;
  }
- Line 941  sub end_i {
+ Line 1139  sub end_i {
  sub start_address {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\textit{';
- Line 952  sub start_address {
+ Line 1150  sub start_address {
  sub end_address {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
- Line 964  sub end_address {
+ Line 1162  sub end_address {
  sub start_dfn {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\textit{';
      }
      return $currentstring;
  }
  sub end_dfn {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
- Line 987  sub end_dfn {
+ Line 1185  sub end_dfn {
  sub start_tt {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\texttt{';
- Line 998  sub start_tt {
+ Line 1196  sub start_tt {
  sub end_tt {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
- Line 1010  sub end_tt {
+ Line 1208  sub end_tt {
  sub start_kbd {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\texttt{';
- Line 1021  sub start_kbd {
+ Line 1219  sub start_kbd {
  sub end_kbd {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
- Line 1033  sub end_kbd {
+ Line 1231  sub end_kbd {
  sub start_code {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\texttt{';
      }
      return $currentstring;
  }
  sub end_code {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
      }
      return $currentstring;
  }
- Line 1056  sub end_code {
+ Line 1254  sub end_code {
  sub start_em {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\emph{';
- Line 1067  sub start_em {
+ Line 1265  sub start_em {
  sub end_em {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
      }
      return $currentstring;
  }
- Line 1079  sub end_em {
+ Line 1277  sub end_em {
  sub start_q {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\emph{';
- Line 1090  sub start_q {
+ Line 1288  sub start_q {
  sub end_q {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
      }
      return $currentstring;
  }
+ #  <p> is a bit strange since it does not require a closing </p>
+ #  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 <p>
+ #   Some tags are <p> fragile meaning that <p> 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--;
+ }
  #-- <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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
+ 	$currentstring .= &end_p();	# close off prior para if in progress.
  	$currentstring .= $token->[4];
-     } elsif ($target eq 'tex') {
+ 	if (! ($currentstring =~ /\//)) {
- 	my $signal=1;
+ 	    $closing_string = '</p>'; # Deal correctly with <p /> e.g.
- 	foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}}
+ 	}
- 	if ($signal) {$currentstring .= '\par ';}
+     } 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 (!defined $align) {
+           # check inline CSS
+           $align = &get_css_property('text-align',$parstack,$safeeval);
+         }
+ 	if ($align eq 'center') {
+ 	    $currentstring .='\begin{center}\par ';
+ 	    $closing_string = '\end{center}';
+ 	    if (&is_inside_of($tagstack, "table")) {
+ 		$currentstring = &center_correction().$currentstring;
+ 	    }
+ 	} elsif ($align eq 'right') {
+ 	    $currentstring.="\n".'\begin{flushright}';
+ #	    $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
+ 	    $closing_string= '\end{flushright}'."\n";
+ 	} elsif ($align eq 'left') {
+ 	    $currentstring.= "\n".'\begin{flushleft}';
+ #	    $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{{';
+ 	    $closing_string = '\end{flushleft}'."\n";
+ 	} else {
+             $currentstring.='\par ';
+ 	    if (&is_inside_of($tagstack, 'table')) {
+ 		$closing_string = '\vskip 0pt'; # Seems to be consistent with <p> 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) = @_;
+     #  Note only 'tex' mode uses disable_para and enable_para
-     my $currentstring = '';
+     #  so we don't need to know the target in the check below:
-     if ($target eq 'web') {
- 	$currentstring .= $token->[2];
+     if (!$para_disabled) {
+ 	my $current_string = $closing_string;
+ 	$closing_string = '';	# Not in a para anymore.
+ 	return $current_string;
+     } else {
+ 	return '';
      }
-     return $currentstring;
- }
+ }
+ }
  #-- <br> tag (end tag forbidden)
  sub start_br {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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;
+ 	#  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'))  {
+ 		$signal=1;
+ 	    }
+ 	    if (($tempo[$i] eq 'td') || ($tempo[$i] eq 'th')) {
+ 		$signal = 1;
+ 	    }
  	}
+ 	if ($signal != 1) {
+ 	    $currentstring .= '\strut \\\\ \strut ';
+ 	}
      }
      return $currentstring;
  }
- Line 1138  sub start_br {
+ Line 1416  sub start_br {
  sub end_br {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      }
      return $currentstring;
- Line 1148  sub end_br {
+ Line 1426  sub end_br {
  sub start_big {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '{\large ';
      }
      return $currentstring;
  }
  sub end_big {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
- Line 1171  sub end_big {
+ Line 1449  sub end_big {
  sub start_small {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '{\footnotesize ';
- Line 1182  sub start_small {
+ Line 1460  sub start_small {
  sub end_small {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '}';
- Line 1194  sub end_small {
+ Line 1472  sub end_small {
  sub start_basefont {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
  	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
  	if (defined $basesize) {
- Line 1208  sub start_basefont {
+ Line 1486  sub start_basefont {
  sub end_basefont {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
  	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
  	if (defined $basesize) {
- Line 1223  sub end_basefont {
+ Line 1501  sub end_basefont {
  sub start_font {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
- 	if ($face=~/symbol/i) {
+ 	$currentstring = $token->[4];
- 	    $Apache::lonxml::prevent_entity_encode++;
- 	} else {
- 	    if (($ENV{'browser.fontenhance'} eq 'on') ||
- 		($ENV{'browser.blackwhite'} eq 'on')) { return ''; }
- 	}
- 	$currentstring = $token->[4];
      }  elsif ($target eq 'tex') {
  	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
  	if (defined $fontsize) {
- Line 1244  sub start_font {
+ Line 1516  sub start_font {
  sub end_font {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
+ 	$currentstring = $token->[2];
- 	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);
  	if (defined $fontsize) {
- Line 1256  sub end_font {
+ Line 1526  sub end_font {
      }
      return $currentstring;
  }
  #-- <strike> tag (end tag required)
  sub start_strike {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	&Apache::lonxml::startredirection();
      }
      return $currentstring;
  }
  sub end_strike {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring=&Apache::lonxml::endredirection();
  	$currentstring=~s/(\S)(\s+)(\S)/$1\}$2\\underline\{$3/g;
  	$currentstring=~s/^\s*(\S)/\\underline\{$1/;
  	$currentstring=~s/(\S)\s*$/$1\}/;
      }
      return $currentstring;
- Line 1287  sub end_strike {
+ Line 1557  sub end_strike {
  sub start_s {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	&Apache::lonxml::startredirection();
      }
      return $currentstring;
  }
  sub end_s {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring=&Apache::lonxml::endredirection();
- Line 1313  sub end_s {
+ Line 1583  sub end_s {
  sub start_sub {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring .= "\$_{";
+ 	$currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{';
      }
      return $currentstring;
  }
  sub end_sub {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
- 	$currentstring .= "}\$";
+ 	$currentstring .= '}}';
      }
      return $currentstring;
  }
- Line 1336  sub end_sub {
+ Line 1606  sub end_sub {
  sub start_sup {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring .= "\$^{";
+ 	$currentstring .= '\raisebox{\smallskipamount}{\scriptsize{';
      }
      return $currentstring;
  }
  sub end_sup {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
- 	$currentstring .= "}\$";
+ 	$currentstring .= '}}';
      }
      return $currentstring;
  }
- Line 1358  sub end_sup {
+ Line 1628  sub end_sup {
  #-- <hr> 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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
+ 	# <hr /> can't be inside of <sup><sub> thank you LaTeX.
+ 	#
+ 	my $restart_sub = 0;
+ 	my $restart_sup = 0;
+ 	# Since <sub> and <sup> are simple tags it's ok to turn off/on
+ 	# using the start_ stop_ functions.. those tags only care about
+ 	# $target.
+ 	if (&is_inside_of($tagstack, "sub")) {
+ 	    $restart_sub = 1;
+ 	    $currentstring .= &end_sub($target, $token, $tagstack,
+ 				       $parstack, $parser, $safeeval);
+ 	}
+ 	if (&is_inside_of($tagstack, "sup")) {
+ 	    $restart_sup = 1;
+ 	    $currentstring .= &end_sup($target, $token, $tagstack,
+ 				       $parstack, $parser, $safeeval);
+ 	}
  	my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
  	if (defined $LaTeXwidth) {
  	    if ($LaTeXwidth=~/^%/) {
- Line 1382  sub start_hr {
+ Line 1673  sub start_hr {
  	}
  	$currentstring .= ' \vskip 0 mm \noindent\makebox['.$LaTeXwidth.']{'.$pre.'\makebox['.
                                      $LaTeXwidth.'][b]{\hrulefill}'.$post.'}\vskip 0 mm ';
-     }
+ 	# Turn stuff back on that we can't be inside of.
+ 	if ($restart_sub) {
+ 	    $currentstring .= &start_sub($target, $token, $tagstack,
+ 					$parstack, $parser, $safeeval);
+ 	}
+ 	if ($restart_sup) {
+ 	    $currentstring .= &start_sup($target, $token, $tagstack,
+ 					 $parstack, $parser, $safeeval);
+ 	}
+     }
      return $currentstring;
  }
  sub end_hr {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      }
      return $currentstring;
  }
  #-- <div> tag (end tag required)
+ {
+ #  Since div can be nested, the stack below is used
+ #  in 'tex' mode to store the ending strings
+ #  for the div stack.
+     my @div_end_stack;
  sub start_div {
-     my ($target,$token) = @_;
+     my ($target,$token, $tagstack, $parstack, $parser, $safeeval) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# Close enclosing para.
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      }
+     if ($target eq 'tex') {
+ 	# 4 possible alignments: left, right, center, and -missing-.
+         # If inside a table row, we must let the table logic
+ 	# do the alignment, however.
+ 	#
+ 	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 = &center_correction().$currentstring;
+ 		$endstring    .= &center_end_correction();
+ 	    }
+ 	}
+ 	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;
  }
  sub end_div {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      }
+     if ($target eq 'tex') {
+ 	my $endstring = pop @div_end_stack;
+ 	$currentstring .= $endstring;
+     }
      return $currentstring;
  }
+ }
  #-- <a> tag (end tag required)
  sub start_a {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring .= $token->[4];
+ 	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
-     } elsif ($target eq 'tex') {
+ 					    undef,1);
- 	my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
+ 	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
- 	my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
+         if ($href =~ /\S/) {
- 	if ($a=~/\S/) {
+             if ($href !~ m{^https?://}) {
- 	    $a=~s/([^\\])%/$1\\\%/g;
+                 my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
- 	    $currentstring .= '\ref{URI: '.$a.'}';
+                 my $linkurl;
- 	} elsif ($b=~/\S/) {
+                 if ($href =~ m{^/uploaded/}) {
- 	    $currentstring .= '\ref{Anchor: '.$b.'}';
+                     $linkurl = $href;
- 	} else {
+                 } elsif ($href =~ m{^[^/]}) {
- 	    $currentstring.='';
+                     my $path = $url;
- 	}
+                     $path  =~ s{[^/]*$}{};
+                     $linkurl = $path.$href;
+                 }
+                 if ($linkurl =~ m{^/uploaded/}) {
+                     if (!&Apache::lonnet::allowed('bre',$linkurl)) {
+                         if (&Apache::lonnet::is_on_map($url)) {
+                             &Apache::lonxml::extlink($linkurl);
+                         } elsif ($env{'request.course.id'}) {
+                             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                             if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/(docs|supplemental)/)}) {
+                                 my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum);
+                                 if ($cleanhref) {
+                                     &Apache::lonxml::extlink($cleanhref);
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+         }
      }
      return $currentstring;
  }
- Line 1438  sub start_a {
+ Line 1803  sub start_a {
  sub end_a {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      }
+     if ($target eq 'tex') {
+ 	my $href =
+ 	    &Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
+ 	my $name =
+ 	    &Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
+         my $uriprint =
+             &Apache::lonxml::get_param('uriprint',$parstack,$safeeval,undef,1);
+         my $anchorprint =
+             &Apache::lonxml::get_param('anchorprint',$parstack,$safeeval,undef,1);
+ 	if (($href =~ /\S/) && ($uriprint=~/^on|uriprint|yes|1$/i)) {
+ 	    $href =~ s/([^\\])%/$1\\\%/g;
+ 	    # Substitute special symbols... and allow line breaks at each /
+ 	    #
+ 	    $href = &Apache::lonxml::latex_special_symbols($href);
+ 	    $href =~ s/\//\/\\-/g;              # Map / to /\- to allow hyphenation.
+ 	    $currentstring .= ' ({\tt URI:'.$href.'})';
+ 	} elsif (($name =~ /\S/) && ($anchorprint=~/^on|anchorprint|yes|1$/i)) {
+ 	    $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
+ 	} else {
+ 	    $currentstring.='';
+ 	}
+     }
      return $currentstring;
  }
- Line 1448  sub end_a {
+ Line 1835  sub end_a {
  sub start_li {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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;
  }
  sub end_li {
      my ($target,$token) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# In case there's a <p> in the <li>
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[2];
+ 	$currentstring .= $token->[2];
      }
      return $currentstring;
  }
- Line 1478  sub end_li {
+ Line 1876  sub end_li {
  sub start_u {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	&Apache::lonxml::startredirection();
      }
      return $currentstring;
  }
  sub end_u {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring=&Apache::lonxml::endredirection();
- Line 1503  sub end_u {
+ Line 1901  sub end_u {
  #-- <ul> 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') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$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$}
+ 	    $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;
  }
  sub end_ul {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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 1547  sub end_ul {
+ Line 1946  sub end_ul {
  sub start_menu {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring = " \\begin{itemize} ";
      }
      return $currentstring;
  }
  sub end_menu {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring = " \\end{itemize}";
      }
      return $currentstring;
  }
  #-- <dir> tag (end tag required)
  sub start_dir {
      my ($target,$token) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# In case there's a <p> prior to the list.
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring = " \\begin{itemize} ";
+ 	$currentstring .= " \\begin{itemize} ";
      }
      return $currentstring;
  }
  sub end_dir {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring = " \\end{itemize}";
      }
      return $currentstring;
  }
  #-- <ol> 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 <p> prior to the list.
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$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}.}
+ 	    $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;
  }
  sub end_ol {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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;
  }
  #-- <dl> tag (end tag required)
  sub start_dl {
      my ($target,$token) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# In case there's a <p> unclosed prior to the list.
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring = '\begin{description}';
+ 	$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;
  }
  sub end_dl {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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 1683  sub end_dl {
+ Line 2084  sub end_dl {
  sub start_dt {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring='';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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;
  }
  sub end_dt {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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;
  }
  sub item_cleanup {
      my $item=&Apache::lonxml::endredirection();
-     $item=~s/\\begin{center}//g;
+     $item=~s/\\begin\{center}//g;
-     $item=~s/\\end{center}//g;
+     $item=~s/\\end\{center}//g;
      return $item;
  }
- Line 1724  sub item_cleanup {
+ Line 2122  sub item_cleanup {
  sub start_dd {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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;
  }
  sub end_dd {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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)
+ #       <table> also ends any prior <p> that is not closed.
+ #               but, unless I allow <p>'s to nest, that's the
+ #               only way I could think of to allow <p> in
+ #               <tr> <th> bodies
+ #
+ #list of supported attributes: border,width,TeXwidth,TeXtheme
+ #                              align
  sub start_table {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-     my $textwidth='';
+     my $textwidth = '';
-     if (not defined @Apache::londefdef::table) {
+     my $currentstring = &end_p();
- 	$textwidth=&recalc($ENV{'form.textwidth'});
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$textwidth=~/(\d+\.?\d*)/;
+ 	$currentstring .= $token->[4];
- 	$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 = {};
+ 	&disable_para();	# Can't have paras in a table.
- 	push @Apache::londefdef::table, $aa;
- 	$Apache::londefdef::table[-1]{'row_number'} = -1;
+ 	#  Get the parameters that we can do something about:
-         #table's width
- 	my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
+ 	my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0);
- 	if (not defined $TeXwidth) {
+ 	my $width  = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0);
- 	    my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);
+ 	my $theme  = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0);
- 	    if ($htmlwidth=~/%/) {
+ 	my $align  = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0);
- 		$htmlwidth=~/(\d+)/;
+ 	my $cell_border = &Apache::lonxml::get_param('rules', $parstack, $safeeval, undef, 0);
- 		my $value=$1*$textwidth/100;
- 		$Apache::londefdef::table[-1]{'width'}=$value;
+ 	# The only thing that needs any figuring out is the width.. and then only if it is
+ 	# a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm
+ 	#
+ 	my $table = new Apache::lontable();
+ 	if ((defined $border) && ($border > 0)) {
+ 	#    &Apache::lonnet::logthis("Turning on table borders: $border");
+ 	    $table->table_border(1);
+ 	    if (!defined $cell_border) {
+ 		$table->cell_border(1); # Default for rules is all if rules not defined.
+ 	    }
+ 	}
+ 	if ((defined $cell_border)) {
+ 	    if ($cell_border eq 'all') {
+ 		$table->cell_border(1);
+ 	    } elsif ($cell_border eq 'rows') {
+ 		$table->cell_border(2);
+ 	    } elsif ($cell_border eq 'cols') {
+ 		$table->cell_border(3);
+ 	    } elsif($cell_border eq 'groups') {
+ 		$table->cell_border(4);
  	    } else {
- 		$Apache::londefdef::table[-1]{'width'}=$textwidth;
+ 		$table->cell_border(0);
  	    }
- 	} elsif ($TeXwidth=~/%/) {
- 	    $TeXwidth=~/(\d+)/;
- 	    my $value=$1*$textwidth/100;
-             $Apache::londefdef::table[-1]{'width'}=$value;
- 	} else {
- 	    $Apache::londefdef::table[-1]{'width'}=$textwidth;
- 	}
-         #table's border
- 	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1);
- 	unless (defined $border) { $border = 0; }
- 	if ($border) {
- 	    $Apache::londefdef::table[-1]{'hinc'} = '\hline ';
- 	    $Apache::londefdef::table[-1]{'vinc'} = '&';
- 	    $Apache::londefdef::table[-1]{'vvinc'} = '|';
- 	} else {
- 	    $Apache::londefdef::table[-1]{'hinc'} = '';
- 	    $Apache::londefdef::table[-1]{'vinc'} = '&';
- 	    $Apache::londefdef::table[-1]{'vvinc'} = '';
  	}
- 	$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
+ 	if (defined $theme) {
- 	$currentstring = '\keephidden{NEW TABLE ENTRY}';
+ 	    $table->theme($theme);
+ 	}
+ 	if (defined $align) {
+ 	    $table->alignment($align);
+ 	}
+ 	# Missing width is most of page width
+ 	if (!(defined $width)) {
+ 	    $width = '70%';
+ 	}
+ 	# If a percentage, need to calculate what this means in terms of
+ 	# page width:
+ 	if ($width =~ /%$/) {
+ 	    my $textwidth = &recalc($env{'form.textwidth'});  # Page width in mm.
+ 	    $width =~ s/%//;
+ 	    $width = $width * $textwidth / 100.0;
+ 	    $width .= " mm";
+ 	    $table->width($width);
+ 	}
+ 	push(@Apache::londefdef::table, $table);
+         $currentstring.=' \keephidden{NEW TABLE ENTRY}';
      }
      return $currentstring;
  }
  sub end_table {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
- 	my $inmemory = '';
- 	my $output = '';
- 	#construct header of the table
+ 	my $table = pop(@Apache::londefdef::table);
- 	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
+ 	my $t     = $table->generate();
- 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
+ 	# &Apache::lonnet::logthis("Generating string");
- 	    $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
+ 	$currentstring = $t->generate_string();
- 	}
+ 	# &Apache::lonnet::logthis("Generated: $currentstring");
- 	$header_of_table .= '}';
+ 	&enable_para();
- 	#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--;
- 		}
- 	    }
- 	}
- 	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
- 	    if ($length_row_final[$jn]==0) {
- 		$length_row_final[$jn]=0.9*$available_length/$needed;
- 	    }
- 	}
- 	#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 .= ' \\\\ ';
- 	}
- 	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
- 	if ($#Apache::londefdef::table > 0) {
- 	    my $inmemory = $Apache::londefdef::table[-1]{'output'};
- 	    pop @Apache::londefdef::table;
- 	    push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;
- 	} else {
- 	    $currentstring .= $Apache::londefdef::table[-1]{'output'};
- 	    pop @Apache::londefdef::table;
- 	    undef @Apache::londefdef::table;
- 	}
      }
      return $currentstring;
  }
- Line 1887  sub end_table {
+ Line 2256  sub end_table {
  sub start_tr {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
+ 	my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1);
+ 	$Apache::londefdef::table[-1]->start_row();
+ 	if ($align ne '') {
+ 	    $Apache::londefdef::table[-1]->configure_row({default_halign => $align});
+ 	}
+ 	#---------------------------------------------------------------
+ 	# Old table code.
+ 	#---------------------------------------------------------------
+ 	if (0) {
  	$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'} = '';
+ 	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;
  }
  sub end_tr {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# Close any pending <p> in the row.
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[2];
+ 	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
+ 	# In case the user is missing a </td> or </th> tag:
+ 	if ($Apache::londefdef::TD_redirection) {
+ 	    &end_td_tex($parstack,$parser,$safeeval);
+ 	}
+ 	$Apache::londefdef::table[-1]->end_row();
+ 	#-----------------------------------------------
+ 	# Old table code
+ 	#-----------------------------------------------
+ 	if (0) {
  	if ($Apache::londefdef::TD_redirection) {
  	    &end_td_tex($parstack,$parser,$safeeval);
  	}
- 	push @{ $Apache::londefdef::table[-1]{'TeXlengthrow'} },$Apache::londefdef::table[-1]{'TeXlength'};
+ 	# Counter columns must be the maximum number of columns seen
- 	push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};
+ 	# 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;
  }
- Line 1924  sub end_tr {
+ Line 2333  sub end_tr {
  sub start_td {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
  	$Apache::londefdef::TD_redirection = 1;
  	&tag_check('tr','td',$tagstack,$parstack,$parser,$safeeval);
      }
      return $currentstring;
  }
  sub tag_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_td_tex($parstack,$parser,$safeeval);
- Line 1949  sub tag_check {
+ Line 2358  sub tag_check {
      }
      return '';
  }
+ #
+ #  Factor out cell configuration hash generation:
+ #
+ sub cell_config_hash {
+     my ($align, $rowspan, $colspan, $width) = @_;
+     if ($rowspan ne '') {
+         $rowspan =~ s/^\s+|\s+$//g;
+     }
+     if ($colspan ne '') {
+         $colspan =~ s/^\s+|\s+$//g;
+     }
+     my %config;
+     if ($align ne '') {
+ 	$config{'halign'} = $align;
+     }
+     if (($colspan =~ /^\d+$/) && ($colspan > 0)) {
+ 	$config{'colspan'} = $colspan;
+     }
+     if (($rowspan =~ /^\d+$/) && ($rowspan > 0)) {
+ 	$config{'rowspan'} = $rowspan;
+     }
+     if ($width ne '') {
+ 	$config{'width'} = $width;
+     }
+     return \%config;
+ }
  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 '') {
+     # At this stage, an empty cell is created with the
- 	$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
+     # appropriate rowspan/colspan and alignment
+     # attributes, but empty of text.  end_td_tex will
+     # fetch the contents from the recursive parse and
+     # fill the cell with them:
+     my $align   = &Apache::lonxml::get_param('align', $parstack, $safeeval);
+     my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval);
+     my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval);
+     my $width   = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval);
+     my $config = &cell_config_hash($align, $rowspan, $colspan, $width);
+     my $table = $Apache::londefdef::table[-1];
+     $table->add_cell('', $config);
+     #------------------------------------------------
+     #  Old table code.
+     #------------------------------------------------
+     if (0) {
+     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 $text = &Apache::lonxml::endredirection();
+     my $table = $Apache::londefdef::table[-1];
+     $table->append_cell_text($text);
+     #-------------------------------------------------
+     # Old table code
+     #-------------------------------------------------
+     if (0) {
      my ($parstack,$parser,$safeeval) = @_;
-     my $current_row = $Apache::londefdef::table[-1]{'row_number'};
+     my $current_row    = $Apache::londefdef::table[-1]{'row_number'};
-     my $data=&Apache::lonxml::endredirection();
+     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);
+ 	for (my $c = 0; $c < $colspan; $c++) {
- 	$current_length=~/(\d+)/;
+ 	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
- 	$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
+ 	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
- 	$Apache::londefdef::table[-1]{'length'} .= '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)*)/) {
+ 	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);
- 	} else {
+ 		$current_length=~/(\d+\.?\d*)/;
- 	    $data=~s/^\s+(\S.*)/$1/;
+ 		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\]//;
+ 	    }
+ 	    for (my $c = 0; $c < $colspan; $c++) {
+ 		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)*)//;
+ 	    }
+ 	    for (my $c = 0; $c < $colspan; $c++) {
+ 		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) {
- 		    my $lengthnewdata=1.8*LATEX_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*LATEX_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;}
+ 		    }
+ 	    }
+ 	    for (my $c = 0; $c < $colspan; $c++) {
+ 		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;
  	    }
- 	    $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]/;
  	}
-     @{ $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 {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
          $Apache::londefdef::TD_redirection =0;
  	&end_td_tex($parstack,$parser,$safeeval);
- Line 2021  sub end_td {
+ Line 2624  sub end_td {
  sub start_th {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$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 end_th {
+ sub tagg_check {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+     my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_;
-     my $currentstring = '';
+     my @ar=@$parstack;
-     if ($target eq 'web') {
+     for (my $i=$#ar-1;$i>=0;$i--) {
- 	$currentstring = $token->[2];
+ 	if (lc($$tagstack[$i]) eq $good_tag) {
-     } elsif ($target eq 'tex') {
+ 	    &start_th_tex($parstack,$parser,$safeeval);
- 	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
+ 	    last;
- 	my $data=&Apache::lonxml::endredirection();
+ 	} elsif (lc($$tagstack[$i]) eq $bad_tag) {
- 	my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
+ 	    splice @ar, $i+1;
- 	if (defined $TeXwidth) {
+ 	    &end_th_tex(\@ar,$parser,$safeeval);
- 	    my $current_length=&recalc($TeXwidth);
+ 	    &start_th_tex($parstack,$parser,$safeeval);
- 	    $current_length=~/(\d+)/;
+ 	    last;
- 	    $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
+ 	}
- 	    $Apache::londefdef::table[-1]{'length'} .= '0,';
+     }
- 	} else {
+     return '';
- 	    if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/) {
+ }
+ sub start_th_tex {
+     my ($parstack,$parser,$safeeval) = @_;
+     my $alignment = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef,1);
+     my $rowspan  =  &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1);
+     my $colspan  =  &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1);
+     my $config   = cell_config_hash($alignment, $rowspan, $colspan);
+     my $table    = $Apache::londefdef::table[-1];
+     $table->add_cell('\textbf{', $config);
+     #-------------------------------------------------------------------------------------
+     #
+     #  Old table code.
+     #
+     #--------------------------------------------------------------------------------------
+     if (0) {
+     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;
+     }
+     }
+     # Accept xml until the </th> tag.
+     &Apache::lonxml::startredirection();
+     return '';
+ }
+ sub end_th_tex {
+     my ($parstack,$parser,$safeeval) = @_;
+     my $table = $Apache::londefdef::table[-1];
+     my $text  = &Apache::lonxml::endredirection();
+     $table->append_cell_text($text.'}');
+     #-----------------------------------------------------------------------------
+     #  Old table code:
+     #-----------------------------------------------------------------------------
+     if (0) {
+     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+)/;
+ 		$current_length=~/(\d+\.?\d*)/;
- 		$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
+ 		if ($fwidth<$1) {$fwidth=$1;}
- 		$Apache::londefdef::table[-1]{'length'} .= '0,';
+ 		$garbage_data=~s/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
- 	    } else {
+ 	    }
- 		$data=~/^\s*(\S.*)/;
+             while ($garbage_data=~m/\[(\d+\.?\d*)\s*mm\]/) {
- 		$data=$1;
+ 		my $current_length=$1;
- 		$data=~/(.*\S)\s*$/;
+ 		if ($fwidth<$current_length) {$fwidth=$current_length;}
- 		$data=$1;
+ 		$garbage_data=~s/\[(\d+\.?\d*)\s*mm\]//;
- 		my $current_length=2*length($data);
+ 	    }
- 		$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'}] },$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++) {
+     }
+ 	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.'}';
+     #make data bold
- 	@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
+     $data='\textbf{'.$data.'}';
+     push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
+     }
+     return'';
+ }
+ sub end_th {
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+     my $currentstring = &end_p();	# Close any open <p> in the row.
+     if ($target eq 'web' || $target eq 'webgrade') {
+ 	$currentstring .= $token->[2];
+     } elsif ($target eq 'tex') {
+         $Apache::londefdef::TD_redirection =0;
+ 	&end_th_tex($parstack,$parser,$safeeval);
      }
      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 ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
  					 undef,1);
-     if (not $src and ($target eq 'web' or $target eq 'tex')) {
+     if (! $src &&
- 	my $inside = &Apache::lonxml::get_all_text("/img",$parser);
+ 	($target eq 'web' || $target eq 'webgrade' || $target eq 'tex')
- 	&Apache::lonnet::logthis("inside was $inside");
+ 	) {
+ 	my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);
  	return '';
      }
-     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
+     unless ($src =~ m{^data\:image/gif;base64,}) {
+         &Apache::lonxml::extlink($src);
+     }
      my $currentstring = '';
      my $scaling = .3;
-     if ($target eq 'web') {
- 	if ($ENV{'browser.imagesuppress'} ne 'on') {
+    # Render unto browsers that which are the browser's...
- 	    $currentstring.= $token->[4];
- 	} else {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	    my $alttag= &Apache::lonxml::get_param
+         my $enc = ('yes' eq
- 		('alt',$parstack,$safeeval,undef,1);
+                    lc(&Apache::lonxml::get_param('encrypturl',$parstack,
- 	    unless ($alttag) {
+                       $safeeval)));
- 		$alttag=&Apache::lonmeta::alttag
+         unless ($src =~ m{^data\:image/gif;base64,}) {
- 		    ($Apache::lonxml::pwd[-1],$src);
+             $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
- 	    }
+                             $enc);
- 	    $currentstring.='[IMAGE: '.$alttag.']';
+         }
- 	}
-     } elsif ($target eq 'tex') {
+     # and render unto TeX that which is LaTeX
+     } elsif ($target eq 'tex') {
+ 	#
+ 	#  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 bmp/gif/jpg/png/svg file exist do following:
+ 	my $origsrc=$src;
+ 	my ($path,$file) = &get_eps_image($src);
+ 	# &Apache::lonnet::logthis("Image source: $src result: $path $file");
  	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
- 	#if original gif/jpg/png file exist do following:
+ 	&Apache::lonxml::debug("path = $path file = $file src = $src");
  	if (-e $src) {
- 	    #what is the image size?
+ 	    &Apache::lonxml::debug("$src exists");
- 	    my $width_param=&image_size($src,$scaling,$parstack,$safeeval);
+ 	    my ($height_param,$width_param)=
-             my ($file,$path)=&file_path($src);
+ 		&image_size($origsrc,0.3,$parstack,$safeeval);
- 	    my $newsrc = $src;
+ 	    my $size;
- 	    $newsrc =~ s/\.(gif|jpg|png)$/.eps/i;
+ 	    if ($width_param)  { $size.='width='.$width_param.' mm,'; }
- 	    $file=~s/\.(gif|jpg|png)$/.eps/i;
+ 	    if ($height_param) { $size.='height='.$height_param.' mm]'; }
- 	    #where can we find the picture?
+ 	    # Default size if not able to extract that (e.g. eps image).
- 	    if (-e $newsrc) {
- 		#eps counterpart for image exist
+ 	    # &Apache::lonnet::logthis("Size = $size");
- 		if ($path) {
- 		    $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+ 	    $size='['.$size;
- 		}
+ 	    $size=~s/,$/]/;
- 	    } else {
+ 	    $currentstring .= '\graphicspath{{'.$path.'}}'
- 		#there is no eps counterpart for image - check for ps one
+ 		.'\includegraphics'.$size.'{'.$file.'} ';
- 		$newsrc =~ s/\.eps$/\.ps/;
+ 	    my $closure;
- 		if (-e $newsrc) {
+ 	    ($currentstring, $closure) = &align_latex_image($align,
- 		    #ps counterpart for image exist
+ 							    $latex_rendering,
- 		    $file =~ s/\.eps$/\.ps/;
+ 							    $currentstring,
- 		    if ($path) {
+ 							    $width_param,
- 			$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+ 							    $height_param);
- 		    }
+ 	    $currentstring .= $closure;
- 		} else {
- 		    #care about eps dynamical generation
- 		    $currentstring.='\vskip 1 mm '.&eps_generation($src,$file,$width_param);
- 		}
- 	    }
  	} 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);
  	    unless ($alt) {
  		$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') {
+         my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
  	$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::browse_or_search('src',undef,'alt',$only,undef,1).
- 	    &Apache::edit::search('src',undef,'alt').'<br />';
+                          '<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',
+ 						   ['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
+         my $alt=    &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+         my $enc=    &Apache::lonxml::get_param('encrypturl',$parstack,$safeeval);
+ 	$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
+ 						   ['no','yes'], $token, 2);
+         if (($alt=~/\S/) && (lc($enc) eq 'yes')) {
+            $currentstring.='<br /><span class="LC_warning">'.&mt('Warning: the description "[_1]" will be available, even for encrypted URL',$alt).'</span><br />';
+         }
  	$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
- 	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval);
+ 	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 $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
+ 	my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
- 	my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
+         my $element = &Apache::edit::get_element('src');
- 	$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
+         my $text;
- 	if ($width) { $currentstring.=' width="'.$width.'" '; }
+         if ($token->[2]{'src'}=~/\$/) {
- 	if ($height) { $currentstring.=' height="'.$height.'" '; }
+            $text = &mt('Variable image source');
- 	$currentstring .= ' />';
+         } elsif ($token->[2]{'src'}=~/\S/) {
+ 	   $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
+ 	   if ($width) { $currentstring.=' width="'.$width.'" '; }
+ 	   if ($height) { $currentstring.=' height="'.$height.'" '; }
+ 	   $currentstring .= ' id="previewimg_'.$element.'" />';
+         } else {
+            $text = &mt("No image source specified");
+         }
+         $currentstring .= ' <span id="showimg_'.$element.'">'.$text.'</span>';
      } elsif ($target eq 'modified') {
- 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ 	my ($osrc,$owidth,$oheight)=
- 						     $safeeval,'src','alt',
+ 	    ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
- 						     'TeXwidth','TeXheight',
+ 	my $ctag=&Apache::edit::get_new_args($token,$parstack,
- 						     'width','height');
+ 					     $safeeval,'src','alt','align',
- 	$src=$token->[2]{'src'};
+ 					     'TeXwidth','TeXheight', 'TeXwrap',
- 	if (!$token->[2]{'width'} && !$token->[2]{'height'}) {
+ 					     'width','height','encrypturl');
- 	    $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+ 	my ($nsrc,$nwidth,$nheight)=
- 	    &image_replication($src);
+ 	    ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
- 	    if (-e $src) {
+ 	my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc);
- 		my $image = Image::Magick->new;
+ 	&image_replication($loc);
- 		my ($width, $height, $size, $format) = $image->Ping($src);
+ 	my ($iwidth,$iheight);
- 		if ($width && $height) {
+ 	if (-e $loc) {
- 		    $token->[2]{'width'} =$width;
+ 	    my $image = Image::Magick->new;
- 		    $token->[2]{'height'}=$height;
+ 	    $image->Read($loc);
- 		    $constructtag=1;
+ 	    ($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;
  		}
  	    }
  	}
- 	if ($constructtag) {$currentstring=&Apache::edit::rebuild_tag($token);}
+ 	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;
  }
  sub end_img {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring = '';
- Line 2199  sub end_img {
+ Line 3003  sub end_img {
  #-- <applet> tag (end tag required)
  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 ($target eq 'web' || $target eq 'webgrade') {
- 	if ($ENV{'browser.appletsuppress'} ne 'on') {
+         $currentstring = $token->[4];
- 	    $currentstring = $token->[4];
- 	} else {
- 	    my $alttag= &Apache::lonxml::get_param('alt',$parstack,
- 						   $safeeval,undef,1);
- 	    unless ($alttag) {
- 		$alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],
- 						 $code);
- 	    }
- 	    $currentstring='[APPLET: '.$alttag.']';
- 	}
      } elsif ($target eq 'tex') {
+         # Turn off some stuff we can't be inside thank you LaTeX
+ 	my $restart_sub = 0;
+ 	my $restart_sup = 0;
+ 	# Since <sub> and <sup> are simple tags it's ok to turn off/on
+ 	# using the start_ stop_ functions.. those tags only care about
+ 	# $target.
+ 	if (&is_inside_of($tagstack, "sub")) {
+ 	    $restart_sub = 1;
+ 	    $currentstring .= &end_sub($target, $token, $tagstack,
+ 				       $parstack, $parser, $safeeval);
+ 	}
+ 	if (&is_inside_of($tagstack, "sup")) {
+ 	    $restart_sup = 1;
+ 	    $currentstring .= &end_sup($target, $token, $tagstack,
+ 				       $parstack, $parser, $safeeval);
+ 	}
+ 	# Now process the applet; just replace it with its alt attribute.
  	my $alttag= &Apache::lonxml::get_param('alt',$parstack,
  					       $safeeval,undef,1);
  	unless ($alttag) {
- Line 2231  sub start_applet {
+ Line 3045  sub start_applet {
  	}
  	$currentstring.='\begin{center} \fbox{Java Applet: '.$alttag.
  	    '.}\end{center}';
-     }
+ 	# Turn stuff back on that we can't be inside of.
+ 	if ($restart_sub) {
+ 	    $currentstring .= &start_sub($target, $token, $tagstack,
+ 					$parstack, $parser, $safeeval);
+ 	}
+ 	if ($restart_sup) {
+ 	    $currentstring .= &start_sup($target, $token, $tagstack,
+ 					 $parstack, $parser, $safeeval);
+ 	}
+     }
      return $currentstring;
  }
  sub end_applet {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
      }
      return $currentstring;
  }
  #-- <embed> tag (end tag optional/required)
  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 ($target eq 'web' || $target eq 'webgrade') {
- 	if ($ENV{'browser.embedsuppress'} ne 'on') {
+     $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
- 	    $currentstring = $token->[4];
- 	} else {
- 	    my $alttag=&Apache::lonxml::get_param
- 		('alt',$parstack,$safeeval,undef,1);
- 	    unless ($alttag) {
- 		$alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
- 	    }
- 	    $currentstring='[EMBED: '.$alttag.']';
- 	}
      } elsif ($target eq 'tex') {
      }
      return $currentstring;
  }
  sub end_embed {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[2];
+         $currentstring = $token->[2];
      } elsif ($target eq 'tex') {
-     }
+         # ./.
+     }
      return $currentstring;
  }
  #-- <param> tag (end tag forbidden)
  sub start_param {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-     if (&Apache::lonxml::get_param
+     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval,
- 	('name',$parstack,$safeeval,undef,1)=~/^cabbase$/i) {
+                                           undef,1);
- 	$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+     if ($name =~/^cabbase$/i) {
- 	    &Apache::lonxml::get_param('value',$parstack,$safeeval,undef,1);
+ 	my $value=&Apache::lonxml::get_param('value',$parstack,
-     }
+ 					     $safeeval,undef,1);
-     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+ 	&Apache::lonxml::extlink($value);
- 	&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+     } elsif ($name eq 'flashvars') {
+         if (lc(&Apache::lonxml::get_param('type',$parstack,$safeeval,-2,1))
+             eq 'application/x-shockwave-flash') {
+             my $launcher =
+                 &Apache::lonxml::get_param('data',$parstack,$safeeval,-2,1);
+             if ($launcher) {
+                 &Apache::lonxml::extlink($launcher);
+             }
+             my $flashvars=&Apache::lonxml::get_param('value',$parstack,
+                                                      $safeeval,undef,1);
+             if ($flashvars ne '') {
+                 foreach my $item (split(/\&/,$flashvars)) {
+                     my ($key,$value)=split(/=/,$item,2);
+                     if ($key eq 'content') {
+                         if ($value ne '') {
+                             my ($dir) = ($launcher =~ m{(.+/)[^/]+$});
+                             &Apache::lonxml::extlink($dir.$value);
+                         }
+                     } elsif ($key eq 'thumb') {
+                         if ($value ne '') {
+                             &Apache::lonxml::extlink($value);
+                         }
+                     }
+                 }
+             }
+         }
+     }
+     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+     if ($src ne '') {
+         &Apache::lonxml::extlink($src);
+     }
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	my %toconvert;
+ 	if ($src) { $toconvert{'src'}= $src; }
+ 	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;
  }
  sub end_param {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
      }
      return $currentstring;
  }
- Line 2309  sub end_param {
+ Line 3162  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::extlink($src);
-     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
- 	&Apache::lonnet::clutter($src);
+     if ($target eq 'tex') { &image_replication($src); }
-     &image_replication($src);
      my $result;
      if ($target eq 'edit') {
  	$result .=&Apache::edit::tag_start($target,$token);
- Line 2336  sub end_allow {
+ Line 3188  sub end_allow {
  #-- <frameset>
  sub start_frameset {
      my ($target,$token) = @_;
-     my $currentstring = '';
+     my $currentstring = '';	# Close any pending para.
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	if (!$Apache::lonxml::registered &&
+ 	$currentstring =
- 	    $ENV{'request.state'} eq 'published') {
+ 	    &Apache::loncommon::start_page($Apache::londefdef::title,
- 	    $currentstring.='<head>'.
+ 					   $Apache::londefdef::head,
- 		&Apache::lonmenu::registerurl(undef,$target).'</head>';
+ 					   {'add_entries'    => $token->[2],
- 	}
+ #					    'no_title'       => 1,
- 	my $onLoad='';
+ 					    'force_register' => 1,
- 	foreach my $key (keys(%{$token->[2]})) {
+ 					    'frameset'       => 1,});
- 	    if ($key =~ /^onload$/i) {
- 		$onLoad.=$token->[2]->{$key}.';';
- 		delete($token->[2]->{$key});
- 	    }
- 	}
- 	$token->[2]->{'onload'}=&Apache::lonmenu::loadevents().';'.$onLoad;
- 	my $onUnload='';
- 	foreach my $key (keys(%{$token->[2]})) {
- 	    if ($key =~ /^onunload$/i) {
- 		$onUnload.=$token->[2]->{$key}.';';
- 		delete($token->[2]->{$key});
- 	    }
- 	}
- 	$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
- 	    ';'.$onUnload;
- 	$currentstring .= '<'.$token->[1];
- 	foreach (keys %{$token->[2]}) {
- 	    $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
- 	}
- 	$currentstring.='>';
      }
      return $currentstring;
  }
- Line 2373  sub start_frameset {
+ Line 3205  sub start_frameset {
  sub end_frameset {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
- Line 2383  sub end_frameset {
+ Line 3215  sub end_frameset {
  sub start_xmp {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\begin{verbatim}';
      }
      return $currentstring;
  }
  sub end_xmp {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\end{verbatim}';
- Line 2405  sub end_xmp {
+ Line 3237  sub end_xmp {
  #-- <pre> (end tag required)
  sub start_pre {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# close off pending <p>
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\begin{verbatim}';
-     }
+ 	&Apache::lonxml::disable_LaTeX_substitutions();
+     }
      return $currentstring;
  }
  sub end_pre {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\end{verbatim}';
+ 	&Apache::lonxml::enable_LaTeX_substitutions();
      }
      return $currentstring;
  }
- Line 2429  sub end_pre {
+ Line 3263  sub end_pre {
  sub start_insert {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
  	$currentstring .= '<b>'.$display.'</b>';;
      }
- Line 2439  sub start_insert {
+ Line 3273  sub start_insert {
  sub end_insert {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= '';
      }
      return $currentstring;
- Line 2449  sub end_insert {
+ Line 3283  sub end_insert {
  sub start_externallink {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
  	$currentstring .= '<b>'.$display.'</b>';;
      }
- Line 2459  sub start_externallink {
+ Line 3293  sub start_externallink {
  sub end_externallink {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= '';
      }
      return $currentstring;
  }
- #-- <blankspace heigth="">
+ #-- <blankspace height="">
  sub start_blankspace {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# closes off any unclosed <p>
      if ($target eq 'tex') {
- 	my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
+ 	my $howmuch = &Apache::lonxml::get_param('height',$parstack,$safeeval,undef,1);
  	$currentstring .= '\vskip '.$howmuch.' ';
      }
      return $currentstring;
- Line 2489  sub end_blankspace {
+ Line 3323  sub end_blankspace {
  sub start_abbr {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_abbr {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2508  sub end_abbr {
+ Line 3342  sub end_abbr {
  sub start_acronym {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_acronym {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2527  sub end_acronym {
+ Line 3361  sub end_acronym {
  sub start_area {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_area {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2546  sub end_area {
+ Line 3380  sub end_area {
  sub start_base {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
- Line 2555  sub start_base {
+ Line 3389  sub start_base {
  sub end_base {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2565  sub end_base {
+ Line 3399  sub end_base {
  sub start_bdo {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_bdo {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2584  sub end_bdo {
+ Line 3418  sub end_bdo {
  sub start_bgsound {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_bgsound {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2603  sub end_bgsound {
+ Line 3437  sub end_bgsound {
  sub start_blink {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_blink {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
  #-- <blockquote> tag (end tag required)
  sub start_blockquote {
      my ($target,$token) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# Close any unclosed <p>
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	$currentstring .= $token->[4];
      }
+     if ($target eq 'tex') {
+ 	$currentstring .= '\begin{quote}';
+     }
      return $currentstring;
  }
  sub end_blockquote {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
+     if ($target eq 'tex') {
+ 	$currentstring = '\end{quote}';
+     }
      return $currentstring;
  }
- Line 2641  sub end_blockquote {
+ Line 3481  sub end_blockquote {
  sub start_button {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_button {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2660  sub end_button {
+ Line 3500  sub end_button {
  sub start_caption {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_caption {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2679  sub end_caption {
+ Line 3519  sub end_caption {
  sub start_col {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_col {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- #-- <colgroup> tag (end tag optional)
+ #-- <colgroup tag (end tag optional)
  sub start_colgroup {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack, $parstack, $parser, $safeeval, $style) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
+     if ($target eq 'tex') {
+ 	# TODO: Ensure this tag is in a table:
+ 	# Fetch the attributes and build the hash for the
+ 	# call to define_colgroup.
+ 	my $span    = &Apache::lonxml::get_param('span',   $parstack, $safeeval);
+ 	my $halign  = &Apache::lonxml::get_param('halign', $parstack, $safeeval);
+ 	my %colgroup_params;
+ 	if ($span ne '') {
+ 	    $colgroup_params{'span'} = $span;
+ 	}
+ 	if ($halign ne '') {
+ 	    $colgroup_params{'halign'} = $halign;
+ 	}
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->define_colgroup(\%colgroup_params);
+     }
      return $currentstring;
  }
  sub end_colgroup {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
  #-- <del> tag (end tag required)
  sub start_del {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
-     }
+     } elsif ($target eq 'tex') {
+ 	&disable_para();
+ 	$currentstring .= '\st{';
+     }
      return $currentstring;
  }
  sub end_del {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
-     }
+     } elsif ($target eq 'tex') {
+ 	&enable_para();
+ 	$currentstring = '}';
+     }
      return $currentstring;
  }
- Line 2736  sub end_del {
+ Line 3604  sub end_del {
  sub start_fieldset {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_fieldset {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2755  sub end_fieldset {
+ Line 3623  sub end_fieldset {
  sub start_frame {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_frame {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2774  sub end_frame {
+ Line 3642  sub end_frame {
  sub start_iframe {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+         my ($src,$url,$query);
-     }
+         if ($token->[2]->{'src'}) {
+             $src = $token->[2]->{'src'};
+         } elsif ($token->[2]->{'SRC'}) {
+             $src = $token->[2]->{'SRC'};
+         }
+         if ($src) {
+             ($url,$query) = ($src =~ /^([^?]+)\??([^?]*)$/);
+             if ($query =~ /inhibitmenu=yes/) {
+                 $currentstring = $token->[4];
+             } else {
+                 my $inhibit;
+                 if ($url =~ m{^[^/.].*\.x?html?$}) {
+                     $inhibit = 1;
+                 } elsif ($url =~ m{^/(uploaded|res)/.*\.x?html?$}) {
+                     $inhibit = 1;
+                 }
+                 if ($inhibit) {
+                     $currentstring = '<iframe ';
+                     foreach my $attrib (@{$token->[3]}) {
+                         if (lc($attrib) eq 'src') {
+                             if ($query) {
+                                 $query.='&amp;inhibitmenu=yes';
+                             } else {
+                                 $query = 'inhibitmenu=yes';
+                             }
+                             $currentstring .= 'src="'.$url.'?'.$query.'" ';
+                         } else {
+                             $currentstring .= lc($attrib).'="'.$token->[2]->{$attrib}.'" ';
+                         }
+                     }
+                     $currentstring =~ s/\s+$//;
+                     if ($token->[4] =~ m{/>$}) {
+                         $currentstring .= ' />';
+                     } else {
+                         $currentstring .= '>';
+                     }
+                 } else {
+                     $currentstring = $token->[4];
+                 }
+             }
+             if (($url !~ m{^https?://}) && ($env{'request.course.id'})) {
+                 my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'});
+                 my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                 my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                 if ($url =~ m{^([^/]|/uploaded/)}) {
+                     my $cleanhref = &clean_docs_httpref($url,$docuri,$cdom,$cnum);
+                     if ($cleanhref) {
+                         &Apache::lonxml::extlink($cleanhref);
+                     }
+                 } elsif (($url =~ m{/res/$LONCAPA::domain_re/}) && ($docuri =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E})) {
+                     if (!&Apache::lonnet::allowed('bre',$url)) {
+                         if (&Apache::lonnet::is_on_map($url)) {
+                             &Apache::lonxml::extlink($url);
+                         }
+                     }
+                 }
+             }
+         } else {
+             $currentstring = $token->[4];
+         }
+     }
      return $currentstring;
  }
  sub end_iframe {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2793  sub end_iframe {
+ Line 3721  sub end_iframe {
  sub start_ins {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_ins {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2812  sub end_ins {
+ Line 3740  sub end_ins {
  sub start_isindex {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_isindex {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2831  sub end_isindex {
+ Line 3759  sub end_isindex {
  sub start_keygen {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_keygen {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2850  sub end_keygen {
+ Line 3778  sub end_keygen {
  sub start_label {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_label {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2869  sub end_label {
+ Line 3797  sub end_label {
  sub start_layer {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_layer {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2888  sub end_layer {
+ Line 3816  sub end_layer {
  sub start_legend {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_legend {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
  #-- <link> tag (end tag forbidden)
  sub start_link {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
-     }
+ 					    undef,1);
+ 	&Apache::lonxml::extlink($href);
+ 	$currentstring = $token->[4];
+     }
      return $currentstring;
  }
  sub end_link {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2926  sub end_link {
+ Line 3857  sub end_link {
  sub start_marquee {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_marquee {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
  #-- <multicol> tag (end tag required)
  sub start_multicol {
      my ($target,$token) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# Close any pending <p>
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	$currentstring .= $token->[4];
      }
      return $currentstring;
  }
  sub end_multicol {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 2964  sub end_multicol {
+ Line 3895  sub end_multicol {
  sub start_nobr {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }  elsif ($target eq 'tex') {
  	$currentstring='\mbox{';
      }
- Line 2975  sub start_nobr {
+ Line 3906  sub start_nobr {
  sub end_nobr {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }   elsif ($target eq 'tex') {
  	$currentstring='}';
      }
- Line 2987  sub end_nobr {
+ Line 3918  sub end_nobr {
  sub start_noembed {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_noembed {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 3006  sub end_noembed {
+ Line 3937  sub end_noembed {
  sub start_noframes {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_noframes {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 3025  sub end_noframes {
+ Line 3956  sub end_noframes {
  sub start_nolayer {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_nolayer {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 3044  sub end_nolayer {
+ Line 3975  sub end_nolayer {
  sub start_noscript {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_noscript {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 3063  sub end_noscript {
+ Line 3994  sub end_noscript {
  sub start_object {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_object {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 3082  sub end_object {
+ Line 4013  sub end_object {
  sub start_optgroup {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_optgroup {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
- Line 3101  sub end_optgroup {
+ Line 4032  sub end_optgroup {
  sub start_samp {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring='\texttt{';
      }
- Line 3112  sub start_samp {
+ Line 4043  sub start_samp {
  sub end_samp {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring='}';
      }
- Line 3124  sub end_samp {
+ Line 4055  sub end_samp {
  sub start_server {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_server {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
  #-- <spacer> tag (end tag forbidden)
  sub start_spacer {
      my ($target,$token) = @_;
-     my $currentstring = '';
+     my $currentstring = &end_p();	# Close off any open <p> tag.
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = $token->[4];
+ 	$currentstring .= $token->[4];
      }
      return $currentstring;
  }
  sub end_spacer {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
+ my @span_end_stack; # for span tex target
  #-- <span> tag (end tag required)
  sub start_span {
-     my ($target,$token) = @_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
-     }
+     } elsif ($target eq 'tex') {
+         my $endstring = '';
+         my $family = &get_css_property('font-family',$parstack,$safeeval);
+         if ($family eq 'monospace') {
+             $currentstring .= '\texttt{';
+             $endstring .= '}';
+         }
+         my $weight = &get_css_property('font-weight',$parstack,$safeeval);
+         if ($weight eq 'bold') {
+             $currentstring .= '\textbf{';
+             $endstring .= '}';
+         }
+         my $style = &get_css_property('font-style',$parstack,$safeeval);
+         if ($style eq 'italic') {
+             $currentstring .= '\textit{';
+             $endstring .= '}';
+         }
+         push(@span_end_stack, $endstring);
+     }
      return $currentstring;
  }
  sub end_span {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
-     }
+     } elsif ($target eq 'tex') {
+         my $endstring = pop @span_end_stack;
+         $currentstring .= $endstring;
+     }
      return $currentstring;
  }
- Line 3181  sub end_span {
+ Line 4135  sub end_span {
  sub start_tbody {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
+     if ($target eq 'tex') {
+ 	# TODO: Ensure this tag is within a table:
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->start_body();
+     }
      return $currentstring;
  }
  sub end_tbody {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
+     if($target eq 'tex') {
+ 	# TODO: Ensure this tag is within a table:
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->end_body();
+     }
      return $currentstring;
  }
- Line 3200  sub end_tbody {
+ Line 4166  sub end_tbody {
  sub start_tfoot {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
+     if ($target eq 'tex') {
+         # TODO: ensure this is within a table tag.
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->start_foot();
+     }
      return $currentstring;
  }
  sub end_tfoot {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
+     if ($target eq 'tex') {
+ 	#  TODO: Ensure this is in side a table
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->end_foot();
+     }
      return $currentstring;
  }
- Line 3219  sub end_tfoot {
+ Line 4195  sub end_tfoot {
  sub start_thead {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
+     if ($target eq 'tex') {
+ 	# Assume we're in a table... TODO: Verify that and ignore tag if not.
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->start_head();
+     }
      return $currentstring;
  }
  sub end_thead {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
+     if ($target eq 'tex') {
+      	# TODO: Verify we are in a table and ignore tag if not.
+ 	my $table = $Apache::londefdef::table[-1];
+ 	$table->end_head();
+     }
      return $currentstring;
  }
- Line 3238  sub end_thead {
+ Line 4225  sub end_thead {
  sub start_var {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring = '\textit{';
      }
      return $currentstring;
  }
- Line 3249  sub start_var {
+ Line 4236  sub start_var {
  sub end_var {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring = '}';
      }
      return $currentstring;
  }
- Line 3261  sub end_var {
+ Line 4248  sub end_var {
  sub start_wbr {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[4];
      }
      return $currentstring;
  }
  sub end_wbr {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
      return $currentstring;
  }
  #-- <hideweboutput> tag
  sub start_hideweboutput {
      my ($target,$token) = @_;
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	&Apache::lonxml::startredirection();
      }
      return '';
  }
  sub end_hideweboutput {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = &Apache::lonxml::endredirection();
      }
      return '';
  }
- Line 3298  sub end_hideweboutput {
+ Line 4285  sub end_hideweboutput {
  sub image_replication {
      my $src = shift;
      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); }
+ 	if ($result ne 'ok') { &Apache::lonnet::repcopy($pssrc); }
      }
      return '';
  }
- sub image_size {
-     my ($src,$scaling,$parstack,$safeeval)=@_;
-     #size of image from gif/jpg/jpeg/png
+ sub resize_image {
-     my $image = Image::Magick->new;
+     my ($height_param, $width_param, $scaling,
-     my $current_figure = $image->Read($src);
+ 	$parstack, $safeeval, $depth, $cis) = @_;
-     my $width_param = $image->Get('width') * $scaling;;
-     my $height_param = $image->Get('height') * $scaling;;
+     # First apply the scaling...
-     undef $image;
+     $height_param = $height_param * $scaling;
+     $width_param  = $width_param  * $scaling;
      #do we have any specified LaTeX size of the picture?
-     my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
+     my $toget='TeXwidth';
-     my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);
+     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,
- 					   undef,1);
+ 					   $depth,1);
-     if ($TeXwidth ne '') {
+     if ($TeXwidth) {
+ 	my $old_width_param=$width_param;
  	if ($TeXwidth=~/(\d+)\s*\%/) {
- 	    $width_param = $1*$ENV{'form.textwidth'}/100;
+ 	    $width_param = $1*$env{'form.textwidth'}/100;
  	} else {
  	    $width_param = $TeXwidth;
  	}
-     } elsif ($TeXheight ne '') {
+ 	if ($TeXheight) {
- 	$width_param = $TeXheight/$height_param*$width_param;
+ 	    $height_param = $TeXheight;
-     } elsif ($width ne '') {
+ 	} elsif ($old_width_param) {
- 	$width_param = $width*$scaling;
+ 	    $height_param=$TeXwidth/$old_width_param*$height_param;
+ 	}
+     } elsif ($TeXheight) {
+ 	if ($height_param) {
+ 	    $width_param  = $TeXheight/$height_param*$width_param;
+ 	}
+ 	$height_param = $TeXheight;
+     } 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.
      }
-     if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}}
+     &Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
-     return $width_param;
+     my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg|svg)/i);
+     $src=~s/\.(bmp|gif|png|jpg|jpeg|svg)$/\.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/;
+ 		if (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/httpd/html/priv/[^/]+/([^/]*)/|/home/httpd/prtspool/$1/|;
+ 		if ($sext ne "") {	 # Put the ext. back in to uniquify.
+ 		    $src =~ s/\.eps$/$sext.eps/;
+ 		}
+ 	    }
+ 	}
+     } else {
+ 	# If the postscript file has spaces in its name,
+ 	# LaTeX will gratuitiously vomit.  Therefore
+ 	# queue such files for copy with " " replaced by "_".
+ 	# printout.pm will know them by their .ps  or .eps extensions.
+ 	my $newsrc = $orig_src;
+ 	$newsrc    =~  s|(.*)/res/|/home/httpd/html/res/|;
+ 	open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+ 	print FILE "$src\n";
+ 	close FILE;
+ 	$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
+ 	$src=~s|/home/httpd/html/priv/[^/]+/([^/]*)/|/home/httpd/prtspool/$1/|;
+     }
+     my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
+     $path =~ s/ /\_/g;
+     $file =~ s/ /\_/g;
+     &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 $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
-     my $temp_file = Apache::File->new('>>'.$filename);
+     if (open(my $tmpfile,">>$filename")) {
-     print $temp_file "$src\n";
+         print $tmpfile "$src\n";
+         close($tmpfile);
+     }
      my $newsrc = $src;
-     $newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
+     $newsrc =~ s/(\.bmp|\.gif|\.jpg|\.jpeg)$/\.eps/i;
-     $newsrc=~s/\/home\/httpd\/html\/res//;
+     $newsrc=~s{/home/httpd/html/res}{};
-     $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;
+     $newsrc=~s{/home/httpd/html/priv/[^/]+/($LONCAPA::username_re)/}{/$1/};
-     $newsrc=~s/\/\.\//\//;
+     $newsrc=~s{/\./}{/};
-     $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
+     $newsrc=~s{/([^/]+)\.(ps|eps)}{/};
-     return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+     if ($newsrc=~m{/home/httpd/lonUsers/}) {
+ 	$newsrc=~s{/home/httpd/lonUsers}{};
+ 	$newsrc=~s{/($LONCAPA::domain_re)/./././}{/$1/};
+     }
+     if ($newsrc=~m{/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 {
      my $argument = shift;
      if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';}
- Line 3382  sub recalc {
+ Line 4511  sub recalc {
  sub LATEX_length {
      my $garbage=shift;
-     $garbage=~s/^\s+(\S.*)/$1/;
+     $garbage=~s/^\s+$//;
-     $garbage=~s/(.*\S)\s+$/$1/;
+     $garbage=~s/^\s+(\S.*)/$1/;#space before
-     $garbage=~s/(\s)+/$1/;
+     $garbage=~s/(.*\S)\s+$/$1/;#space after
-     $garbage=~s/(\\begin{([^\}]+)}|\\end{([^\}]+)})//g;
+     $garbage=~s/(\s)+/$1/;#only one space
-     $garbage=~s/(\$\_\{|\$\_|\$\^{|\$\^|\}\$|\$)//g;
+     $garbage=~s/(\\begin\{([^\}]+)}|\\end\{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
-     $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/(\$\_\{|\$\_|\$\^\{|\$\^|\}\$)//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)/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)/ /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;
+     $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;
  }
+ sub align_latex_image {
+     my ($align, $latex_rendering, $image, $width, $height) = @_;
+     my $currentstring;        # The 1/2 wrapped image.
+     my $closure;              # The closure of the wrappage.
+     # if it's none just return it back
+     if ($latex_rendering eq 'none') {
+ 	return ($image,'');
+     }
+     #    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..
+     $currentstring = '';
+     if      ($align eq "top")    {
+ 	$currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
+ 	$closure = '}';
+     } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
+ 	my $offset = $height/2;
+ 	$currentstring .= '\raisebox{-'.$offset.'mm}{'.$image;
+ 	$closure       = '}';
+     } elsif ($align eq "left")   {
+ 	if ($latex_rendering eq "parpic") {
+ 	    $currentstring .= '\parpic[l]{'.$image;
+ 	    $closure       = '}';
+ 	} elsif ($latex_rendering eq "parbox") {
+ 	    $currentstring .= '\begin{minipage}[l]{'.$width.'mm}'
+ 		.$image;
+ 	    $closure = '\end{minipage}';
+ 	} elsif ($latex_rendering eq "wrapfigure"
+ 		 || $latex_rendering ne 'none') {  # wrapfig render
+ 	    $currentstring .=
+ 		'\begin{wrapfigure}{l}{'.$width.'mm}'
+ 		.'\scalebox{1.0}{'.$image;
+ 	    $closure = '}\end{wrapfigure}';
+ 	}
+     } elsif ($align eq "right")  {
+ 	if ($latex_rendering eq "parpic") {
+ 	    $currentstring .= '\parpic[r]{'.$image;
+ 	    $closure = '}';
+ 	} elsif ($latex_rendering eq "parbox") {
+ 	    $currentstring .=  '\begin{minipage}[r]{'.$width.'mm}'
+ 		.$image;
+ 	    $closure = '\end{minipage}';
+ 	} elsif ($latex_rendering eq "wrapfigure"
+ 		 || $latex_rendering ne 'none') {  # wrapfig render
+ 	    $currentstring .=
+ 		'\begin{wrapfigure}{r}{'.$width.'mm}'
+ 		.'\scalebox{1.0}{'.$image;
+ 	    $closure = '}\end{wrapfigure}';
+ 	}
+     } else {		# Bottom is also default.
+ 	# $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}';
+ 	$currentstring .= "{$image";
+ 	$closure       = '}';
+     }
+     return ($currentstring, $closure);
+ }
+ 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;
+ }
+ #
+ #   This sub provides the typical LaTeX prefix matter for tex output:
+ #
+ sub latex_header {
+     my ($mode) = @_;
+     my $currentstring = '';
+     $currentstring .=
+ 	"\n% &Apache::lonxml::londefdef \n" .
+ 	'\documentclass[letterpaper,twoside]{article}\raggedbottom';
+     if (($env{'form.latex_type'}=~'batchmode') ||
+ 	(!$env{'request.role.adv'}) ||
+ 	($mode eq 'batchmode')) {$currentstring .='\batchmode';}
+     $currentstring .= '\newcommand{\keephidden}[1]{}'.
+ 	'\renewcommand{\deg}{$^{\circ}$}'.
+ 	'\usepackage{multirow}'."\n".
+ 	'\usepackage{longtable}'."\n".
+ 	'\usepackage{textcomp}'."\n".
+ 	'\usepackage{makeidx}'."\n".
+ 	'\usepackage[dvips]{graphicx}'."\n".
+ 	'\usepackage{wrapfig}'."\n".
+ 	'\usepackage{picins}'."\n".
+ 	'\usepackage[T1]{fontenc}'."\n".
+ 	'\usepackage{lmodern}'."\n".
+ 	'\usepackage[postscript]{ucs}'."\n".
+ 	'\usepackage[utf8x]{inputenc}'."\n".
+ 	'\usepackage{pifont}'."\n".
+ 	'\usepackage{latexsym}'."\n".
+ 	'\usepackage{epsfig}'."\n".
+ 	'\usepackage{xtab}'."\n".
+ 	'\usepackage{tabularx}'."\n".
+ 	'\usepackage{booktabs}'."\n".
+ 	'\usepackage{array}'."\n".
+ 	'\usepackage{colortbl}'."\n".
+ 	'\usepackage{xcolor}'."\n".
+ 	'\usepackage{calc}'."\n".
+ 	'\usepackage{amsmath}'."\n".
+ 	'\usepackage{soul}'."\n".
+ 	'\usepackage{amssymb}'."\n".
+ 	'\usepackage{amsfonts}'."\n".
+ 	'\usepackage{amsthm}'."\n".
+ 	'\usepackage{amscd}'."\n".
+ 	'\usepackage{actuarialangle}'."\n";
+     if($env{'form.pdfFormFields'} eq 'yes') {
+ 	$currentstring .= '\usepackage{hyperref}'.
+ 	    '\usepackage{eforms}'.
+ 	    '\usepackage{tabularx}';
+     }
+         $currentstring .= '\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}}';
+     $currentstring .= '\begin{document}';
+     return $currentstring;
+ }
+ sub clean_docs_httpref {
+     my ($href,$docuri,$cdom,$cnum) = @_;
+     if ($docuri eq '') {
+         $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'});
+     }
+     if ($cdom eq '') {
+         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     }
+     if ($cnum eq '') {
+         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+     }
+     my $cleanhref;
+     if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/)(.+/)[^/]+$}) {
+         my $prefix = $1;
+         my $relpath = $2;
+         my ($hrefpath,$fname);
+         if ($href =~ m{^/}) {
+             if ($href =~ m{^\Q$prefix\E(.+/)([^/]+)$}) {
+                 $hrefpath = $1;
+                 $fname = $2;
+             } else {
+                 return $cleanhref;
+             }
+         } else {
+             if ($href =~ m{/}) {
+                 (my $path,$fname) = ($href =~ m{^(.*)/([^/]*)$});
+                 $hrefpath = $relpath.$path;
+                 if ($path eq '') {
+                     $hrefpath =~ s{/$}{};
+                 }
+             } else {
+                 $fname = $href;
+                 $hrefpath = $relpath;
+                 $hrefpath =~ s{/$}{};
+             }
+         }
+         if ($fname ne '') {
+             my $cleanrelpath;
+             foreach my $dir (split(/\//,$hrefpath)) {
+                 next if ($dir eq '.');
+                 if ($dir eq '..') {
+                     $cleanrelpath =~ s{([^/]+/)$}{};
+                 } else {
+                     $cleanrelpath .= $dir.'/';
+                 }
+             }
+             if ($cleanrelpath ne '') {
+                 $cleanhref = $prefix.$cleanrelpath.$fname;
+             } else {
+                 $cleanhref = $prefix.$fname;
+             }
+         }
+     }
+     return $cleanhref;
+ }
+ # This is retrieving a CSS property from the style attribute of the current element.
+ # It is not checking <style> elements or linked stylesheets yet.
+ sub get_css_property {
+     my ($property,$parstack,$safeeval) = @_;
+     my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval,undef,1);
+     my @style_components=split(/;/,$style);
+     foreach my $css_pair (@style_components) {
+         my ($name, $value) = split(/:/, $css_pair);
+         $name =~ s/^\s+|\s+$//g;
+         $value =~ s/^\s+|\s+$//g;
+         if ($name eq $property) {
+             return $value;
+         }
+     }
+     return undef;
+ }
+ =pod
+ =head1 NAME
+ Apache::londefdef.pm
+ =head1 SYNOPSIS
+ Tags Default Definition Module
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 NOTABLE SUBROUTINES
+ =over
+ =item start_hideweboutput()
+ =item end_hideweboutput()
+ =item image_replication()
+ =item resize_image()
+ 	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.
+ =item image_size()
+ =item image_width()
+ =item image_height()
+ =item get_eps_image()
+ =item eps_generation()
+ =item file_path()
+ =item recalc()
+ 	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
+ =item LATEX_length()
+ =item align_latex_image()
+   	Wrap image 'stuff' inside of the LaTeX required to implement
+    	alignment:
+      	align_tex_image(align, latex_rendering, image)
+    	Where:
+      	align   - The HTML alignment specification.
+      	latex_rendering - rendering hint for latex.
+      	image   - The LaTeX needed to insert the image itsef.
+      	width,height - dimensions of the image.
+  	Returns:
+     	The 1/2 wrapped image and the stuff required to close the
+     	wrappage.  This allows e.g. randomlabel to insert more stuff
+     	into the closure.
+ =item 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....
+      	}
+ =item clean_docs_httpref($href,$docuri,$cdom,$cnum)
+         HTML pages uploaded to a course which contain dependencies either from iframes,
+         javascript files or objects (FlashPlayerSwf, MediaSrc, XMPSrc, ConfigurationSrc,
+         and PosterImageSrc) for which dependency is another file uploaded to the same
+         course.
+         Required input:
+         href - dependency (either a relative URL, or an absolute URL)
+         Optional inputs:
+         docuri - URL of HTML page containing the dependency
+         cdom - Course domain
+         cnum - CourseID
+         Output:
+         returns an absolute URL constructed from the href provided, and the calling context.
+         (this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/ or
+         /uploaded/$cdom/$cnum/supplemental/).
+ =back
+ =cut
 ;

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

Removed from v.1.197
changed lines
	Added in v.1.474