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.302.2.4 and 1.402

-version 1.302.2.4, 2006/03/29 22:54:10
+version 1.402, 2009/04/20 10:40:04
  Line 42  package Apache::londefdef;
  use Apache::lonnet;
  use strict;
  use Apache::lonxml;
+ use Apache::lontable;
  use Apache::File();
  use Image::Magick;
  use Apache::lonmenu();
  use Apache::lonmeta();
+ use Apache::lonlocal;
  use Apache::Constants qw(:common);
  use File::Basename;
+ use LONCAPA();
  # use Data::Dumper;
  BEGIN {
- Line 56  BEGIN {
+ Line 59  BEGIN {
  }
- #
- #   Dumps all elements of the table structure.
- #   Need this 'cause evidently when given an array, Data::Dumper only seems
- #   to dump element 0.
- #
- #sub debug_dump_table {
- #    my $lastrow = $#Apache::londefdef::table;
- #    &Apache::lonnet::logthis("Dumping table:  Last row index: $lastrow");
- #    my $row;
- #    for ($row =0; $row <= $lastrow; $row++ ) {
- #	my $text = Dumper($Apache::londefdef::table[$row]);
- #	&Apache::lonnet::logthis("table [ $row ]".$text);
- #
- #    }
- #}
  sub initialize_londefdef {
      $Apache::londefdef::TD_redirection=0;
      @Apache::londefdef::table = ();
- Line 80  sub initialize_londefdef {
+ Line 69  sub initialize_londefdef {
      @Apache::londefdef::DT=(0);
      @Apache::londefdef::seenDT=(0);
      $Apache::londefdef::list_index=0;
+     undef($Apache::londefdef::head);
+     undef($Apache::londefdef::title);
  }
  #======================= TAG SUBROUTINES =====================
- Line 104  sub start_m {
+ Line 95  sub start_m {
  	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:");
  	}
+ 	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') {
- Line 123  sub start_m {
+ Line 125  sub start_m {
  	}
  	if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
  	# detect simple math mode entry exits, and convert them
-         # to use \ensuremath
+         # to use \ensuremath ... unless there's a \verb inside.
- 	if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
+ 	if (! ($currentstring=~/\\verb/)) {
- 	    $currentstring=~s/^(\s*)\$/$1/;
+ 	    if ($currentstring=~/^\s*\$[^\$].*\$\s*$/) {
- 	    $currentstring=~s/\$(\s*)$/$1/;
+ 		$currentstring=~s/^(\s*)\$/$1/;
- 	    $currentstring='\ensuremath{'.$currentstring.'}';
+ 		$currentstring=~s/\$(\s*)$/$1/;
+ 		$currentstring='\ensuremath{'.$currentstring.'}';
+ 	    }
  	}
  	$Apache::lonxml::post_evaluate=0;
      }
- Line 169  sub end_tthoption {
+ Line 173  sub end_tthoption {
  sub start_html {
      my ($target,$token) = @_;
      my $currentstring = '';
-     my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
-     &Apache::lontexconvert::init_tth();
      if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
- 	$currentstring = &Apache::lonxml::xmlbegin();
+ 	# start_body() takes care of emitting the <html>
      } elsif ($target eq 'tex') {
- 	$currentstring .= '\documentclass[letterpaper]{article}';
- 	if (($env{'form.latex_type'}=~'batchmode') ||
+ 	$currentstring .= &latex_header();
-             (!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
- 	$currentstring .= '\newcommand{\keephidden}[1]{}'.
-                           '\renewcommand{\deg}{$^{\circ}$}'.
-                           '\usepackage{longtable}'.
-                           '\usepackage{textcomp}'.
-                           '\usepackage{makeidx}'.
-                           '\usepackage[dvips]{graphicx}'.
- 			  '\usepackage{wrapfig}'.
- 			  '\usepackage{picins}'.
-                           '\usepackage{epsfig}'.
-                           '\usepackage{calc}'.
-                           '\usepackage{amsmath}'.
-                           '\usepackage{amssymb}'.
-                           '\usepackage{amsfonts}'.
-                           '\usepackage{amsthm}'.
-                           '\usepackage{amscd}'.
-                           '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
-                           '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
      }
      return $currentstring;
  }
- Line 201  sub start_html {
+ Line 185  sub start_html {
  sub end_html {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring = '</html>';
+ 	# end_body takes care of the </html>
      }
      return $currentstring;
  }
- Line 211  sub end_html {
+ Line 195  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::fontsettings();
+ 	&Apache::lonxml::startredirection();
      }
      return $currentstring;
  }
- Line 220  sub start_head {
+ Line 204  sub start_head {
  sub end_head {
      my ($target,$token) = @_;
      my $currentstring = '';
-     if ($target eq 'web' && $env{'request.state'} eq 'published') {
+     if (($target eq 'web'      && $env{'request.state'} eq 'published') ||
- 	$currentstring = &Apache::lonmenu::registerurl(undef,$target).
+ 	($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 354  sub end_form {
+ Line 341  sub end_form {
  #-- <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:  '
      }
- Line 371  sub start_title {
+ Line 359  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 .= '}';
      }
- Line 429  sub start_meta {
+ Line 417  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 452  sub end_meta {
+ Line 450  sub end_meta {
      return $currentstring;
  }
+ sub insert_meta {
+     return '
+     <meta />';
+ }
  # accessrule
  sub start_accessrule {
      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]; }
- Line 479  sub start_accessrule {
+ Line 492  sub start_accessrule {
  	}
      }
      if ($target eq 'meta') {
- 	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.'</rule>';
+ 	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.':'.$type.'</rule>';
      }
      return $currentstring;
  }
- Line 497  sub end_accessrule {
+ Line 510  sub end_accessrule {
      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.='>';
- 	&Apache::lontexconvert::jsMath_reset();
- 	if ($env{'environment.texengine'} eq 'jsMath') {
- 	    $currentstring.=&Apache::lontexconvert::jsMath_header();
  	}
+ 	my $extra_head = &generate_css_links();
+ 	$currentstring =
+ 	    &Apache::loncommon::start_page($Apache::londefdef::title,
+ 					   $Apache::londefdef::head
+ 					      .$extra_head,
+ 					   {'add_entries'    => $token->[2],
+ 					    'no_title'       => 1,
+ 					    'force_register' => 1});
  	if ($env{'request.state'} ne 'published') {
- 	    if ($env{'environment.remote'} eq 'off') {
+ 	    $currentstring.=&Apache::lonmenu::constspaceform();
- 		$currentstring.=
+ 	    $currentstring.=&Apache::londefdef::edit_controls();
- 		    &Apache::lonmenu::constspaceform().
- 		    &Apache::lonmenu::menubuttons(1,'web',1);
- 	    }
- 	    $currentstring.=(<<EDITBUTTON);
- <form method="post">
- <input type="submit" name="editmode" accesskey="e" value="Edit" />
- </form>
- EDITBUTTON
- 	} else {
- 	    $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
  	}
  	$currentstring.=&Apache::lonxml::message_location();
      } elsif ($target eq 'tex') {
- Line 583  EDITBUTTON
+ Line 557  EDITBUTTON
      return $currentstring;
  }
+ sub edit_controls {
+     my ($nochgview) = @_;
+     my $result .= '
+ <form method="post">
+ <div class="LC_edit_problem_header">';
+     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 class="LC_edit_problem_header_edit_row"><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" /></div></div>
+ </form>
+ <br />';
+     return $result;
+ }
  sub end_body {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = &end_p();	# Close off unclosed <p>
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
- 	$currentstring .= &Apache::lonxml::xmlend($target,$parser);
+ 	$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}';
      }
- Line 595  sub end_body {
+ Line 588  sub end_body {
  }
  # \begin{center} causes a new paragprah spacing that looks odd inside
- # of a table cell
+ # of a table cell.  Same at the end of a \center but with a slightly
- sub center_correction { return '\vspace*{-6 mm}'; }
+ # 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,$tagstack) = @_;
- Line 620  sub end_center {
+ Line 617  sub end_center {
      } elsif ($target eq 'tex') {
  	$currentstring = '\end{center}';
  	if (&is_inside_of($tagstack, "table")) {
- 	    #$currentstring .= &center_correction();
+ 	    $currentstring .= &center_end_correction();
  	}
      }
      return $currentstring;
- Line 1187  sub start_p {
+ Line 1184  sub start_p {
  	    $closing_string = '</p>'; # Deal correctly with <p /> e.g.
  	}
      } elsif ($target eq 'tex' && !$para_disabled) {
  	$currentstring .= &end_p();	# close off prior para if in progress.
  	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  	if ($align eq 'center') {
- 	    $currentstring .='\begin{center}\par';
+ 	    $currentstring .='\begin{center}\par ';
  	    $closing_string = '\end{center}';
  	    if (&is_inside_of($tagstack, "table")) {
  		$currentstring = &center_correction().$currentstring;
- 		#$closing_string .= &center_correction();
  	    }
  	} elsif ($align eq 'right') {
- 	    $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
+ 	    $currentstring.="\n".'{\flushright ';
- 	    $closing_string= '}}';
+ #	    $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
+ 	    $closing_string= "}\n";
  	} elsif ($align eq 'left') {
- 	    $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{\rlap{';
+ 	    $currentstring.= "\n".'{\flushleft ';
- 	    $closing_string = '}\hfill}';
+ #	    $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{{';
+ 	    $closing_string = "}\n";
  	} else {
              $currentstring.='\par ';
- 	    $closing_string = '\strut\\\\\strut ';
+ 	    if (&is_inside_of($tagstack, 'table')) {
+ 		$closing_string = '\vskip 0pt'; # Seems to be consistent with <p> in tables.
+ 	    } else {
+ 		$closing_string = '\strut\\\\\strut ';
+ 	    }
          }
      }
- Line 1241  sub start_br {
+ Line 1244  sub start_br {
  	#
  	for (my $i=$#tempo;$i>=0;$i--) {
  	    if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') ||
-                 ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul') ||
+                 ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul'))  {
-                 ($tempo[$i] eq 'td') || ($tempo[$i] eq 'th'))  {
  		$signal=1;
- 		last;
+ 	    }
+ 	    if (($tempo[$i] eq 'td') || ($tempo[$i] eq 'th')) {
+ 		$signal = 1;
  	    }
  	}
- 	if ($signal) {
+ 	if ($signal != 1) {
- 	    $currentstring .= ' \vskip 0 mm ';
- 	} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
  	    $currentstring .= '\strut \\\\ \strut ';
  	}
      }
      return $currentstring;
  }
- Line 1433  sub start_sub {
+ Line 1436  sub start_sub {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring .= '\ensuremath{_{';
+ 	$currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{';
      }
      return $currentstring;
  }
- Line 1456  sub start_sup {
+ Line 1459  sub start_sup {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	$currentstring .= '\ensuremath{^{';
+ 	$currentstring .= '\raisebox{\smallskipamount}{\scriptsize{';
      }
      return $currentstring;
  }
- Line 1479  sub start_hr {
+ Line 1482  sub start_hr {
      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 1499  sub start_hr {
+ Line 1523  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;
  }
- Line 1529  sub start_div {
+ Line 1563  sub start_div {
      }
      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 = '';
- Line 1539  sub start_div {
+ Line 1576  sub start_div {
  	    $endstring      = '\end{center}';
  	    if (&is_inside_of($tagstack, "table")) {
  		$currentstring = &center_correction().$currentstring;
- 		#$endstring .= &center_correction();
+ 		$endstring    .= &center_end_correction();
  	    }
  	}
  	elsif ($align eq 'right') {
- Line 1580  sub start_a {
+ Line 1617  sub start_a {
  	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
  					    undef,1);
  	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
-     } elsif ($target eq 'tex') {
+         if ($href =~ /\S/) {
- 	my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
+             if ($href !~ m{^https?://}) {
- 	my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
+                 my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
- 	if ($a=~/\S/) {
+                 my $linkurl;
- 	    $a=~s/([^\\])%/$1\\\%/g;
+                 if ($href =~ m{^/uploaded/}) {
- 	    $currentstring .= '\ref{URI: '.$a.'}';
+                     $linkurl = $href;
- 	} elsif ($b=~/\S/) {
+                 } elsif ($href =~ m{^[^/]}) {
- 	    $currentstring .= '\ref{Anchor: '.$b.'}';
+                     my $path = $url;
- 	} else {
+                     $path  =~ s{[^/]*$}{};
- 	    $currentstring.='';
+                     $linkurl = $path.$href;
- 	}
+                 }
+                 if ($linkurl =~ m{^/uploaded/}) {
+                     if (!&Apache::lonnet::allowed('bre',$linkurl)) {
+                         if (&Apache::lonnet::is_on_map($url)) {
+                             &Apache::lonxml::extlink($linkurl);
+                         }
+                     }
+                 }
+             }
+         }
      }
      return $currentstring;
  }
- Line 1601  sub end_a {
+ Line 1647  sub end_a {
      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 1930  sub end_dd {
+ Line 1998  sub end_dd {
  #               only way I could think of to allow <p> in
  #               <tr> <th> bodies
  #
- #list of supported attributes: border,width,TeXwidth
+ #list of supported attributes: border,width,TeXwidth,TeXtheme
+ #                              align
  sub start_table {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $textwidth = '';
- Line 1938  sub start_table {
+ Line 2007  sub start_table {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
- 	my $aa = {};
+ 	&disable_para();	# Can't have paras in a table.
- 	push @Apache::londefdef::table, $aa;
+ 	#  New table code:
+ 	#  Get the parameters that we can do something about:
+ 	my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0);
+ 	my $width  = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0);
+ 	my $theme  = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0);
+ 	my $align  = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0);
+ 	# 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 ($border ne '') {
+ 	    $table->table_border(1);
+ 	    $table->cell_border(1);
+ 	}
+ 	if ($theme ne '') {
+ 	    $table->theme($theme);
+ 	}
+ 	if ($align ne '') {
+ 	    $table->alignment($align);
+ 	}
+ 	# Missing width is most of page width
+ 	if ($width eq "") {
+ 	    $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}';
+ 	#--------------------------------------------------------
+ 	#  Old table code here.
+ 	#--------------------------------------------------------
+ 	if (0) {
+ 	push(@Apache::londefdef::table, {});
  	$Apache::londefdef::table[-1]{'row_number'} = -1;
          #maximum table's width (default coincides with text line length)
  	if ($#Apache::londefdef::table==0) {
  	    $textwidth=&recalc($env{'form.textwidth'}); #result is always in mm
  	    $textwidth=~/(\d+\.?\d*)/;
- 	    $textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame
+ 	    $textwidth=0.85*$1; #accounts "internal" LaTeX space for table frame
  	} else {
  	    if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) {
  		#the maximum width of nested table is determined by LATeX width of parent cell
- Line 1971  sub start_table {
+ Line 2093  sub start_table {
  	    } else {
  		$TeXwidth = $textwidth;
  	    }
- 	} else {
- 	    $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1;
  	}
+ 	# if the width is specified as a % it is converted to an absolute width.
+ 	# otherwise.. just plugged right in the hash
  	if ($TeXwidth=~/%/) {
- 	    $Apache::londefdef::table[-1]{'percent'}=1;
  	    $TeXwidth=~/(\d+)/;
              $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
  	} else {
  	    $Apache::londefdef::table[-1]{'width'}=$TeXwidth;
  	}
+         #  In the end, however the table width cannot be wider than $textwidth...
+ 	if ($Apache::londefdef::table[-1]{'width'} > $textwidth) {
+ 	    $Apache::londefdef::table[-1]{'width'} = $textwidth;
+ 	}
          #table's border
  	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
          my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
- Line 2008  sub start_table {
+ Line 2134  sub start_table {
          $Apache::londefdef::table[-1]{'minlen'}=[];
          $Apache::londefdef::table[-1]{'content'}=[];
          $Apache::londefdef::table[-1]{'align'}=[];
-         $currentstring.='\keephidden{NEW TABLE ENTRY}';
+         $currentstring.=' \keephidden{NEW TABLE ENTRY}';
+     }
      }
      return $currentstring;
- Line 2021  sub end_table {
+ Line 2147  sub end_table {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      } elsif ($target eq 'tex') {
+ 	#  New table code:
+ 	my $table = pop(@Apache::londefdef::table);
+ 	my $t     = $table->generate();
+ 	$currentstring = $t->generate_string();
+ 	&enable_para();
+ 	#--------------------------------------------------------------
+ 	#  Old table code:
+ 	#--------------------------------------------------------------
+ 	if (0) {
+ 	my $border =  &Apache::lonxml::get_param('border',$parstack,$safeeval);
  	my $inmemory = '';
  	my $output = '';
  	my $WARNING='';
          #width of columns from TeXwidth attributes
+ 	# Protect against unbalanced </table> tag.
+ 	if (scalar(@Apache::londefdef::table) > 0) {
  	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
  	    for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
  		if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {
- Line 2043  sub end_table {
+ Line 2188  sub end_table {
  		$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];
  	    }
  	}
          #boundaries for contents columns
  	my @min_len=();#columns can not be narrower
  	my @max_len=();#maximum length of column
- 	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
+ 	my $avg_max;
+ 	my $avg_min;
+ 	my $counter_cols = $Apache::londefdef::table[-1]{'counter_columns'};
+ 	for (my $jn=0;$jn<=$counter_cols; $jn++) {
  		my ($localmin,$localmax)=(0,0);
  		for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
  		    if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) {
- Line 2058  sub end_table {
+ Line 2207  sub end_table {
  		}
  		push @min_len, $localmin;
  		push @max_len, $localmax;
+ 		$avg_max = $localmax + $avg_max;
+ 		$avg_min = $localmin + $avg_min;
  	}
- 	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
+ 	# Does not really matter what the average max/min are if there are no cols.
+ 	# and this prevents div 0 in that case.
+ 	if ($counter_cols != 0) {
+ 	    $avg_max = $avg_max/$counter_cols;
+ 	    $avg_min = $avg_min/$counter_cols;
+ 	}
+ 	#  I don't think the below is needed.. but just in case:
+ 	if ($avg_min > $avg_max) {
+ 	    my $temp = $avg_min;
+ 	    $avg_min = $avg_max;
+ 	    $avg_max = $temp;
+ 	}
+ 	for (my $jn=0;$jn<=$counter_cols;$jn++) {
  	    my $localmin=0,;
  	    for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
  		if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {
- Line 2078  sub end_table {
+ Line 2247  sub end_table {
  		$min_len[$jn]=0;
  		$max_len[$jn]=0;
  	    }
+ 	    #  Spans seem to be really bothered by max/min = 0.  So if we have one
+ 	    #  make it an average joe max/min.
+ 	    if ($max_len[$jn] == 0) {
+ 		$max_len[$jn] = $avg_max;
+ 	    }
+ 	    if ($min_len[$jn] == 0) {
+ 		$min_len[$jn] = $avg_min;
+ 	    }
  	}
         #final adjustment of column width
  	my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
  	my @adjust=();
          #step 1. adjustment by maximum value
- 	my $space_neeeded=0;
+ 	my $space_needed=0;
  	for (my $jn=0;$jn<=$#max_len;$jn++) {
- 	    $space_neeeded=$space_neeeded+$max_len[$jn];
+ 	    $space_needed=$space_needed+$max_len[$jn];
  	}
- 	if ($space_neeeded<=$available_space) {
+ 	if ($space_needed<=$available_space) {
  	    for (my $jn=0;$jn<=$#max_len;$jn++) {
  		if ($fwidth[$jn]==0) {
  		    $fwidth[$jn]=$max_len[$jn];
- Line 2095  sub end_table {
+ Line 2275  sub end_table {
  	    }
  	} else {
          #step 2. adjustment by minimum value (estimation)
- 	    $space_neeeded=0;
+ 	    $space_needed=0;
  	    for (my $jn=0;$jn<=$#min_len;$jn++) {
- 		$space_neeeded+=$min_len[$jn];
+ 		$space_needed+=$min_len[$jn];
  	    }
- 	    if ($space_neeeded>$available_space) {
+ 	    if ($space_needed>$available_space) {
  		$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
  		for (my $jn=0;$jn<=$#max_len;$jn++) {
  		    if ($fwidth[$jn]==0) {
- Line 2116  sub end_table {
+ Line 2296  sub end_table {
  		    }
  		}
  		if ($how_many_to_scale>0) {
- 		    my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale;
+ 		    my $space_to_adjust=($space_needed-$available_space)/$how_many_to_scale;
  		    foreach my $jn (@to_scale) {
  			for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
  			    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/;
- Line 2138  sub end_table {
+ Line 2318  sub end_table {
  		}
  	    } else {
  	      #step 3. adjustment over minimal + corrections
- 		my $enlarge_coef=$available_space/$space_neeeded;
+ 		my $enlarge_coef=$available_space/$space_needed;
  		my $acsessive=0;
  		for (my $jn=0;$jn<=$#min_len;$jn++) {
  		    $adjust[$jn]=$min_len[$jn]*$enlarge_coef;
- Line 2146  sub end_table {
+ Line 2326  sub end_table {
  			$fwidth[$jn]=$max_len[$jn];
  			$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];
  			$adjust[$jn]=0;
  		    }
  		}
  		if ($acsessive>0) {
- Line 2170  sub end_table {
+ Line 2351  sub end_table {
  		}
  	    }
  	}
-         #use all available width if it is defined in % or as TeXwidth
+         # use all available width or specified width as if not specified,
-         if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) {
+ 	# the specified width gets defaulted to the available width.
- 	    my $current=0;
- 	    for (my $i=0;$i<=$#fwidth;$i++) {
+ 	my $current=0;
- 		$current+=$fwidth[$i];
+ 	for (my $i=0;$i<=$#fwidth;$i++) {
- 	    }
+ 	    $current+=$fwidth[$i];
- 	    my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
+ 	}
- 	    for (my $i=0;$i<=$#fwidth;$i++) {
+ 	if ($current == 0) {
- 		$fwidth[$i]*=$coef;
+             $current = $Apache::londefdef::table[-1]{'width'};
- 	    }
+         }
+ 	my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
+ 	for (my $i=0;$i<=$#fwidth;$i++) {
+ 	    $fwidth[$i]*=$coef;
  	}
          #removing of empty columns if allowed
          my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
- Line 2200  sub end_table {
+ Line 2384  sub end_table {
  	    $Apache::londefdef::table[-1]{'content'}=\@cleaned_table;
  	    @fwidth=@cleaned_header;
  	}
  	#construct header of the table
  	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
  	for (my $in=0;$in<=$#fwidth;$in++) {
  	    $header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'};
  	}
  	$header_of_table .= '}';
  	#fill the table
  	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
+ 	    my $have_rowspan = 0;
  	    for (my $jn=0;$jn<=$#fwidth;$jn++) {
- 		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- 		    $output.=&center_correction().'\begin{center}';
+ 		#-----------------------------------------------------------
- 		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+                 #   I think this order of doing things will ensure that
- 		    $output.=' \hfill \llap{'
+ 		#   single rowspan, columspan and combined row/colspans will
+                 #   work correctly.  LaTeX is delicate here.
+ 		#    RF.
+ 		# Start a rowspan if necessary:
+ 		my $primary_col_width = $fwidth[$jn]; # Width of primary column.
+ 		my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
+ 		my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn];
+ 		#
+ 		#  Do the appropriate magic if this has a colspan
+ 		#
+ 		my $border_char = "";
+ 		if ($border) {
+ 		    $border_char = "|";
+ 		}
+ 		my $spanwidth = 0;
+ 		if ($colspan > 1) {
+ 		    for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
+ 			$spanwidth += $fwidth[$spancol];
+ 		    }
+ 		    $output .= '\multicolumn{'.
+ 			$colspan
+ 			."}";
+ 		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+ 			$output .= '{'.$border_char.'c'.$border_char.'}{';
+ 		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+ 			$output .= '{'.$border_char.'r'.$border_char.'}{';
+ 		    }
+ 		    else {
+ 			$output .= '{'.$border_char."p{$spanwidth mm}".$border_char.'}{';
+ 		    }
+ 		} else {
+ 		    $spanwidth = $primary_col_width; # If no span width will be just colwidth
  		}
+ 		# Rowspan... if colspan is 1, and there's an alignment we'll need
+ 		# to kick in a multicolumn in order to get the alignment spec.
+ 		# this must precede the multirow or LaTex gets quite upset.
+ 		# Naturally if colspan > 1 we've already done that above ^
+ 		#
+ 		my $multirow_aligned = 0;
+ 		if ($rowspan > 1) {
+ 		    if ($colspan == 1) {
+ 			if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+ 			    $output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
+ 			    $multirow_aligned = 1;
+ 			} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+ 			    $output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
+ 			    $multirow_aligned = 1;
+ 			}
+ 		    }
+ 		    $have_rowspan++;
+ 		    if ($multirow_aligned) {
+ 			$output .= '\multirow{'.$rowspan.'}[0]{*}{';
+ 		    } else {
+ 			$output .= '\multirow{'.$rowspan."}[0]{$spanwidth mm}{";
+ 		    }
+ 		    $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
+ 			s{^\s*\\par\s*}{};
+ 		    $Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
+ 			s{\s*\\vskip\s*0pt\s*$}{};
+ 		    #
+ 		    # If we did not throw in a multicolumn to align, then add
+ 		    # an extra {
+ 		    # so we close correctly without having to keep additional state
+ 		    # around
+ 		    #
+ 		    if (!$multirow_aligned) {
+ 			$output .= '{';
+ 		    }
+ 		}
+ 		if (($rowspan eq '^') || ($rowspan eq '_')) {
+ 		    $have_rowspan++;
+ 		}
+ 		    #--------------------------------------------------------------
+ 		# For right and center alignment of single cells.
+ 		# we are going to use a multicolumn with a span of 1 to specify alignment.
+ 		#
+ 		if ($colspan == 1  && $rowspan == 1) {
+ 		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
+ 			$output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
+ 		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+ 			$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
+ 		    }
+ 		}
  		$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
- 		if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
- 		    $output.='\end{center}';#.&center_correction();
+ 		if (($colspan == 1 && $rowspan == 1)   &&
- 		} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
+ 		    (($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') ||
- 		    $output.='} ';
+ 		     ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r'))) {
+ 		    $output .= '}';
+ 		}
+ 		# Close off any open multirow:
+ 		if ($rowspan > 1) {
+ 		    $output .= '}}';
+ 		}
+ 		#  Close off the colspan...
+ 		#
+ 		if ($colspan > 1)  {
+ 		    $output .= '}';
+ 		    $jn += $colspan-1; # Adjust for number of rows really left.
  		}
                  if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}
  	    }
- 	    $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
+ 	    #  If have_rowspan > 0, and borders are on, then
+ 	    #  we need to do more than put an \hline at the bottom of row.
+ 	    #  we need to do the appropriate \cline to ensure that
+ 	    #  the spanned rows don't have \hlines through them.
+ 	    if (($Apache::londefdef::table[-1]{'hinc'} =~ /\\hline/) && $have_rowspan) {
+ 		$output .= ' \\\\ ';
+ 		for (my $jn=0; $jn<=$#fwidth;$jn++) {
+ 		    my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
+ 		    if ($rowspan ne "^") {
+ 			if (($rowspan <= 1) || ($rowspan eq '_')) {
+ 			    my $column = $jn+1;
+ 			    $output .= '\cline{'.$column.'-'.$column.'} ';
+ 			}
+ 		    }
+ 		}
+ 	    } else {
+ 		$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
+ 	    }
  	}
  	# Note that \newline destroys alignment env's produced  by e.g. <div>
  	# $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
- Line 2262  sub end_table {
+ Line 2573  sub end_table {
  	    pop @Apache::londefdef::table;
  	    undef @Apache::londefdef::table;
  	}
+ 	}
+ 	&enable_para();
+     }
      }
      return $currentstring;
  }
- Line 2273  sub start_tr {
+ Line 2587  sub start_tr {
      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=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
  	if ($alignchar ne '') {
- Line 2291  sub start_tr {
+ Line 2618  sub start_tr {
  	push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];
  	push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
  	push @ {$Apache::londefdef::table[-1]{'content'}}, [];
+     }
      }
      return $currentstring;
  }
- Line 2301  sub end_tr {
+ Line 2629  sub end_tr {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$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);
  	}
- Line 2309  sub end_tr {
+ Line 2650  sub end_tr {
  	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'};
  	}
+     }
      }
- Line 2345  sub tag_check {
+ Line 2686  sub tag_check {
      }
      return '';
  }
+ #
+ #  Factor out cell configuration hash generation:
+ #
+ sub cell_config_hash {
+     my ($align, $rowspan, $colspan) = @_;
+     my %config;
+     if ($align ne '') {
+ 	$config{'halign'} = $align;
+     }
+     if ($colspan ne "") {
+ 	$config{'colspan'} = $colspan;
+     }
+     if ($rowspan ne '') {
+ 	$config{'rowspan'} = $rowspan;
+     }
+     return \%config;
+ }
  sub start_td_tex {
      my ($parstack,$parser,$safeeval) = @_;
+     # At this stage, an empty cell is created with the
+     # 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, 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($align, $rowspan, $colspan);
+     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];
- Line 2360  sub start_td_tex {
+ Line 2742  sub start_td_tex {
  	$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) {
- 	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+ 	for (my $c = 0; $c < $colspan; $c++) {
- 	push @ {$Apache::londefdef::table[-1]{'minlen'}[$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'}] },'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;
- Line 2388  sub end_td_tex {
+ Line 2826  sub end_td_tex {
  		if ($fwidth<$current_length) {$fwidth=$current_length;}
  		$garbage_data=~s/\[(\d+\.?\d*)\s*mm\]//;
  	    }
- 	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+ 	    for (my $c = 0; $c < $colspan; $c++) {
- 	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
+ 		push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$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]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
- 	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$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';
+ 	    }
  	} 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;
- Line 2407  sub end_td_tex {
+ Line 2847  sub end_td_tex {
  		if ($fwidth<$1) {$fwidth=$1;}
  		$garbage_data=~s/\\epsfxsize\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)//;
  	    }
- 	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+ 	    for (my $c = 0; $c < $colspan; $c++) {
- 	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
+ 		push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$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]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
- 	    push @ {$Apache::londefdef::table[-1]{'maxlen'}[$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';
+ 	    }
  	    $data=~s/\\\\\s*$//;
  	} else {
  	    $data=~s/^\s+(\S.*)/$1/;
- Line 2438  sub end_td_tex {
+ Line 2880  sub end_td_tex {
  			if ($min_length<$lengthword) {$min_length=$lengthword;}
  		    }
  	    }
- 	    push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+ 	    for (my $c = 0; $c < $colspan; $c++) {
- 	    push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
+ 		push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$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]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
- 	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
+ 		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;
+ 	    }
  	}
      }
      # Substitute all of the tables nested in this cell in their appropriate places.
- Line 2456  sub end_td_tex {
+ Line 2900  sub end_td_tex {
      }
      # 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 '';
  }
- Line 2504  sub tagg_check {
+ Line 2971  sub tagg_check {
  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];
- Line 2516  sub start_th_tex {
+ Line 3001  sub start_th_tex {
  	$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);
- Line 2586  sub end_th_tex {
+ Line 3085  sub end_th_tex {
      #make data bold
      $data='\textbf{'.$data.'}';
      push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
+     }
      return'';
  }
- Line 2630  sub start_img {
+ Line 3130  sub start_img {
      if ($target eq 'web' || $target eq 'webgrade') {
  	if ($env{'browser.imagesuppress'} ne 'on') {
- 	    $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
+ 	    my $enc = ('yes' eq
+ 		       lc(&Apache::lonxml::get_param('encrypturl',$parstack,
+ 						     $safeeval)));
+ 	    $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
+ 							 $enc);
  	} else {
- 	    my $alttag= &Apache::lonxml::get_param
+ 	    my $alttag = &Apache::lonxml::get_param('alt',$parstack,$safeeval,
- 		('alt',$parstack,$safeeval,undef,1);
+ 						    undef,1);
- 	    unless ($alttag) {
+ 	    if (!$alttag) {
- 		$alttag=&Apache::lonmeta::alttag
+ 		$alttag = &Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],
- 		    ($Apache::lonxml::pwd[-1],$src);
+ 						   $src);
  	    }
  	    $currentstring.='[IMAGE: '.$alttag.']';
  	}
- Line 2655  sub start_img {
+ Line 3159  sub start_img {
  						  $safeeval,
  						  undef,1));
  	if(!$align) {
- 	    # disabled for now see BUG#4535
- 	    if (&is_inside_of($tagstack, "table")) {
- 		$align = "top";      # Force top of image to top of table cell
- 	    } else {
  		$align = "bottom";	# This is html's default so it's ours too.
- 	    }
  	}
  	#
  	&Apache::lonxml::debug("Alignemnt = $align");
- Line 2675  sub start_img {
+ Line 3174  sub start_img {
  							    $parstack,
  							    $safeeval,
  							    undef,0);
- 	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
+ 	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
  	if(!$latex_rendering) {
- 	    $latex_rendering = "texwrap";
+ 		$latex_rendering = "texwrap";
  	}
- 	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
+ 	# using texwrap inside a table does not work. So, if after all of this,
+ 	# texwrap is on, we turn it off if we detect we're in a table:
+ 	#
+ 	if (($latex_rendering eq 'texwrap') && &is_inside_of($tagstack, "table")) {
+ 	    $latex_rendering = 'parpic';
+ 	}
+ 	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
- 	#if original gif/jpg/png file exist do following:
+ 	#if original bmp/gif/jpg/png 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);
  	&Apache::lonxml::debug("path = $path file = $file src = $src");
  	if (-e $src) {
  	    &Apache::lonxml::debug("$src exists");
  	    my ($height_param,$width_param)=
  		&image_size($origsrc,0.3,$parstack,$safeeval);
- 	    my $destpath = $path;
- 	    $destpath    =~ s/ /\_/g; # Spaces in path cause LaTex to vomit.
- 	    my $destfile = $file;
- 	    $destfile    =~ s/ /\_/g;
  	    my $size;
  	    if ($width_param)  { $size.='width='.$width_param.' mm,'; }
  	    if ($height_param) { $size.='height='.$height_param.' mm]'; }
+ 	    # Default size if not able to extract that (e.g. eps image).
+ 	    # &Apache::lonnet::logthis("Size = $size");
  	    $size='['.$size;
  	    $size=~s/,$/]/;
- 	    $currentstring .= '\graphicspath{{'.$destpath.'}}'
+ 	    $currentstring .= '\graphicspath{{'.$path.'}}'
- 		.'\includegraphics'.$size.'{'.$destfile.'} ';
+ 		.'\includegraphics'.$size.'{'.$file.'} ';
+ 	    my $closure;
- 	    #    If there's an alignment specification we need to honor it here.
+ 	    ($currentstring, $closure) = &align_latex_image($align,
- 	    #    For the horizontal alignments, we will also honor the
+ 							    $latex_rendering,
- 	    #    value of the latex specfication.  The default is parbox,
+ 							    $currentstring,
- 	    #    and that's used for illegal values too.
+ 							    $width_param,
- 	    #
+ 							    $height_param);
- 	    #    Even though we set a default alignment value, the user
+ 	    $currentstring .= $closure;
- 	    #    could have given us an illegal value.  In that case we
- 	    #    just use the default alignment of bottom..
- 	    if      ($align eq "top")    {
- 		$currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}';
- 	    } elsif (($align eq "center") || ($align eq "middle")) { # Being kind
- 		my $offset = $height_param/2;
- 		$currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}';
- 	    } elsif ($align eq "left")   {
- 		if ($latex_rendering eq "parpic") {
- 		    $currentstring = '\parpic[l]{'.$currentstring.'}';
- 		} else {    	                                 # wrapfig render
- 		    $currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}'
- 			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
- 		}
- 	    } elsif ($align eq "right")  {
- 		if ($latex_rendering eq "parpic") {
- 		    $currentstring = '\parpic[r]{'.$currentstring.'}';
- 		} else {	                                 # wrapfig rendering
- 		    $currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}'
- 			.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
- 		}
- 	    } else {		# Bottom is also default.
- 		# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
- 	    }
  	} else {
  	    &Apache::lonxml::debug("$src does not exist");
  	    #original image file doesn't exist so check the alt attribute
- Line 2748  sub start_img {
+ Line 3231  sub start_img {
  	# 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('src',undef,'alt',$only).' '.
  	    &Apache::edit::search('src',undef,'alt').'<br />';
  	$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
  	$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
- Line 2760  sub start_img {
+ Line 3244  sub start_img {
  	$currentstring .=&Apache::edit::select_arg('Alignment:','align',
  						   ['','bottom','middle','top','left','right'],$token,5);
  	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
- 						   ['', 'parbox', 'parpic'], $token, 2);
+ 						   ['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
+ 	$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
+ 						   ['no','yes'], $token, 2);
  	$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
  	my $src=    &Apache::lonxml::get_param('src',$parstack,$safeeval);
  	my $alt=    &Apache::lonxml::get_param('alt',$parstack,$safeeval);
  	my $width=  &Apache::lonxml::get_param('width',$parstack,$safeeval);
  	my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
+         if ($token->[2]{'src'}=~/\$/) {
- 	$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
+            $currentstring.='Variable image source';
- 	if ($width) { $currentstring.=' width="'.$width.'" '; }
+         } else {
- 	if ($height) { $currentstring.=' height="'.$height.'" '; }
+ 	   $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
- 	$currentstring .= ' />';
+ 	   if ($width) { $currentstring.=' width="'.$width.'" '; }
+ 	   if ($height) { $currentstring.=' height="'.$height.'" '; }
+ 	   $currentstring .= ' />';
+         }
      } elsif ($target eq 'modified') {
  	my ($osrc,$owidth,$oheight)=
  	    ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
  	my $ctag=&Apache::edit::get_new_args($token,$parstack,
  					     $safeeval,'src','alt','align',
  					     'TeXwidth','TeXheight', 'TeXwrap',
- 					     'width','height');
+ 					     'width','height','encrypturl');
  	my ($nsrc,$nwidth,$nheight)=
  	    ($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
  	my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc);
- Line 2854  sub start_applet {
+ Line 3343  sub start_applet {
  	    $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 2864  sub start_applet {
+ Line 3376  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;
  }
- Line 2981  sub start_frameset {
+ Line 3504  sub start_frameset {
      my ($target,$token) = @_;
      my $currentstring = '';	# Close any pending para.
      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 3053  sub start_pre {
+ Line 3556  sub start_pre {
  	$currentstring .= $token->[4];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\begin{verbatim}';
+ 	&Apache::lonxml::disable_LaTeX_substitutions();
      }
      return $currentstring;
  }
- Line 3064  sub end_pre {
+ Line 3568  sub end_pre {
  	$currentstring .= $token->[2];
      } elsif ($target eq 'tex') {
  	$currentstring .= '\end{verbatim}';
+ 	&Apache::lonxml::enable_LaTeX_substitutions();
      }
      return $currentstring;
  }
- Line 3268  sub start_blockquote {
+ Line 3773  sub start_blockquote {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring .= $token->[4];
      }
+     if ($target eq 'tex') {
+ 	$currentstring .= '\begin{quote}';
+     }
      return $currentstring;
  }
- Line 3277  sub end_blockquote {
+ Line 3785  sub end_blockquote {
      if ($target eq 'web' || $target eq 'webgrade') {
  	$currentstring = $token->[2];
      }
+     if ($target eq 'tex') {
+ 	$currentstring = '\end{quote}';
+     }
      return $currentstring;
  }
- Line 3550  sub end_legend {
+ Line 4061  sub end_legend {
  sub start_link {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
      my $currentstring = '';
-     if ($target eq 'web') {
+     if ($target eq 'web' || $target eq 'webgrade') {
  	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
  					    undef,1);
  	&Apache::lonxml::extlink($href);
- Line 3954  sub image_replication {
+ Line 4465  sub image_replication {
      }
      return '';
  }
- #
- #   Get correct sizing parameter for an image given
- #   it's initial ht. and wid.  This allows sizing of
- #   images that are generated on-the-fly (e.g. gnuplot)
- #   as well as serving as a utility for image_size.
- #
- #  Parameter:
- #        height_param
- #        width_param    - Initial picture dimensions.
- #        scaling        - A scale factor.
- #        parstack,      - the current stack of tag attributes
- #                         from the xml parser
- #        safeeval,      - pointer to the safespace
- #        depth,         - from what level in the stack to look for attributes
- #                         (assumes -1 if unspecified)
- #        cis            - look for attrubutes case insensitively
- #                         (assumes false)
- #
- # Returns:
- #   height, width   - new dimensions.
- #
  sub resize_image {
      my ($height_param, $width_param, $scaling,
  	$parstack, $safeeval, $depth, $cis) = @_;
- Line 4077  sub get_eps_image {
+ Line 4570  sub get_eps_image {
  	&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
      }
      &Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
-     my ($spath, $sname, $sext) = fileparse($src, qr/\.(gif|png|jpg|jpeg)/i);
+     my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg)/i);
-     $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
+     $src=~s/\.(bmp|gif|png|jpg|jpeg)$/\.eps/i;
      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
      &Apache::lonxml::debug("Filelocation gives: $src");
      if (! -e $src) {
- Line 4102  sub get_eps_image {
+ Line 4595  sub get_eps_image {
  		my $newsrc=$orig_src;
  		$newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
  		&Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");
- 		print FILE "$newsrc\n";
+ 		print FILE ("$newsrc\n");
- 		close FILE;
+ 		close(FILE);
  		$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
  		$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
  		if ($sext ne "") {	 # Put the ext. back in to uniquify.
  		    $src =~ s/\.eps$/$sext.eps/;
  		}
  	    }
  	}
+     } 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/([^/]*)/public_html/|/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);
  }
- Line 4123  sub eps_generation {
+ Line 4632  sub eps_generation {
      my $temp_file = Apache::File->new('>>'.$filename);
      print $temp_file "$src\n";
      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/($LONCAPA::username_re)/public_html/}{/$1/};
-     $newsrc=~s/\/\.\//\//;
+     $newsrc=~s{/\./}{/};
-     $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
+     $newsrc=~s{/([^/]+)\.(ps|eps)}{/};
-     if ($newsrc=~/\/home\/httpd\/lonUsers\//) {
+     if ($newsrc=~m{/home/httpd/lonUsers/}) {
- 	$newsrc=~s/\/home\/httpd\/lonUsers//;
+ 	$newsrc=~s{/home/httpd/lonUsers}{};
- 	$newsrc=~s/\/([^\/]+)\/(\w)\/(\w)\/(\w)\//\/$1\//;
+ 	$newsrc=~s{/($LONCAPA::domain_re)/./././}{/$1/};
      }
-     if ($newsrc=~/\/userfiles\//) {
+     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.'} ';
- Line 4148  sub file_path {
+ Line 4657  sub file_path {
      }
      return $file,$path;
  }
- #  Converts a measurement in to mm from any of
- #  the other valid LaTeX units of measure.
- #  If the units of measure are missing from the
- #  parameter, it is assumed to be in and returned
- #  with mm units of measure
  sub recalc {
      my $argument = shift;
      if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';}
- Line 4197  sub LATEX_length {
+ Line 4703  sub LATEX_length {
  }
- # is_inside_of $tagstack $tag
+ sub align_latex_image {
- #    This sub returns true if the current state of Xml processing
+     my ($align, $latex_rendering, $image, $width, $height) = @_;
- #    is inside of the tag.
+     my $currentstring;        # The 1/2 wrapped image.
- # Parameters:
+     my $closure;              # The closure of the wrappage.
- #     tagstack   - The tagstack from the parser.
- #     tag        - The tag (without the <>'s.).
+     # if it's none just return it back
- # Sample usage:
+     if ($latex_rendering eq 'none') {
- #     if (is_inside_of($tagstack "table")) {
+ 	return ($image,'');
- #          # I'm in a table....
+     }
- #      }
+     #    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 = "\n% figurewrapping \n";
+     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       = '}';
+     }
+     $currentstring .= "\n% end wrappage\n";
+     $closure        = "\n% Begin closure\n".$closure."\n% End closure\n";
+     return ($currentstring, $closure);
+ }
  sub is_inside_of {
      my ($tagstack, $tag) = @_;
      my @stack = @$tagstack;
- Line 4219  sub is_inside_of {
+ Line 4782  sub is_inside_of {
  }
+ #
+ #   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}'.
+ 	'\usepackage{longtable}'.
+ 	'\usepackage{textcomp}'.
+ 	'\usepackage{makeidx}'.
+ 	'\usepackage[dvips]{graphicx}'.
+ 	'\usepackage{wrapfig}'.
+ 	'\usepackage{picins}'.
+ 	'\usepackage[T1]{fontenc}'."\n".
+ 	'\usepackage{lmodern}'."\n".
+ 	'\usepackage[postscript]{ucs}'."\n".
+ 	'\usepackage[utf8x]{inputenc}'."\n".
+ 	'\usepackage{pifont}' ."\n".
+ 	'\usepackage{latexsym}'."\n".
+ 	'\usepackage{epsfig}'.
+ 	"\\usepackage{xtab}\n".
+ 	"\\usepackage{tabularx}\n".
+ 	"\\usepackage{booktabs}\n".
+ 	"\\usepackage{array}\n".
+ 	"\\usepackage{colortbl}\n".
+ 	"\\usepackage{xcolor}\n".
+ 	'\usepackage{calc}'.
+ 	'\usepackage{amsmath}'.
+ 	'\usepackage{amssymb}'.
+ 	'\usepackage{amsfonts}'.
+ 	'\usepackage{amsthm}'.
+ 	'\usepackage{amscd}'
+         .'\usepackage{picins}\usepackage{calc}'."\n". # From lonprintout.pm
+ 	'\usepackage[T1]{fontenc}'."\n".
+ 	'\usepackage{lmodern}'."\n".
+ 	'\usepackage[postscript]{ucs}'."\n".
+ 	'\usepackage[utf8x]{inputenc}'."\n".
+ 	'\usepackage{pifont}'  . "\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;
+ }
+ =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....
+      	}
+ =back
+ =cut
 ;
  __END__

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

Removed from v.1.302.2.4
changed lines
	Added in v.1.402