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.239 and 1.357

version 1.239, 2004/08/30 18:25:55	version 1.357, 2007/03/09 17:10:33
Line 36	Line 36
# The C source of the Code may not be distributed by the Licensee	# The C source of the Code may not be distributed by the Licensee
# to any other parties under any circumstances.	# 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;	package Apache::londefdef;

use Apache::lonnet();	use Apache::lonnet;
use strict;	use strict;
use Apache::lonxml;	use Apache::lonxml;
use Apache::File();	use Apache::File();
Line 51 use Image::Magick;	Line 47 use Image::Magick;
use Apache::lonmenu();	use Apache::lonmenu();
use Apache::lonmeta();	use Apache::lonmeta();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
	use File::Basename;
	use LONCAPA();
	# use Data::Dumper;

BEGIN {	BEGIN {

Line 59 BEGIN {	Line 57 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 {	sub initialize_londefdef {
$Apache::londefdef::TD_redirection=0;	$Apache::londefdef::TD_redirection=0;
@Apache::londefdef::table = ();	@Apache::londefdef::table = ();
$Apache::londefdef::select=0;	$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;	$Apache::londefdef::list_index=0;
	undef($Apache::londefdef::head);
	undef($Apache::londefdef::title);
}	}

#======================= TAG SUBROUTINES =====================	#======================= TAG SUBROUTINES =====================
Line 87 sub start_m {	Line 102 sub start_m {
my $currentstring = '';	my $currentstring = '';
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
if ($target eq 'web' \|\| $target eq 'analyze') {	if ($target eq 'web' \|\| $target eq 'analyze') {
$inside ='\\documentstyle{article}'.$inside;
&Apache::lonxml::debug("M is starting with:$inside:");	&Apache::lonxml::debug("M is starting with:$inside:");
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {	if ($eval eq 'on') {
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
#&Apache::lonxml::debug("M is evaulated to:$inside:");	#&Apache::lonxml::debug("M is evaulated to:$inside:");
}	}
$currentstring = &Apache::lontexconvert::converted(\$inside);	my $tex = $inside;
	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
	$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
if ($Apache::lontexconvert::errorstring) {	if ($Apache::lontexconvert::errorstring) {
&Apache::lonxml::warning("tth error: ".	my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occured 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::lontexconvert::errorstring='';
}	}
#&Apache::lonxml::debug("M is ends with:$currentstring:");	#&Apache::lonxml::debug("M is ends with:$currentstring:");
Line 109 sub start_m {	Line 134 sub start_m {
$currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);	$currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);
}	}
if ($currentstring=~/^(\s\\\\\s)*$/) {$currentstring = ' \vskip 0 mm ';}	if ($currentstring=~/^(\s\\\\\s)*$/) {$currentstring = ' \vskip 0 mm ';}
	# detect simple math mode entry exits, and convert them
	# to use \ensuremath
	if ($currentstring=~/^\s\$[^\$].[^\$]\$\s*$/) {
	$currentstring=~s/^(\s*)\$/$1/;
	$currentstring=~s/\$(\s*)$/$1/;
	$currentstring='\ensuremath{'.$currentstring.'}';
	}
$Apache::lonxml::post_evaluate=0;	$Apache::lonxml::post_evaluate=0;
}	}
return $currentstring;	return $currentstring;
Line 124 sub end_m {	Line 156 sub end_m {
}	}

sub start_tthoption {	sub start_tthoption {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $result;	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*//;	$inside=~s/^\s*//;
if ($ENV{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
&tth::ttmoptions($inside);	&tth::ttmoptions($inside);
} else {	} else {
&tth::tthoptions($inside);	&tth::tthoptions($inside);
Line 148 sub end_tthoption {	Line 181 sub end_tthoption {
sub start_html {	sub start_html {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	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().	$currentstring .=
&Apache::lonxml::fontsettings();	'\documentclass[letterpaper,twoside]{article}\raggedbottom';
} elsif ($target eq 'tex') {	if (($env{'form.latex_type'}=~'batchmode') \|\|
@Apache::londefdef::table = ();	(!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
$currentstring .= '\documentclass[letterpaper]{book}';
if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';}
$currentstring .= '\newcommand{\keephidden}[1]{}'.	$currentstring .= '\newcommand{\keephidden}[1]{}'.
'\renewcommand{\deg}{$^{\circ}$}'.	'\renewcommand{\deg}{$^{\circ}$}'.
	'\usepackage{multirow}'.
'\usepackage{longtable}'.	'\usepackage{longtable}'.
'\usepackage{textcomp}'.	'\usepackage{textcomp}'.
'\usepackage{makeidx}'.	'\usepackage{makeidx}'.
'\usepackage[dvips]{graphicx}'.	'\usepackage[dvips]{graphicx}'.
	'\usepackage{wrapfig}'.
	'\usepackage{picins}'.
'\usepackage{epsfig}'.	'\usepackage{epsfig}'.
'\usepackage{calc}'.	'\usepackage{calc}'.
'\usepackage{amsmath}'.	'\usepackage{amsmath}'.
Line 179 sub start_html {	Line 213 sub start_html {
sub end_html {	sub end_html {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = &Apache::lonxml::xmlend($target,$parser);	# end_body takes care of the </html>
}	}
return $currentstring;	return $currentstring;
}	}
Line 189 sub end_html {	Line 223 sub end_html {
sub start_head {	sub start_head {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	&Apache::lonxml::startredirection();
}	}
return $currentstring;	return $currentstring;
}	}
Line 198 sub start_head {	Line 232 sub start_head {
sub end_head {	sub end_head {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	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;	return $currentstring;
}	}
Line 209 sub end_head {	Line 246 sub end_head {
sub start_map {	sub start_map {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 218 sub start_map {	Line 255 sub start_map {
sub end_map {	sub end_map {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 228 sub end_map {	Line 265 sub end_map {
sub start_select {	sub start_select {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::select=0;	$Apache::londefdef::select=0;
Line 239 sub start_select {	Line 276 sub start_select {
sub end_select {	sub end_select {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 249 sub end_select {	Line 286 sub end_select {
sub start_option {	sub start_option {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::select++;	$Apache::londefdef::select++;
Line 265 sub start_option {	Line 302 sub start_option {
sub end_option {	sub end_option {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring='}';	$currentstring='}';
Line 277 sub end_option {	Line 314 sub end_option {
sub start_input {	sub start_input {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 286 sub start_input {	Line 323 sub start_input {
sub end_input {	sub end_input {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 296 sub end_input {	Line 333 sub end_input {
sub start_textarea {	sub start_textarea {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 305 sub start_textarea {	Line 342 sub start_textarea {
sub end_textarea {	sub end_textarea {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 315 sub end_textarea {	Line 352 sub end_textarea {
sub start_form {	sub start_form {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 324 sub start_form {	Line 361 sub start_form {
sub end_form {	sub end_form {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 332 sub end_form {	Line 369 sub end_form {

#-- <title> tag (end tag required)	#-- <title> tag (end tag required)
sub start_title {	sub start_title {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $currentstring = '';	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') {	} elsif ($target eq 'tex') {
$currentstring .= '\keephidden{Title of the document: '	$currentstring .= '\keephidden{Title of the document: '
}	}
Line 349 sub start_title {	Line 387 sub start_title {
sub end_title {	sub end_title {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	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') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
}	}
Line 363 sub end_title {	Line 401 sub end_title {

#-- <meta> tag (end tag forbidden)	#-- <meta> tag (end tag forbidden)
sub start_meta {	sub start_meta {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
my $args='';	my $args='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
if ($args eq '') {	if ($args eq '') {
&Apache::lonxml::get_all_text("/meta",$parser);	&Apache::lonxml::get_all_text("/meta",$parser,$style);
} else {	} else {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
Line 414 sub start_meta {	Line 452 sub start_meta {
sub end_meta {	sub end_meta {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
my $args='';	my $args='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
if ($args ne '') {	if ($args ne '') {
Line 432 sub end_meta {	Line 470 sub end_meta {

# accessrule	# accessrule
sub start_accessrule {	sub start_accessrule {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $currentstring = '';	my $currentstring = '';
my $eff=&Apache::lonxml::get_param	my $eff=&Apache::lonxml::get_param
('effect',$parstack,$safeeval,undef,1);	('effect',$parstack,$safeeval,undef,1);
Line 451 sub start_accessrule {	Line 489 sub start_accessrule {
my $args='';	my $args='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
if ($args eq '') {	if ($args eq '') {
&Apache::lonxml::get_all_text("/accessrule",$parser);	&Apache::lonxml::get_all_text("/accessrule",$parser,$style);
} else {	} else {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
Line 479 sub end_accessrule {	Line 517 sub end_accessrule {
sub start_body {	sub start_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {
	if ($target eq 'web' \|\| $target eq 'webgrade') {
if ($Apache::lonhomework::parsing_a_problem) {	if ($Apache::lonhomework::parsing_a_problem) {
&Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");	&Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");
return '';	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.='>';	$currentstring =
if ($ENV{'request.state'} ne 'published') {	&Apache::loncommon::start_page($Apache::londefdef::title,
	$Apache::londefdef::head,
	{'add_entries' => $token->[2],
	'no_title' => 1,
	'force_register' => 1});

	if ($env{'request.state'} ne 'published') {
	$currentstring.=&Apache::lonmenu::constspaceform();
$currentstring.=(<<EDITBUTTON);	$currentstring.=(<<EDITBUTTON);
<form method="post">	<form method="post">
<input type="submit" name="editmode" accesskey="e" value="Edit" />	<input type="submit" name="editmode" accesskey="e" value="Edit" />
</form>	</form>
	<br />
EDITBUTTON	EDITBUTTON
} else {
$currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
}	}
$currentstring.=&Apache::lonxml::message_location();	$currentstring.=&Apache::lonxml::message_location();
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 552 EDITBUTTON	Line 551 EDITBUTTON
}	}

sub end_body {	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') {	} 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;	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)	#-- <center> tag (end tag required)
sub start_center {	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') {	} elsif ($target eq 'tex') {
$currentstring = '\begin{center}';	if (&is_inside_of($tagstack, "table")) {
	$currentstring .= &center_correction();
	}
	$currentstring .= '\begin{center}';
}	}
return $currentstring;	return $currentstring;
}	}

sub end_center {	sub end_center {
my ($target,$token) = @_;	my ($target,$token,$tagstack) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '\end{center}';	$currentstring = '\end{center}';
	if (&is_inside_of($tagstack, "table")) {
	$currentstring .= &center_end_correction();
	}
}	}
return $currentstring;	return $currentstring;
}	}

#-- <b> tag (end tag required)	#-- <b> tag (end tag required)
	# NOTE: In TeX mode disables internal <p>
sub start_b {	sub start_b {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '\textbf{';	&disable_para();
	$currentstring .= '\textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 600 sub start_b {	Line 614 sub start_b {
sub end_b {	sub end_b {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '}';	&enable_para();
	$currentstring = '}';
}	}
return $currentstring;	return $currentstring;
}	}

#-- <strong> tag (end tag required)	#-- <strong> tag (end tag required)
	# NOTE: in TeX mode disables internal <p>
sub start_strong {	sub start_strong {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	&disable_para();
$currentstring = '\textbf{';	$currentstring = '\textbf{';
}	}
return $currentstring;	return $currentstring;
Line 623 sub start_strong {	Line 640 sub start_strong {
sub end_strong {	sub end_strong {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	&enable_para();
$currentstring = '}';	$currentstring = '}';
}	}
return $currentstring;	return $currentstring;
Line 634 sub end_strong {	Line 652 sub end_strong {
#-- <h1> tag (end tag required)	#-- <h1> tag (end tag required)
sub start_h1 {	sub start_h1 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 649 sub start_h1 {	Line 667 sub start_h1 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
} elsif ($target eq 'meta') {	} elsif ($target eq 'meta') {
$currentstring='<subject>';	$currentstring.='<subject>';
&start_output($target);	&start_output($target);
}	}
return $currentstring;	return $currentstring;
Line 660 sub start_h1 {	Line 678 sub start_h1 {
sub end_h1 {	sub end_h1 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post='\vskip 0 mm ';	my $post='\vskip 0 mm ';
Line 683 sub end_h1 {	Line 701 sub end_h1 {
#-- <h2> tag	#-- <h2> tag
sub start_h2 {	sub start_h2 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 698 sub start_h2 {	Line 716 sub start_h2 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 706 sub start_h2 {	Line 724 sub start_h2 {
sub end_h2 {	sub end_h2 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post='\vskip 0 mm ';	my $post='\vskip 0 mm ';
Line 726 sub end_h2 {	Line 744 sub end_h2 {
#-- <h3> tag	#-- <h3> tag
sub start_h3 {	sub start_h3 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 741 sub start_h3 {	Line 759 sub start_h3 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 749 sub start_h3 {	Line 767 sub start_h3 {
sub end_h3 {	sub end_h3 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post='\vskip 0 mm ';	my $post='\vskip 0 mm ';
Line 769 sub end_h3 {	Line 787 sub end_h3 {
#-- <h4> tag	#-- <h4> tag
sub start_h4 {	sub start_h4 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 784 sub start_h4 {	Line 802 sub start_h4 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 792 sub start_h4 {	Line 810 sub start_h4 {
sub end_h4 {	sub end_h4 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post='\vskip 0 mm ';	my $post='\vskip 0 mm ';
Line 812 sub end_h4 {	Line 830 sub end_h4 {
#-- <h5> tag	#-- <h5> tag
sub start_h5 {	sub start_h5 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 827 sub start_h5 {	Line 845 sub start_h5 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 835 sub start_h5 {	Line 853 sub start_h5 {
sub end_h5 {	sub end_h5 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post='\vskip 0 mm ';	my $post='\vskip 0 mm ';
Line 855 sub end_h5 {	Line 873 sub end_h5 {
#-- <h6> tag	#-- <h6> tag
sub start_h6 {	sub start_h6 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 870 sub start_h6 {	Line 888 sub start_h6 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 878 sub start_h6 {	Line 896 sub start_h6 {
sub end_h6 {	sub end_h6 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post='\vskip 0 mm ';	my $post='\vskip 0 mm ';
Line 899 sub end_h6 {	Line 917 sub end_h6 {
sub start_cite {	sub start_cite {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\textit{';	$currentstring .= '\textit{';
Line 910 sub start_cite {	Line 928 sub start_cite {
sub end_cite {	sub end_cite {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 922 sub end_cite {	Line 940 sub end_cite {
sub start_i {	sub start_i {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\textit{';	$currentstring .= '\textit{';
Line 933 sub start_i {	Line 951 sub start_i {
sub end_i {	sub end_i {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 945 sub end_i {	Line 963 sub end_i {
sub start_address {	sub start_address {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\textit{';	$currentstring .= '\textit{';
Line 956 sub start_address {	Line 974 sub start_address {
sub end_address {	sub end_address {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 968 sub end_address {	Line 986 sub end_address {
sub start_dfn {	sub start_dfn {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\textit{';	$currentstring .= '\textit{';
Line 979 sub start_dfn {	Line 997 sub start_dfn {
sub end_dfn {	sub end_dfn {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 991 sub end_dfn {	Line 1009 sub end_dfn {
sub start_tt {	sub start_tt {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\texttt{';	$currentstring .= '\texttt{';
Line 1002 sub start_tt {	Line 1020 sub start_tt {
sub end_tt {	sub end_tt {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 1014 sub end_tt {	Line 1032 sub end_tt {
sub start_kbd {	sub start_kbd {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\texttt{';	$currentstring .= '\texttt{';
Line 1025 sub start_kbd {	Line 1043 sub start_kbd {
sub end_kbd {	sub end_kbd {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 1037 sub end_kbd {	Line 1055 sub end_kbd {
sub start_code {	sub start_code {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\texttt{';	$currentstring .= '\texttt{';
Line 1048 sub start_code {	Line 1066 sub start_code {
sub end_code {	sub end_code {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 1060 sub end_code {	Line 1078 sub end_code {
sub start_em {	sub start_em {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\emph{';	$currentstring .= '\emph{';
Line 1071 sub start_em {	Line 1089 sub start_em {
sub end_em {	sub end_em {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 1083 sub end_em {	Line 1101 sub end_em {
sub start_q {	sub start_q {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\emph{';	$currentstring .= '\emph{';
Line 1094 sub start_q {	Line 1112 sub start_q {
sub end_q {	sub end_q {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 1102 sub end_q {	Line 1120 sub end_q {
return $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)	#-- <p> tag (end tag optional)
#optional attribute - align="center\|left\|right"	#optional attribute - align="center\|left\|right"
sub start_p {	sub start_p {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	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];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	if (! ($currentstring =~ /\//)) {
	$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);	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
if ($align eq 'center') {	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;
	}
} elsif ($align eq 'right') {	} elsif ($align eq 'right') {
$currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{';	$currentstring.="\n".'{\flushright ';
	# $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
	$closing_string= "}\n";
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{';	$currentstring.= "\n".'{\flushleft ';
	# $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{{';
	$closing_string = "}\n";
} else {	} else {
$currentstring='\par ';	$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 ';
	}
}	}
my $signal=1;#<p> does not work inside <b>...</b>
foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}
if (!$signal) {$currentstring = '';}
}
}	}
return $currentstring;	return $currentstring;
}	}
	#
	# End paragraph processing just requires that we output the
	# closing string that was saved and blank it.
sub end_p {	sub end_p {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	# 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) {
} elsif ($target eq 'tex') {	my $current_string = $closing_string;
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);	$closing_string = ''; # Not in a para anymore.
if (not defined $align) {	return $current_string;
$currentstring.='\strut\\\\\strut ';	} else {
} elsif ($align eq 'center') {	return '';
$currentstring .= '\end{center}';
} elsif ($align eq 'right') {
$currentstring .= '}}';
} elsif ($align eq 'left') {
$currentstring .= '}\hfill}';
}
}	}
return $currentstring;
}

	}
	}
#-- <br> tag (end tag forbidden)	#-- <br> tag (end tag forbidden)
sub start_br {	sub start_br {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my @tempo=@$tagstack;	my @tempo=@$tagstack;
my $signal=0;	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--) {	for (my $i=$#tempo;$i>=0;$i--) {
if (($tempo[$i] eq 'b') \|\| ($tempo[$i] eq 'strong') \|\|	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;	$signal=1;
last;	}
	if (($tempo[$i] eq 'td') \|\| ($tempo[$i] eq 'th')) {
	$signal = 1;
}	}
}	}
if ($signal) {	if ($signal eq 1) {
$currentstring .= ' \vskip 0 mm ';	$currentstring .= ' \vskip 0 mm ';
} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {	} else {
$currentstring .= '\strut \\\\ \strut ';	$currentstring .= '\strut \\\\ \strut ';
}	}

}	}
return $currentstring;	return $currentstring;
}	}
Line 1177 sub start_br {	Line 1238 sub start_br {
sub end_br {	sub end_br {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 1187 sub end_br {	Line 1248 sub end_br {
sub start_big {	sub start_big {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '{\large ';	$currentstring .= '{\large ';
Line 1198 sub start_big {	Line 1259 sub start_big {
sub end_big {	sub end_big {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 1210 sub end_big {	Line 1271 sub end_big {
sub start_small {	sub start_small {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '{\footnotesize ';	$currentstring .= '{\footnotesize ';
Line 1221 sub start_small {	Line 1282 sub start_small {
sub end_small {	sub end_small {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}';	$currentstring .= '}';
Line 1233 sub end_small {	Line 1294 sub end_small {
sub start_basefont {	sub start_basefont {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
Line 1247 sub start_basefont {	Line 1308 sub start_basefont {
sub end_basefont {	sub end_basefont {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
Line 1262 sub end_basefont {	Line 1323 sub end_basefont {
sub start_font {	sub start_font {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
if ($face!~/symbol/i) {	if ($face!~/symbol/i) {
if (($ENV{'browser.fontenhance'} eq 'on') \|\|	if (($env{'browser.fontenhance'} eq 'on') \|\|
($ENV{'browser.blackwhite'} eq 'on')) { return ''; }	($env{'browser.blackwhite'} eq 'on')) { return ''; }
}	}
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 1281 sub start_font {	Line 1342 sub start_font {
sub end_font {	sub end_font {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
Line 1296 sub end_font {	Line 1357 sub end_font {
sub start_strike {	sub start_strike {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
Line 1307 sub start_strike {	Line 1368 sub start_strike {
sub end_strike {	sub end_strike {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring=&Apache::lonxml::endredirection();	$currentstring=&Apache::lonxml::endredirection();
Line 1322 sub end_strike {	Line 1383 sub end_strike {
sub start_s {	sub start_s {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
Line 1333 sub start_s {	Line 1394 sub start_s {
sub end_s {	sub end_s {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring=&Apache::lonxml::endredirection();	$currentstring=&Apache::lonxml::endredirection();
Line 1348 sub end_s {	Line 1409 sub end_s {
sub start_sub {	sub start_sub {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\ensuremath{_{';	$currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1359 sub start_sub {	Line 1420 sub start_sub {
sub end_sub {	sub end_sub {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}}';	$currentstring .= '}}';
Line 1371 sub end_sub {	Line 1432 sub end_sub {
sub start_sup {	sub start_sup {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\ensuremath{^{';	$currentstring .= '\raisebox{\smallskipamount}{\scriptsize{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1382 sub start_sup {	Line 1443 sub start_sup {
sub end_sup {	sub end_sup {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}}';	$currentstring .= '}}';
Line 1393 sub end_sup {	Line 1454 sub end_sup {
#-- <hr> tag (end tag forbidden)	#-- <hr> tag (end tag forbidden)
sub start_hr {	sub start_hr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);	my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
Line 1424 sub start_hr {	Line 1485 sub start_hr {
sub end_hr {	sub end_hr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
}	}
return $currentstring;	return $currentstring;
}	}

#-- <div> tag (end tag required)	#-- <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 {	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];	$currentstring .= $token->[4];
}	}
	if ($target eq 'tex') {
	# 4 possible alignments: left, right, center, and -missing-.

	my $endstring = '';

	my $align = lc(&Apache::lonxml::get_param('align', $parstack,
	$safeeval, undef, 1));
	if ($align eq 'center') {
	$currentstring .= '\begin{center}';
	$endstring = '\end{center}';
	if (&is_inside_of($tagstack, "table")) {
	$currentstring = &center_correction().$currentstring;
	}
	}
	elsif ($align eq 'right') {
	$currentstring .= '\begin{flushright}';
	$endstring .= '\end{flushright}';
	} elsif ($align eq 'left') {
	$currentstring .= '\begin{flushleft}';
	$endstring = '\end{flushleft}';
	} else {

	}
	$currentstring .= "\n"; # For human readability.
	$endstring = "\n$endstring\n"; # For human readability
	push(@div_end_stack, $endstring);
	}
return $currentstring;	return $currentstring;
}	}

sub end_div {	sub end_div {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
}	}
	if ($target eq 'tex') {
	my $endstring = pop @div_end_stack;
	$currentstring .= $endstring;
	}
return $currentstring;	return $currentstring;
}	}
	}

#-- <a> tag (end tag required)	#-- <a> tag (end tag required)
sub start_a {	sub start_a {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	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 ($a=~/\S/) {
$a=~s/([^\\])%/$1\\\%/g;
$currentstring .= '\ref{URI: '.$a.'}';
} elsif ($b=~/\S/) {
$currentstring .= '\ref{Anchor: '.$b.'}';
} else {
$currentstring.='';
}
}	}
return $currentstring;	return $currentstring;
}	}
Line 1473 sub start_a {	Line 1565 sub start_a {
sub end_a {	sub end_a {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$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);
	if ($href =~ /\S/) {
	$href =~ s/([^\\])%/$1\\\%/g;
	$currentstring .= ' ({\tt URI:'.&Apache::lonxml::latex_special_symbols($href).'})';
	} elsif ($name =~ /\S/) {
	$currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
	} else {
	$currentstring.='';
	}
	}
return $currentstring;	return $currentstring;
}	}

Line 1483 sub end_a {	Line 1589 sub end_a {
sub start_li {	sub start_li {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
Line 1513 sub start_li {	Line 1619 sub start_li {

sub end_li {	sub end_li {
my ($target,$token) = @_;	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;	return $currentstring;
}	}
Line 1524 sub end_li {	Line 1630 sub end_li {
sub start_u {	sub start_u {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
Line 1535 sub start_u {	Line 1641 sub start_u {
sub end_u {	sub end_u {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring=&Apache::lonxml::endredirection();	$currentstring=&Apache::lonxml::endredirection();
Line 1549 sub end_u {	Line 1655 sub end_u {
#-- <ul> tag (end tag required)	#-- <ul> tag (end tag required)
sub start_ul {	sub start_ul {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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') {	} elsif ($target eq 'tex') {
my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);	my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
$Apache::londefdef::list_index=0;	$Apache::londefdef::list_index=0;
Line 1579 sub start_ul {	Line 1685 sub start_ul {
sub end_ul {	sub end_ul {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'.	$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'.
Line 1594 sub end_ul {	Line 1700 sub end_ul {
sub start_menu {	sub start_menu {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = " \\begin{itemize} ";	$currentstring = " \\begin{itemize} ";
Line 1605 sub start_menu {	Line 1711 sub start_menu {
sub end_menu {	sub end_menu {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = " \\end{itemize}";	$currentstring = " \\end{itemize}";
Line 1616 sub end_menu {	Line 1722 sub end_menu {
#-- <dir> tag (end tag required)	#-- <dir> tag (end tag required)
sub start_dir {	sub start_dir {
my ($target,$token) = @_;	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') {	} elsif ($target eq 'tex') {
$currentstring = " \\begin{itemize} ";	$currentstring .= " \\begin{itemize} ";
}	}
return $currentstring;	return $currentstring;
}	}
Line 1628 sub start_dir {	Line 1734 sub start_dir {
sub end_dir {	sub end_dir {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = " \\end{itemize}";	$currentstring = " \\end{itemize}";
Line 1639 sub end_dir {	Line 1745 sub end_dir {
#-- <ol> tag (end tag required)	#-- <ol> tag (end tag required)
sub start_ol {	sub start_ol {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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') {	} elsif ($target eq 'tex') {
$Apache::londefdef::list_index=0;	$Apache::londefdef::list_index=0;
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
Line 1679 sub start_ol {	Line 1785 sub start_ol {
sub end_ol {	sub end_ol {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'.	$currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'.
Line 1693 sub end_ol {	Line 1799 sub end_ol {
#-- <dl> tag (end tag required)	#-- <dl> tag (end tag required)
sub start_dl {	sub start_dl {
my ($target,$token) = @_;	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') {	} 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;	return $currentstring;
}	}
Line 1708 sub start_dl {	Line 1816 sub start_dl {
sub end_dl {	sub end_dl {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} 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.' ';	$currentstring.=' '.$element.' ';
}	}
@Apache::londefdef::description=();	pop(@Apache::londefdef::description);
$currentstring.='\end{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;	return $currentstring;
}	}
Line 1731 sub end_dl {	Line 1838 sub end_dl {
sub start_dt {	sub start_dt {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring='';	my $currentstring='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} 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::lonxml::startredirection();
$Apache::londefdef::DT_redirection=1;	$Apache::londefdef::DT[-1]++;
	$Apache::londefdef::seenDT[-1]=1;
}	}
return $currentstring;	return $currentstring;
}	}
Line 1751 sub start_dt {	Line 1853 sub start_dt {
sub end_dt {	sub end_dt {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} 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;	return $currentstring;
}	}
Line 1772 sub item_cleanup {	Line 1876 sub item_cleanup {
sub start_dd {	sub start_dd {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} 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();	&Apache::lonxml::startredirection();
}	}
return $currentstring;	return $currentstring;
Line 1789 sub start_dd {	Line 1895 sub start_dd {
sub end_dd {	sub end_dd {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} 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;	return $currentstring;
}	}

#-- <table> tag (end tag required)	#-- <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	#list of supported attributes: border,width,TeXwidth
sub start_table {	sub start_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my ($textwidth,$currentstring)=('','');	my $textwidth = '';
if ($target eq 'web') {	my $currentstring = &end_p();
$currentstring = $token->[4];	if ($target eq 'web' \|\| $target eq 'webgrade') {
	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $aa = {};	push(@Apache::londefdef::table, {});
push @Apache::londefdef::table, $aa;
$Apache::londefdef::table[-1]{'row_number'} = -1;	$Apache::londefdef::table[-1]{'row_number'} = -1;
#maximum table's width (default coincides with text line length)	#maximum table's width (default coincides with text line length)
if ($#Apache::londefdef::table==0) {	if ($#Apache::londefdef::table==0) {
$textwidth=&recalc($ENV{'form.textwidth'}); #result is always in mm	$textwidth=&recalc($env{'form.textwidth'}); #result is always in mm
$textwidth=~/(\d+\.?\d*)/;	$textwidth=~/(\d+\.?\d*)/;
$textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame	$textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame
} else {	} else {
Line 1826 sub start_table {	Line 1938 sub start_table {
}	}
}	}
}	}

	# width either comes forced from the TeXwidth or the width parameters.
	# in either case it can be a percentage or absolute width.
	# in the width case we ignore absolute width
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);	my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
if (not defined $TeXwidth) {	if (!defined($TeXwidth)) {
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);	my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,
if ($htmlwidth=~/%/) {	$safeeval,undef,1);
$Apache::londefdef::table[-1]{'percent'}=1;	if ($htmlwidth =~ /%/) {
$htmlwidth=~/(\d+)/;	$TeXwidth = $htmlwidth;
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;;	} else {
} else {	$TeXwidth = $textwidth;
$Apache::londefdef::table[-1]{'width'}=$textwidth;
}	}
} elsif ($TeXwidth=~/%/) {	} else {
	$Apache::londefdef::table[-1]{'forcedtablewidth'} = 1;
	}
	if ($TeXwidth=~/%/) {
$Apache::londefdef::table[-1]{'percent'}=1;	$Apache::londefdef::table[-1]{'percent'}=1;
$TeXwidth=~/(\d+)/;	$TeXwidth=~/(\d+)/;
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;	$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
} else {	} else {
$Apache::londefdef::table[-1]{'forcetablewidth'}=1;
$Apache::londefdef::table[-1]{'width'}=$TeXwidth;	$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	#table's border
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);	my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
Line 1858 sub start_table {	Line 1981 sub start_table {
$Apache::londefdef::table[-1]{'vvinc'} = '';	$Apache::londefdef::table[-1]{'vvinc'} = '';
}	}
if ($#Apache::londefdef::table==0) {	if ($#Apache::londefdef::table==0) {
$Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}';	# Note that \newline seems to destroy the alignment envs.
	# $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}';
	$Apache::londefdef::table[-1]{'output'}='\strut'.'\\\\'."\n".'\strut\setlength{\tabcolsep}{1 mm}';
}	}
$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';	$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';
$Apache::londefdef::table[-1]{'TeXlen'}=[];	$Apache::londefdef::table[-1]{'TeXlen'}=[];
Line 1868 sub start_table {	Line 1993 sub start_table {
$Apache::londefdef::table[-1]{'minlen'}=[];	$Apache::londefdef::table[-1]{'minlen'}=[];
$Apache::londefdef::table[-1]{'content'}=[];	$Apache::londefdef::table[-1]{'content'}=[];
$Apache::londefdef::table[-1]{'align'}=[];	$Apache::londefdef::table[-1]{'align'}=[];
$currentstring='\keephidden{NEW TABLE ENTRY}';	$currentstring.=' \keephidden{NEW TABLE ENTRY}';
}

	}
return $currentstring;	return $currentstring;
}	}

sub end_table {	sub end_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $inmemory = '';	my $inmemory = '';
my $output = '';	my $output = '';
my $WARNING='';	my $WARNING='';
#width of columns from TeXwidth attributes	#width of columns from TeXwidth attributes

for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {	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]) {	if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {
Line 1903 sub end_table {	Line 2031 sub end_table {
#boundaries for contents columns	#boundaries for contents columns
my @min_len=();#columns can not be narrower	my @min_len=();#columns can not be narrower
my @max_len=();#maximum length of column	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);	my ($localmin,$localmax)=(0,0);
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) {	if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) {
Line 1915 sub end_table {	Line 2046 sub end_table {
}	}
push @min_len, $localmin;	push @min_len, $localmin;
push @max_len, $localmax;	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,;	my $localmin=0,;
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {	if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {
Line 1935 sub end_table {	Line 2086 sub end_table {
$min_len[$jn]=0;	$min_len[$jn]=0;
$max_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	#final adjustment of column width
my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array	my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
Line 2003 sub end_table {	Line 2164 sub end_table {
$fwidth[$jn]=$max_len[$jn];	$fwidth[$jn]=$max_len[$jn];
$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];	$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];
$adjust[$jn]=0;	$adjust[$jn]=0;

}	}
}	}
if ($acsessive>0) {	if ($acsessive>0) {
Line 2063 sub end_table {	Line 2225 sub end_table {
$header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'};	$header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'};
}	}
$header_of_table .= '}';	$header_of_table .= '}';

#fill the table	#fill the table
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
	my $have_rowspan = 0;
for (my $jn=0;$jn<=$#fwidth;$jn++) {	for (my $jn=0;$jn<=$#fwidth;$jn++) {
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
$output.='\vspace*{-6 mm}\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 $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 .= '{\|c\|}{';
	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
	$output .= '{\|r\|}{';
	}
	else {
	$output .= "{\|p{$spanwidth mm}\|}{";
	}

	} 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}{\|c\|}{';
	$multirow_aligned = 1;
	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
	$output .= '\multicolumn{1}{\|r\|}{';
	$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\s0pt\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}{\|c\|}{';
	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
	$output .= '\multicolumn{1}{\|r\|}{';
	}
	}

$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];	$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
$output.='\end{center}\vspace*{-6 mm}';	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'};}	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'}.' ';
	}
}	}
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';	# 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 ';
	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut'.'\\\\'."\n".'\strut ';
if ($#Apache::londefdef::table > 0) {	if ($#Apache::londefdef::table > 0) {
my $inmemory = $Apache::londefdef::table[-1]{'output'};	my $inmemory = $Apache::londefdef::table[-1]{'output'};
	# Figure out max/and min width by summing us and then
	# apply that to the current column of the table we nest in
	# if it's larger than the current width or the current width
	# is undefined.
	#
	my $min_nested_width = 0;
	my $max_nested_width = 0;
	for (my $col = 0; $col <= $Apache::londefdef::table[-1]{'counter_columns'}; $col++) {
	$min_nested_width += $min_len[$col];
	$max_nested_width += $max_len[$col];

	}
	# Fudge in an extra 5 mm for borders etc:

	$min_nested_width += 5;
	$max_nested_width += 5;

	my $outer_column = $Apache::londefdef::table[-2]{'counter_columns'};
	my $outer_row = $Apache::londefdef::table[-2]{'row_number'};
	if ($min_nested_width > $Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column]) {
	$Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column] = $min_nested_width;
	}
	if ($max_nested_width > $Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column]) {
	$Apache::londefdef::table[-2]{'maxlen'}[$outer_row][$outer_column] = $max_nested_width;
	}

pop @Apache::londefdef::table;	pop @Apache::londefdef::table;
push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;	push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;
} else {	} else {
Line 2099 sub end_table {	Line 2410 sub end_table {
sub start_tr {	sub start_tr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::table[-1]{'row_number'}++;	$Apache::londefdef::table[-1]{'row_number'}++;
Line 2110 sub start_tr {	Line 2421 sub start_tr {
push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';	push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';
}	}
push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});	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]{'counter_columns'} = -1;
push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];	push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];
push @ {$Apache::londefdef::table[-1]{'objectlen'}}, [];	push @ {$Apache::londefdef::table[-1]{'objectlen'}}, [];
Line 2122 sub start_tr {	Line 2437 sub start_tr {

sub end_tr {	sub end_tr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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') {	} elsif ($target eq 'tex') {
if ($Apache::londefdef::TD_redirection) {	if ($Apache::londefdef::TD_redirection) {
&end_td_tex($parstack,$parser,$safeeval);	&end_td_tex($parstack,$parser,$safeeval);
}	}
	# Counter columns must be the maximum number of columns seen
	# in the table so far so:
	if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) {
	$Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'};
	}



}	}
return $currentstring;	return $currentstring;
}	}
Line 2137 sub end_tr {	Line 2460 sub end_tr {
sub start_td {	sub start_td {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::TD_redirection = 1;	$Apache::londefdef::TD_redirection = 1;
Line 2183 sub start_td_tex {	Line 2506 sub start_td_tex {

sub end_td_tex {	sub end_td_tex {
my ($parstack,$parser,$safeeval) = @_;	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);	my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
if (defined $TeXwidth) {	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 {	} else {
if (($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt))/) or ($data=~m/\[(\d+\.?\d)\s*mm\]/)) {	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 $garbage_data=$data;
Line 2205 sub end_td_tex {	Line 2573 sub end_td_tex {
if ($fwidth<$current_length) {$fwidth=$current_length;}	if ($fwidth<$current_length) {$fwidth=$current_length;}
$garbage_data=~s/\[(\d+\.?\d)\smm\]//;	$garbage_data=~s/\[(\d+\.?\d)\smm\]//;
}	}
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)/) {	} 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 $garbage_data=$data;
my $fwidth=0;	my $fwidth=0;
Line 2224 sub end_td_tex {	Line 2594 sub end_td_tex {
if ($fwidth<$1) {$fwidth=$1;}	if ($fwidth<$1) {$fwidth=$1;}
$garbage_data=~s/\\epsfxsize\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)//;	$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*$//;	$data=~s/\\\\\s*$//;
} else {	} else {
$data=~s/^\s+(\S.*)/$1/;	$data=~s/^\s+(\S.*)/$1/;
Line 2255 sub end_td_tex {	Line 2627 sub end_td_tex {
if ($min_length<$lengthword) {$min_length=$lengthword;}	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;
	}
}	}
}	}
for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {	# Substitute all of the tables nested in this cell in their appropriate places.
$data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
}
	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;	push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
return'';



	# 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 {	sub end_td {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::TD_redirection =0;	$Apache::londefdef::TD_redirection =0;
Line 2284 sub end_td {	Line 2690 sub end_td {
sub start_th {	sub start_th {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::TD_redirection = 1;	$Apache::londefdef::TD_redirection = 1;
Line 2399 sub end_th_tex {	Line 2805 sub end_th_tex {

sub end_th {	sub end_th {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close any open <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') {	} elsif ($target eq 'tex') {
$Apache::londefdef::TD_redirection =0;	$Apache::londefdef::TD_redirection =0;
&end_th_tex($parstack,$parser,$safeeval);	&end_th_tex($parstack,$parser,$safeeval);
Line 2410 sub end_th {	Line 2816 sub end_th {
}	}

#-- <img> tag (end tag forbidden)	#-- <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 {	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,	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
undef,1);	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')
	) {
	my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);
return '';	return '';
}	}
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;	&Apache::lonxml::extlink($src);
my $currentstring = '';	my $currentstring = '';
my $scaling = .3;	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];
	if ($target eq 'web' \|\| $target eq 'webgrade') {
	if ($env{'browser.imagesuppress'} ne 'on') {
	my $enc = ('yes' eq
	lc(&Apache::lonxml::get_param('encrypturl',$parstack,
	$safeeval)));
	$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
	$enc);
} else {	} 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.']';	$currentstring.='[IMAGE: '.$alttag.']';
}	}

	# and render unto TeX that which is LaTeX

} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $oldSRC=$src;	#
$oldSRC=~s/\.(gif\|jpg\|png)$/\.eps/;	# The alignment will require some superstructure to be put around
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);	# the \includegraphics stuff. At present we can only partially
	# simulate the alignments offered by html.
	#
	#
	my $align = lc(&Apache::lonxml::get_param('align',
	$parstack,
	$safeeval,
	undef,1));
	if(!$align) {
	$align = "bottom"; # This is html's default so it's ours too.
	}
	#
	&Apache::lonxml::debug("Alignemnt = $align");
	# LaTeX's image/text wrapping is really bad since it wants to
	# make figures float.
	# The user has the optional parameter (applicable only to l/r
	# alignment to use the picins/parpic directive to get wrapped text
	# this is also imperfect.. that's why we give them a choice...
	# so they can't yell at us for our choice.
	#
	my $latex_rendering = &Apache::lonxml::get_param('TeXwrap',
	$parstack,
	$safeeval,
	undef,0);
	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
	if(!$latex_rendering) {
	$latex_rendering = "texwrap";
	}
	# using texwrap inside a table does not work. So, if after all of this,
	# texwrap is on, we turn it off if we detect we're in a table:
	#
	if (($latex_rendering eq 'texwrap') && &is_inside_of($tagstack, "table")) {
	$latex_rendering = 'parpic';
	}

	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");

#if original gif/jpg/png file exist do following:	#if original 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) {	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,'; }
my $dummy_content=&Apache::lonnet::getfile($oldSRC);	if ($height_param) { $size.='height='.$height_param.' mm]'; }
$file=~s/\.(gif\|jpg\|png)$/.eps/i;	# Default size if not able to extract that (e.g. eps image).
#where can we find the picture?
if (-e $newsrc) {	# &Apache::lonnet::logthis("Size = $size");
#eps counterpart for image exist
if ($path) {	$size='['.$size;
$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';	$size=~s/,$/]/;
}	$currentstring .= '\graphicspath{{'.$path.'}}'
} else {	.'\includegraphics'.$size.'{'.$file.'} ';
#there is no eps counterpart for image - check for ps one	my $closure;
$newsrc =~ s/\.eps$/\.ps/;	($currentstring, $closure) = &align_latex_image($align,
if (-e $newsrc) {	$latex_rendering,
#ps counterpart for image exist	$currentstring,
$file =~ s/\.eps$/\.ps/;	$width_param,
if ($path) {	$height_param);
$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';	$currentstring .= $closure;
}
} else {
#care about eps dynamical generation
$currentstring.='\vskip 1 mm '.&eps_generation($src,$file,$width_param);
}
}
} else {	} else {
	&Apache::lonxml::debug("$src does not exist");
#original image file doesn't exist so check the alt attribute	#original image file doesn't exist so check the alt attribute
my $alt =	my $alt =
&Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);	&Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
Line 2474 sub start_img {	Line 2939 sub start_img {
$alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);	$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') {	} elsif ($target eq 'edit') {
$currentstring .=&Apache::edit::tag_start($target,$token);	$currentstring .=&Apache::edit::tag_start($target,$token);
$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).	$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
Line 2492 sub start_img {	Line 2956 sub start_img {
$currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5);	$currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5);
$currentstring .=&Apache::edit::select_arg('Alignment:','align',	$currentstring .=&Apache::edit::select_arg('Alignment:','align',
['','bottom','middle','top','left','right'],$token,5);	['','bottom','middle','top','left','right'],$token,5);
	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
	['', '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();	$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 $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);


$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';	$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
if ($width) { $currentstring.=' width="'.$width.'" '; }	if ($width) { $currentstring.=' width="'.$width.'" '; }
if ($height) { $currentstring.=' height="'.$height.'" '; }	if ($height) { $currentstring.=' height="'.$height.'" '; }
Line 2506 sub start_img {	Line 2976 sub start_img {
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});	($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
my $ctag=&Apache::edit::get_new_args($token,$parstack,	my $ctag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'src','alt','align',	$safeeval,'src','alt','align',
'TeXwidth','TeXheight',	'TeXwidth','TeXheight', 'TeXwrap',
'width','height');	'width','height','encrypturl');
my ($nsrc,$nwidth,$nheight)=	my ($nsrc,$nwidth,$nheight)=
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});	($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc);	my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc);
Line 2542 sub start_img {	Line 3012 sub start_img {
}	}
if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);}	if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);}
}	}

return $currentstring;	return $currentstring;
}	}

sub end_img {	sub end_img {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '';	$currentstring = '';
Line 2561 sub start_applet {	Line 3032 sub start_applet {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;

my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,undef,1);	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,	my $archive=&Apache::lonxml::get_param('archive',$parstack,$safeeval,
undef,1);	undef,1);
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$archive;	&Apache::lonxml::extlink($archive);

my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
if ($ENV{'browser.appletsuppress'} ne 'on') {	if ($env{'browser.appletsuppress'} ne 'on') {
$currentstring = $token->[4];	$currentstring = &Apache::lonenc::encrypt_ref($token,
	{'code'=>$code,
	'archive'=>$archive}
	);
} else {	} else {
my $alttag= &Apache::lonxml::get_param('alt',$parstack,	my $alttag= &Apache::lonxml::get_param('alt',$parstack,
$safeeval,undef,1);	$safeeval,undef,1);
Line 2598 sub start_applet {	Line 3070 sub start_applet {
sub end_applet {	sub end_applet {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
}	}
Line 2609 sub end_applet {	Line 3081 sub end_applet {
sub start_embed {	sub start_embed {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	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 = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
if ($ENV{'browser.embedsuppress'} ne 'on') {	if ($env{'browser.embedsuppress'} ne 'on') {
$currentstring = $token->[4];	$currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
} else {	} else {
my $alttag=&Apache::lonxml::get_param	my $alttag=&Apache::lonxml::get_param
('alt',$parstack,$safeeval,undef,1);	('alt',$parstack,$safeeval,undef,1);
Line 2630 sub start_embed {	Line 3102 sub start_embed {
sub end_embed {	sub end_embed {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
}	}
Line 2640 sub end_embed {	Line 3112 sub end_embed {
#-- <param> tag (end tag forbidden)	#-- <param> tag (end tag forbidden)
sub start_param {	sub start_param {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
if (&Apache::lonxml::get_param	if (&Apache::lonxml::get_param('name',$parstack,
('name',$parstack,$safeeval,undef,1)=~/^cabbase$/i) {	$safeeval,undef,1)=~/^cabbase$/i) {
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=	my $value=&Apache::lonxml::get_param('value',$parstack,
&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,1);	$safeeval,undef,1);
}	&Apache::lonxml::extlink($value);
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=	}
&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
	&Apache::lonxml::extlink($src);
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	my %toconvert;
	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
	if ($src) { $toconvert{'src'}= $src; }
	my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval,
	undef,1);
	if ($name=~/^cabbase$/i) {
	$toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack,
	$safeeval,undef,1);
	}
	$currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert);
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
}	}
return $currentstring;	return $currentstring;
Line 2658 sub start_param {	Line 3141 sub start_param {
sub end_param {	sub end_param {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
}	}
Line 2669 sub end_param {	Line 3152 sub end_param {
sub start_allow {	sub start_allow {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	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;	my $result;
if ($target eq 'edit') {	if ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);	$result .=&Apache::edit::tag_start($target,$token);
Line 2696 sub end_allow {	Line 3178 sub end_allow {
#-- <frameset>	#-- <frameset>
sub start_frameset {	sub start_frameset {
my ($target,$token) = @_;	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;	return $currentstring;
}	}
Line 2733 sub start_frameset {	Line 3195 sub start_frameset {
sub end_frameset {	sub end_frameset {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 2743 sub end_frameset {	Line 3205 sub end_frameset {
sub start_xmp {	sub start_xmp {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\begin{verbatim}';	$currentstring .= '\begin{verbatim}';
Line 2754 sub start_xmp {	Line 3216 sub start_xmp {
sub end_xmp {	sub end_xmp {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\end{verbatim}';	$currentstring .= '\end{verbatim}';
Line 2765 sub end_xmp {	Line 3227 sub end_xmp {
#-- <pre> (end tag required)	#-- <pre> (end tag required)
sub start_pre {	sub start_pre {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	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];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\begin{verbatim}';	$currentstring .= '\begin{verbatim}';
	&Apache::lonxml::disable_LaTeX_substitutions();
}	}
return $currentstring;	return $currentstring;
}	}
Line 2777 sub start_pre {	Line 3240 sub start_pre {
sub end_pre {	sub end_pre {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\end{verbatim}';	$currentstring .= '\end{verbatim}';
	&Apache::lonxml::enable_LaTeX_substitutions();
}	}
return $currentstring;	return $currentstring;
}	}
Line 2789 sub end_pre {	Line 3253 sub end_pre {
sub start_insert {	sub start_insert {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);	my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
$currentstring .= '<b>'.$display.'</b>';;	$currentstring .= '<b>'.$display.'</b>';;
}	}
Line 2799 sub start_insert {	Line 3263 sub start_insert {
sub end_insert {	sub end_insert {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= '';	$currentstring .= '';
}	}
return $currentstring;	return $currentstring;
Line 2809 sub end_insert {	Line 3273 sub end_insert {
sub start_externallink {	sub start_externallink {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);	my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
$currentstring .= '<b>'.$display.'</b>';;	$currentstring .= '<b>'.$display.'</b>';;
}	}
Line 2819 sub start_externallink {	Line 3283 sub start_externallink {
sub end_externallink {	sub end_externallink {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= '';	$currentstring .= '';
}	}
return $currentstring;	return $currentstring;
Line 2828 sub end_externallink {	Line 3292 sub end_externallink {
#-- <blankspace heigth="">	#-- <blankspace heigth="">
sub start_blankspace {	sub start_blankspace {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # closes off any unclosed <p>
if ($target eq 'tex') {	if ($target eq 'tex') {
my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);	my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
$currentstring .= '\vskip '.$howmuch.' ';	$currentstring .= '\vskip '.$howmuch.' ';
Line 2849 sub end_blankspace {	Line 3313 sub end_blankspace {
sub start_abbr {	sub start_abbr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 2858 sub start_abbr {	Line 3322 sub start_abbr {
sub end_abbr {	sub end_abbr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 2868 sub end_abbr {	Line 3332 sub end_abbr {
sub start_acronym {	sub start_acronym {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 2877 sub start_acronym {	Line 3341 sub start_acronym {
sub end_acronym {	sub end_acronym {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 2887 sub end_acronym {	Line 3351 sub end_acronym {
sub start_area {	sub start_area {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 2896 sub start_area {	Line 3360 sub start_area {
sub end_area {	sub end_area {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 2906 sub end_area {	Line 3370 sub end_area {
sub start_base {	sub start_base {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 2915 sub start_base {	Line 3379 sub start_base {
sub end_base {	sub end_base {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 2925 sub end_base {	Line 3389 sub end_base {
sub start_bdo {	sub start_bdo {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 2934 sub start_bdo {	Line 3398 sub start_bdo {
sub end_bdo {	sub end_bdo {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 2944 sub end_bdo {	Line 3408 sub end_bdo {
sub start_bgsound {	sub start_bgsound {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 2953 sub start_bgsound {	Line 3417 sub start_bgsound {
sub end_bgsound {	sub end_bgsound {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 2963 sub end_bgsound {	Line 3427 sub end_bgsound {
sub start_blink {	sub start_blink {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 2972 sub start_blink {	Line 3436 sub start_blink {
sub end_blink {	sub end_blink {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 2981 sub end_blink {	Line 3445 sub end_blink {
#-- <blockquote> tag (end tag required)	#-- <blockquote> tag (end tag required)
sub start_blockquote {	sub start_blockquote {
my ($target,$token) = @_;	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;	return $currentstring;
}	}

sub end_blockquote {	sub end_blockquote {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
	if ($target eq 'tex') {
	$currentstring = '\end{quote}';
	}
return $currentstring;	return $currentstring;
}	}

Line 3001 sub end_blockquote {	Line 3471 sub end_blockquote {
sub start_button {	sub start_button {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3010 sub start_button {	Line 3480 sub start_button {
sub end_button {	sub end_button {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3020 sub end_button {	Line 3490 sub end_button {
sub start_caption {	sub start_caption {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3029 sub start_caption {	Line 3499 sub start_caption {
sub end_caption {	sub end_caption {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3039 sub end_caption {	Line 3509 sub end_caption {
sub start_col {	sub start_col {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3048 sub start_col {	Line 3518 sub start_col {
sub end_col {	sub end_col {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3058 sub end_col {	Line 3528 sub end_col {
sub start_colgroup {	sub start_colgroup {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3067 sub start_colgroup {	Line 3537 sub start_colgroup {
sub end_colgroup {	sub end_colgroup {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3077 sub end_colgroup {	Line 3547 sub end_colgroup {
sub start_del {	sub start_del {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3086 sub start_del {	Line 3556 sub start_del {
sub end_del {	sub end_del {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3096 sub end_del {	Line 3566 sub end_del {
sub start_fieldset {	sub start_fieldset {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3105 sub start_fieldset {	Line 3575 sub start_fieldset {
sub end_fieldset {	sub end_fieldset {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3115 sub end_fieldset {	Line 3585 sub end_fieldset {
sub start_frame {	sub start_frame {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3124 sub start_frame {	Line 3594 sub start_frame {
sub end_frame {	sub end_frame {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3134 sub end_frame {	Line 3604 sub end_frame {
sub start_iframe {	sub start_iframe {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3143 sub start_iframe {	Line 3613 sub start_iframe {
sub end_iframe {	sub end_iframe {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3153 sub end_iframe {	Line 3623 sub end_iframe {
sub start_ins {	sub start_ins {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3162 sub start_ins {	Line 3632 sub start_ins {
sub end_ins {	sub end_ins {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3172 sub end_ins {	Line 3642 sub end_ins {
sub start_isindex {	sub start_isindex {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3181 sub start_isindex {	Line 3651 sub start_isindex {
sub end_isindex {	sub end_isindex {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3191 sub end_isindex {	Line 3661 sub end_isindex {
sub start_keygen {	sub start_keygen {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3200 sub start_keygen {	Line 3670 sub start_keygen {
sub end_keygen {	sub end_keygen {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3210 sub end_keygen {	Line 3680 sub end_keygen {
sub start_label {	sub start_label {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3219 sub start_label {	Line 3689 sub start_label {
sub end_label {	sub end_label {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3229 sub end_label {	Line 3699 sub end_label {
sub start_layer {	sub start_layer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3238 sub start_layer {	Line 3708 sub start_layer {
sub end_layer {	sub end_layer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3248 sub end_layer {	Line 3718 sub end_layer {
sub start_legend {	sub start_legend {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3257 sub start_legend {	Line 3727 sub start_legend {
sub end_legend {	sub end_legend {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3265 sub end_legend {	Line 3735 sub end_legend {

#-- <link> tag (end tag forbidden)	#-- <link> tag (end tag forbidden)
sub start_link {	sub start_link {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	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);
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3276 sub start_link {	Line 3749 sub start_link {
sub end_link {	sub end_link {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3286 sub end_link {	Line 3759 sub end_link {
sub start_marquee {	sub start_marquee {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3295 sub start_marquee {	Line 3768 sub start_marquee {
sub end_marquee {	sub end_marquee {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3304 sub end_marquee {	Line 3777 sub end_marquee {
#-- <multicol> tag (end tag required)	#-- <multicol> tag (end tag required)
sub start_multicol {	sub start_multicol {
my ($target,$token) = @_;	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;	return $currentstring;
}	}
Line 3314 sub start_multicol {	Line 3787 sub start_multicol {
sub end_multicol {	sub end_multicol {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3324 sub end_multicol {	Line 3797 sub end_multicol {
sub start_nobr {	sub start_nobr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring='\mbox{';	$currentstring='\mbox{';
Line 3335 sub start_nobr {	Line 3808 sub start_nobr {
sub end_nobr {	sub end_nobr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring='}';	$currentstring='}';
Line 3347 sub end_nobr {	Line 3820 sub end_nobr {
sub start_noembed {	sub start_noembed {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3356 sub start_noembed {	Line 3829 sub start_noembed {
sub end_noembed {	sub end_noembed {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3366 sub end_noembed {	Line 3839 sub end_noembed {
sub start_noframes {	sub start_noframes {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3375 sub start_noframes {	Line 3848 sub start_noframes {
sub end_noframes {	sub end_noframes {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3385 sub end_noframes {	Line 3858 sub end_noframes {
sub start_nolayer {	sub start_nolayer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3394 sub start_nolayer {	Line 3867 sub start_nolayer {
sub end_nolayer {	sub end_nolayer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3404 sub end_nolayer {	Line 3877 sub end_nolayer {
sub start_noscript {	sub start_noscript {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3413 sub start_noscript {	Line 3886 sub start_noscript {
sub end_noscript {	sub end_noscript {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3423 sub end_noscript {	Line 3896 sub end_noscript {
sub start_object {	sub start_object {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3432 sub start_object {	Line 3905 sub start_object {
sub end_object {	sub end_object {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3442 sub end_object {	Line 3915 sub end_object {
sub start_optgroup {	sub start_optgroup {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3451 sub start_optgroup {	Line 3924 sub start_optgroup {
sub end_optgroup {	sub end_optgroup {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3461 sub end_optgroup {	Line 3934 sub end_optgroup {
sub start_samp {	sub start_samp {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring='\texttt{';	$currentstring='\texttt{';
Line 3472 sub start_samp {	Line 3945 sub start_samp {
sub end_samp {	sub end_samp {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring='}';	$currentstring='}';
Line 3484 sub end_samp {	Line 3957 sub end_samp {
sub start_server {	sub start_server {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3493 sub start_server {	Line 3966 sub start_server {
sub end_server {	sub end_server {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3502 sub end_server {	Line 3975 sub end_server {
#-- <spacer> tag (end tag forbidden)	#-- <spacer> tag (end tag forbidden)
sub start_spacer {	sub start_spacer {
my ($target,$token) = @_;	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;	return $currentstring;
}	}
Line 3512 sub start_spacer {	Line 3985 sub start_spacer {
sub end_spacer {	sub end_spacer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3522 sub end_spacer {	Line 3995 sub end_spacer {
sub start_span {	sub start_span {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3531 sub start_span {	Line 4004 sub start_span {
sub end_span {	sub end_span {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3541 sub end_span {	Line 4014 sub end_span {
sub start_tbody {	sub start_tbody {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3550 sub start_tbody {	Line 4023 sub start_tbody {
sub end_tbody {	sub end_tbody {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3560 sub end_tbody {	Line 4033 sub end_tbody {
sub start_tfoot {	sub start_tfoot {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3569 sub start_tfoot {	Line 4042 sub start_tfoot {
sub end_tfoot {	sub end_tfoot {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3579 sub end_tfoot {	Line 4052 sub end_tfoot {
sub start_thead {	sub start_thead {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3588 sub start_thead {	Line 4061 sub start_thead {
sub end_thead {	sub end_thead {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3598 sub end_thead {	Line 4071 sub end_thead {
sub start_var {	sub start_var {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '\textit{';	$currentstring = '\textit{';
Line 3609 sub start_var {	Line 4082 sub start_var {
sub end_var {	sub end_var {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '}';	$currentstring = '}';
Line 3621 sub end_var {	Line 4094 sub end_var {
sub start_wbr {	sub start_wbr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3630 sub start_wbr {	Line 4103 sub start_wbr {
sub end_wbr {	sub end_wbr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	}
return $currentstring;	return $currentstring;
Line 3639 sub end_wbr {	Line 4112 sub end_wbr {
#-- <hideweboutput> tag	#-- <hideweboutput> tag
sub start_hideweboutput {	sub start_hideweboutput {
my ($target,$token) = @_;	my ($target,$token) = @_;
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
}	}
return '';	return '';
Line 3648 sub start_hideweboutput {	Line 4121 sub start_hideweboutput {
sub end_hideweboutput {	sub end_hideweboutput {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = &Apache::lonxml::endredirection();	$currentstring = &Apache::lonxml::endredirection();
}	}
return '';	return '';
Line 3664 sub image_replication {	Line 4137 sub image_replication {
$pssrc =~ s/\.(gif\|jpg\|jpeg\|png)$/.ps/i;	$pssrc =~ s/\.(gif\|jpg\|jpeg\|png)$/.ps/i;
if (not -e $epssrc && not -e $pssrc) {	if (not -e $epssrc && not -e $pssrc) {
my $result=&Apache::lonnet::repcopy($epssrc);	my $result=&Apache::lonnet::repcopy($epssrc);
if ($result ne OK) { &Apache::lonnet::repcopy($pssrc); }	if ($result ne 'ok') { &Apache::lonnet::repcopy($pssrc); }
}	}
return '';	return '';
}	}
	#
	# Get correct sizing parameter for an image given
	# it's initial ht. and wid. This allows sizing of
	# images that are generated on-the-fly (e.g. gnuplot)
	# as well as serving as a utility for image_size.
	#
	# Parameter:
	# height_param
	# width_param - Initial picture dimensions.
	# scaling - A scale factor.
	# parstack, - the current stack of tag attributes
	# from the xml parser
	# safeeval, - pointer to the safespace
	# depth, - from what level in the stack to look for attributes
	# (assumes -1 if unspecified)
	# cis - look for attrubutes case insensitively
	# (assumes false)
	#
	# Returns:
	# height, width - new dimensions.
	#
	sub resize_image {
	my ($height_param, $width_param, $scaling,
	$parstack, $safeeval, $depth, $cis) = @_;

	# First apply the scaling...

	$height_param = $height_param * $scaling;
	$width_param = $width_param * $scaling;

sub image_size {
my ($src,$scaling,$parstack,$safeeval)=@_;
#size of image from gif/jpg/jpeg/png
my $image = Image::Magick->new;
my $current_figure = $image->Read($src);
my $width_param = $image->Get('width') * $scaling;;
my $height_param = $image->Get('height') * $scaling;;
undef $image;
#do we have any specified LaTeX size of the picture?	#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?	#do we have any specified web size of the picture?
my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,	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*\%/) {	if ($TeXwidth=~/(\d+)\s*\%/) {
$width_param = $1*$ENV{'form.textwidth'}/100;	$width_param = $1*$env{'form.textwidth'}/100;
} else {	} else {
$width_param = $TeXwidth;	$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) {
	$height_param = $TeXheight;
	if ($height_param) {
	$width_param = $TeXheight/$height_param*$width_param;
	}
	} elsif ($width) {
	my $old_width_param=$width_param;
	$width_param = $width*$scaling;
	if ($old_width_param) {
	$height_param=$width_param/$old_width_param*$height_param;
	}
}	}
if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}}	if ($width_param > $env{'form.textwidth'}) {
return $width_param;	my $old_width_param=$width_param;
	$width_param =0.95*$env{'form.textwidth'};
	if ($old_width_param) {
	$height_param=$width_param/$old_width_param*$height_param;
	}
	}

	return ($height_param, $width_param);
	}

	sub image_size {
	my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;

	#size of image from gif/jpg/jpeg/png
	my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
	if (-e $ressrc) {
	$src = $ressrc;
	}
	my $image = Image::Magick->new;
	my $current_figure = $image->Read($src);
	my $width_param = $image->Get('width');
	my $height_param = $image->Get('height');
	&Apache::lonxml::debug("Image magick says: $src : Height = $height_param width = $width_param");
	undef($image);

	($height_param, $width_param) = &resize_image($height_param, $width_param,
	$scaling, $parstack, $safeeval,
	$depth, $cis);

	return ($height_param, $width_param);
	}

	sub image_width {
	my ($height, $width) = &image_size(@_);
	return $width;
	}
	# Not yet 100% sure this is correct in all circumstances..
	# due to my uncertainty about mods to image_size.
	#
	sub image_height {
	my ($height, $width) = &image_size(@_);
	return $height;
	}

	sub get_eps_image {
	my ($src)=@_;
	my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src);

	# In order to prevent the substitution of the alt text, we need to
	# be sure the orig_src file is on system now so:

	if (! -e $orig_src) {
	&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
	}
	&Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
	my ($spath, $sname, $sext) = &fileparse($src, qr/\.(gif\|png\|jpg\|jpeg)/i);
	$src=~s/\.(gif\|png\|jpg\|jpeg)$/\.eps/i;
	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
	&Apache::lonxml::debug("Filelocation gives: $src");
	if (! -e $src) {
	&Apache::lonxml::debug("$src does not exist");
	if (&Apache::lonnet::repcopy($src) ne 'ok' ) {
	&Apache::lonxml::debug("Repcopy of $src failed (1)");
	#if replication failed try to find ps file
	$src=~s/\.eps$/\.ps/;
	&Apache::lonxml::debug("Now looking for $src");
	#if no ps file try to replicate it.
	my $didrepcopy = &Apache::lonnet::repcopy($src);
	&Apache::lonxml::debug("repcopy of $src ... $didrepcopy");
	if ( (not -e $src) \|\|
	($didrepcopy ne 'ok')) {
	&Apache::lonxml::debug("Failed to find or replicate $src");

	#if replication failed try to produce eps file dynamically
	$src=~s/\.ps$/\.eps/;
	my $temp_file;
	open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
	my $newsrc=$orig_src;
	$newsrc =~ s\|(.*)/res/\|/home/httpd/html/res/\|;
	&Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");
	print FILE ("$newsrc\n");
	close(FILE);
	$src=~s\|/home/httpd/html/res\|/home/httpd/prtspool\|;
	$src=~s\|/home/([^/]*)/public_html/\|/home/httpd/prtspool/$1/\|;
	if ($sext ne "") { # Put the ext. back in to uniquify.
	$src =~ s/\.eps$/$sext.eps/;
	}

	}

	}
	} 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);
}	}

sub eps_generation {	sub eps_generation {
my ($src,$file,$width_param) = @_;	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);	my $temp_file = Apache::File->new('>>'.$filename);
print $temp_file "$src\n";	print $temp_file "$src\n";
my $newsrc = $src;	my $newsrc = $src;
$newsrc =~ s/(\.gif\|\.jpg\|\.jpeg)$/\.eps/i;	$newsrc =~ s/(\.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.'} ';	return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
} else {	} else {
return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';	return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
Line 3729 sub file_path {	Line 4351 sub file_path {
}	}
return $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 {	sub recalc {
my $argument = shift;	my $argument = shift;
if (not $argument=~/(mm\|cm\|in\|pc\|pt)/) {return $argument.' mm';}	if (not $argument=~/(mm\|cm\|in\|pc\|pt)/) {return $argument.' mm';}
Line 3773 sub LATEX_length {	Line 4399 sub LATEX_length {
return $value;	return $value;
}	}

	# 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.
	#
	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 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);
	}

	# is_inside_of $tagstack $tag
	# This sub returns true if the current state of Xml processing
	# is inside of the tag.
	# Parameters:
	# tagstack - The tagstack from the parser.
	# tag - The tag (without the <>'s.).
	# Sample usage:
	# if (is_inside_of($tagstack "table")) {
	# # I'm in a table....
	# }
	sub is_inside_of {
	my ($tagstack, $tag) = @_;
	my @stack = @$tagstack;
	for (my $i = ($#stack - 1); $i >= 0; $i--) {
	if ($stack[$i] eq $tag) {
	return 1;
	}
	}
	return 0;
	}


1;	1;

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

Removed from v.1.239
changed lines
	Added in v.1.357