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.300 and 1.400

version 1.300, 2005/12/05 23:22:49	version 1.400, 2009/04/11 01:11:02
Line 42 package Apache::londefdef;	Line 42 package Apache::londefdef;
use Apache::lonnet;	use Apache::lonnet;
use strict;	use strict;
use Apache::lonxml;	use Apache::lonxml;
	use Apache::lontable;
use Apache::File();	use Apache::File();
use Image::Magick;	use Image::Magick;
use Apache::lonmenu();	use Apache::lonmenu();
use Apache::lonmeta();	use Apache::lonmeta();
	use Apache::lonlocal;
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use File::Basename;	use File::Basename;
#use Data::Dumper;	use LONCAPA();
	# use Data::Dumper;

BEGIN {	BEGIN {

Line 56 BEGIN {	Line 59 BEGIN {

}	}

#
# Dumps all elements of the table structure.
# Need this 'cause evidently when given an array, Data::Dumper only seems
# to dump element 0.
#
#sub debug_dump_table {
# my $lastrow = $#Apache::londefdef::table;
# &Apache::lonnet::logthis("Dumping table: Last row index: $lastrow");
# my $row;
# for ($row =0; $row <= $lastrow; $row++ ) {
# my $text = Dumper($Apache::londefdef::table[$row]);
# &Apache::lonnet::logthis("table [ $row ]".$text);
#
# }
#}

sub initialize_londefdef {	sub initialize_londefdef {
$Apache::londefdef::TD_redirection=0;	$Apache::londefdef::TD_redirection=0;
Line 81 sub initialize_londefdef {	Line 69 sub initialize_londefdef {
@Apache::londefdef::DT=(0);	@Apache::londefdef::DT=(0);
@Apache::londefdef::seenDT=(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 105 sub start_m {	Line 95 sub start_m {
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 evaluated to:$inside:");
}	}
	my $tex = $inside;
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
$currentstring = &Apache::lontexconvert::converted(\$inside,$display);	$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> occurred while attempting to convert this TeX: <pre>';
$Apache::lontexconvert::errorstring);	$tex = &HTML::Entities::encode($tex,'<>&"');
	my ($linenumber) =
	($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
	if (defined($linenumber)) {
	my @tex=split("\n",$tex);
	$tex[$linenumber]='<b><font color="red">'.
	$tex[$linenumber].'</font></b>';
	$tex=join("\n",@tex);
	}
	&Apache::lonxml::warning($errormsg.$tex.'</pre>');
$Apache::lontexconvert::errorstring='';	$Apache::lontexconvert::errorstring='';
}	}
#&Apache::lonxml::debug("M is ends with:$currentstring:");	#&Apache::lonxml::debug("M is ends with:$currentstring:");
$Apache::lonxml::post_evaluate=0;	$Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {

$currentstring = $inside;	$currentstring = $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') {
Line 124 sub start_m {	Line 125 sub start_m {
}	}
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	# detect simple math mode entry exits, and convert them
# to use \ensuremath	# to use \ensuremath ... unless there's a \verb inside.
if ($currentstring=~/^\s\$[^\$].[^\$]\$\s*$/) {	if (! ($currentstring=~/\\verb/)) {
$currentstring=~s/^(\s*)\$/$1/;	if ($currentstring=~/^\s\$[^\$].\$\s*$/) {
$currentstring=~s/\$(\s*)$/$1/;	$currentstring=~s/^(\s*)\$/$1/;
$currentstring='\ensuremath{'.$currentstring.'}';	$currentstring=~s/\$(\s*)$/$1/;
	$currentstring='\ensuremath{'.$currentstring.'}';
	}
}	}
$Apache::lonxml::post_evaluate=0;	$Apache::lonxml::post_evaluate=0;
}	}
Line 147 sub end_m {	Line 150 sub end_m {
sub start_tthoption {	sub start_tthoption {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;	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);	$style);
$inside=~s/^\s*//;	$inside=~s/^\s*//;
Line 170 sub end_tthoption {	Line 173 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'};
&Apache::lontexconvert::init_tth();
if ($target eq 'web' \|\| $target eq 'edit' \|\| $target eq 'webgrade' ) {	if ($target eq 'web' \|\| $target eq 'edit' \|\| $target eq 'webgrade' ) {
$currentstring = &Apache::lonxml::xmlbegin();	# start_body() takes care of emitting the <html>
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\documentclass[letterpaper]{article}';
if (($env{'form.latex_type'}=~'batchmode') \|\|	$currentstring .= &latex_header();
(!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
$currentstring .= '\newcommand{\keephidden}[1]{}'.
'\renewcommand{\deg}{$^{\circ}$}'.
'\usepackage{longtable}'.
'\usepackage{textcomp}'.
'\usepackage{makeidx}'.
'\usepackage[dvips]{graphicx}'.
'\usepackage{wrapfig}'.
'\usepackage{picins}'.
'\usepackage{epsfig}'.
'\usepackage{calc}'.
'\usepackage{amsmath}'.
'\usepackage{amssymb}'.
'\usepackage{amsfonts}'.
'\usepackage{amsthm}'.
'\usepackage{amscd}'.
'\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
'\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 202 sub start_html {	Line 185 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 = '</html>';	# end_body takes care of the </html>
}	}
return $currentstring;	return $currentstring;
}	}
Line 212 sub end_html {	Line 195 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::fontsettings();	&Apache::lonxml::startredirection();
}	}
return $currentstring;	return $currentstring;
}	}
Line 221 sub start_head {	Line 204 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 232 sub end_head {	Line 218 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 241 sub start_map {	Line 227 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 251 sub end_map {	Line 237 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 262 sub start_select {	Line 248 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 272 sub end_select {	Line 258 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 288 sub start_option {	Line 274 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 300 sub end_option {	Line 286 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 309 sub start_input {	Line 295 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 319 sub end_input {	Line 305 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 328 sub start_textarea {	Line 314 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 338 sub end_textarea {	Line 324 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 347 sub start_form {	Line 333 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 355 sub end_form {	Line 341 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 372 sub start_title {	Line 359 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 388 sub end_title {	Line 375 sub end_title {
sub start_meta {	sub start_meta {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;	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 '') {
Line 430 sub start_meta {	Line 417 sub start_meta {
if ((not defined $content) && (not defined $name)) {	if ((not defined $content) && (not defined $name)) {
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
}	}
	} elsif ($target eq 'edit') {
	$currentstring .= &Apache::edit::tag_start($target,$token);
	$currentstring .= &Apache::edit::text_arg('Name:','name',$token,30);
	$currentstring .= &Apache::edit::text_arg('Content:','content',$token,70);
	$currentstring .= &Apache::edit::end_row();
	} elsif ($target eq 'modified') {
	my $constructtag =
	&Apache::edit::get_new_args($token,$parstack,$safeeval,
	'name','content');
	if ($constructtag) { $currentstring = &Apache::edit::rebuild_tag($token); }
}	}
return $currentstring;	return $currentstring;
}	}
Line 437 sub start_meta {	Line 434 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 453 sub end_meta {	Line 450 sub end_meta {
return $currentstring;	return $currentstring;
}	}

	sub insert_meta {
	return '
	<meta />';
	}

# accessrule	# accessrule
sub start_accessrule {	sub start_accessrule {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;	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);	my $realm=&Apache::lonxml::get_param('realm', $parstack,$safeeval,undef,1);
my $realm=&Apache::lonxml::get_param	my $role =&Apache::lonxml::get_param('role', $parstack,$safeeval,undef,1);
('realm',$parstack,$safeeval,undef,1);	my $type =&Apache::lonxml::get_param('type', $parstack,$safeeval,undef,1);
my $role=&Apache::lonxml::get_param
('role',$parstack,$safeeval,undef,1);	my ($dom,$crs,$sec,$separator);
$realm=~s/\s+//g;	if ($type eq 'user') {
$realm=~s/\//\_/g;	($dom,$crs,$sec)=split(m{/},$realm);
$realm=~s/^\_//;	$crs = &LONCAPA::clean_username($crs);
$realm=~s/\W/\;/g;	$separator = '/';
$role=~s/\s+//g;	} else {
$role=~s/\//\_/g;	($dom,$crs,$sec)=split(/\_/,$realm);
$role=~s/\W/\;/g;	$crs = &LONCAPA::clean_courseid($crs);
	$separator = '_';
	}
	$dom = &LONCAPA::clean_domain($dom);

	$sec =~s/\W//;
	$realm = $dom;
	if ($crs =~ /\S/) { $realm .= $separator.$crs; }
	if ($sec =~ /\S/) { $realm .= $separator.$sec; }
	$role=~s/\W//g;

if ($target eq 'web') {	if ($target eq 'web') {
my $args='';	my $args='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
Line 480 sub start_accessrule {	Line 492 sub start_accessrule {
}	}
}	}
if ($target eq 'meta') {	if ($target eq 'meta') {
$currentstring='<rule>'.$eff.':'.$realm.':'.$role.'</rule>';	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.':'.$type.'</rule>';
}	}
return $currentstring;	return $currentstring;
}	}
Line 498 sub end_accessrule {	Line 510 sub end_accessrule {
return $currentstring;	return $currentstring;
}	}

	sub generate_css_links {
	my $links;
	my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
	if ($css_href =~ /\S/) {
	&Apache::lonxml::extlink($css_href);
	$links .=
	'<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
	}
	return $links;
	}

#-- <body> tag (end tag required)	#-- <body> tag (end tag required)
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.='>';
&Apache::lontexconvert::jsMath_reset();
if ($env{'environment.texengine'} eq 'jsMath') {
$currentstring.=&Apache::lontexconvert::jsMath_header();
}	}

	my $extra_head = &generate_css_links();

	$currentstring =
	&Apache::loncommon::start_page($Apache::londefdef::title,
	$Apache::londefdef::head
	.$extra_head,
	{'add_entries' => $token->[2],
	'no_title' => 1,
	'force_register' => 1});

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

	sub edit_controls {
	my $result .= '
	<form method="post">
	<div class="LC_edit_problem_header">
	<div class="LC_edit_problem_header_row1">'.
	&Apache::lonxml::renderingoptions().'
	<input type="submit" name="changeproblemmode" value="'.&mt('Change View').'" />
	</div>
	<div class="LC_edit_problem_header_edit_row"><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" /></div></div>
	</form>
	<br />';
	return $result;
	}

sub end_body {	sub end_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off unclosed <p>	my $currentstring = &end_p(); # Close off unclosed <p>
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= &Apache::lonxml::xmlend($target,$parser);	$currentstring .= &Apache::loncommon::end_page({'discussion' => 1});
} elsif ($target eq 'tex') {	} 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 = &end_p(); # Close off any prior para.	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') {
	if (&is_inside_of($tagstack, "table")) {
	$currentstring .= &center_correction();
	}
$currentstring .= '\begin{center}';	$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;
}	}
Line 623 sub end_center {	Line 623 sub end_center {
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') {
&disable_para();	&disable_para();
Line 635 sub start_b {	Line 635 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') {
&enable_para();	&enable_para();
Line 649 sub end_b {	Line 649 sub end_b {
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();	&disable_para();
Line 661 sub start_strong {	Line 661 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();	&enable_para();
Line 674 sub end_strong {	Line 674 sub end_strong {
sub start_h1 {	sub start_h1 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off any prior para.	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 699 sub start_h1 {	Line 699 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 723 sub end_h1 {	Line 723 sub end_h1 {
sub start_h2 {	sub start_h2 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off any prior para.	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 745 sub start_h2 {	Line 745 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 766 sub end_h2 {	Line 766 sub end_h2 {
sub start_h3 {	sub start_h3 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off any prior para.	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 788 sub start_h3 {	Line 788 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 809 sub end_h3 {	Line 809 sub end_h3 {
sub start_h4 {	sub start_h4 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off any prior para.	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 831 sub start_h4 {	Line 831 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 852 sub end_h4 {	Line 852 sub end_h4 {
sub start_h5 {	sub start_h5 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off any prior paras.	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 874 sub start_h5 {	Line 874 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 895 sub end_h5 {	Line 895 sub end_h5 {
sub start_h6 {	sub start_h6 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off any prior paras.	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 917 sub start_h6 {	Line 917 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 938 sub end_h6 {	Line 938 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 949 sub start_cite {	Line 949 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 961 sub end_cite {	Line 961 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 972 sub start_i {	Line 972 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 984 sub end_i {	Line 984 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 995 sub start_address {	Line 995 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 1007 sub end_address {	Line 1007 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 1018 sub start_dfn {	Line 1018 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 1030 sub end_dfn {	Line 1030 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 1041 sub start_tt {	Line 1041 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 1053 sub end_tt {	Line 1053 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 1064 sub start_kbd {	Line 1064 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 1076 sub end_kbd {	Line 1076 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 1087 sub start_code {	Line 1087 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 1099 sub end_code {	Line 1099 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 1110 sub start_em {	Line 1110 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 1122 sub end_em {	Line 1122 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 1133 sub start_q {	Line 1133 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 1172 sub enable_para {	Line 1172 sub enable_para {
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 .= &end_p(); # close off prior para if in progress.
$currentstring .= $token->[4];	$currentstring .= $token->[4];
if (! ($currentstring =~ /\//)) {	if (! ($currentstring =~ /\//)) {
$closing_string = '</p>'; # Deal correctly with <p /> e.g.	$closing_string = '</p>'; # Deal correctly with <p /> e.g.
}	}
} elsif ($target eq 'tex' && !$para_disabled) {	} elsif ($target eq 'tex' && !$para_disabled) {

$currentstring .= &end_p(); # close off prior para if in progress.	$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}';	$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 ';
$closing_string= '}}';	# $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 ';
$closing_string = '}\hfill}';	# $currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{{';
	$closing_string = "}\n";
} else {	} else {
$currentstring.='\par ';	$currentstring.='\par ';
$closing_string = '\strut\\\\\strut ';	if (&is_inside_of($tagstack, 'table')) {
	$closing_string = '\vskip 0pt'; # Seems to be consistent with <p> in tables.
	} else {
	$closing_string = '\strut\\\\\strut ';
	}
}	}

}	}
Line 1219 sub end_p {	Line 1229 sub end_p {
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;
Line 1229 sub start_br {	Line 1239 sub start_br {
#	#
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 != 1) {
$currentstring .= ' \vskip 0 mm ';
} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
$currentstring .= '\strut \\\\ \strut ';	$currentstring .= '\strut \\\\ \strut ';
}	}

}	}
return $currentstring;	return $currentstring;
}	}
Line 1247 sub start_br {	Line 1257 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 1257 sub end_br {	Line 1267 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 1268 sub start_big {	Line 1278 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 1280 sub end_big {	Line 1290 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 1291 sub start_small {	Line 1301 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 1303 sub end_small {	Line 1313 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 1317 sub start_basefont {	Line 1327 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 1332 sub end_basefont {	Line 1342 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') \|\|
Line 1351 sub start_font {	Line 1361 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 1366 sub end_font {	Line 1376 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 1377 sub start_strike {	Line 1387 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 1392 sub end_strike {	Line 1402 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 1403 sub start_s {	Line 1413 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 1418 sub end_s {	Line 1428 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 1429 sub start_sub {	Line 1439 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 1441 sub end_sub {	Line 1451 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 1452 sub start_sup {	Line 1462 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 1464 sub end_sup {	Line 1474 sub end_sup {
sub start_hr {	sub start_hr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # End enclosing para.	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') {

	# <hr /> can't be inside of <sup><sub> thank you LaTeX.
	#
	my $restart_sub = 0;
	my $restart_sup = 0;

	# Since <sub> and <sup> are simple tags it's ok to turn off/on
	# using the start_ stop_ functions.. those tags only care about
	# $target.

	if (&is_inside_of($tagstack, "sub")) {
	$restart_sub = 1;
	$currentstring .= &end_sub($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
	if (&is_inside_of($tagstack, "sup")) {
	$restart_sup = 1;
	$currentstring .= &end_sup($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}

my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);	my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
if (defined $LaTeXwidth) {	if (defined $LaTeXwidth) {
if ($LaTeXwidth=~/^%/) {	if ($LaTeXwidth=~/^%/) {
Line 1487 sub start_hr {	Line 1518 sub start_hr {
}	}
$currentstring .= ' \vskip 0 mm \noindent\makebox['.$LaTeXwidth.']{'.$pre.'\makebox['.	$currentstring .= ' \vskip 0 mm \noindent\makebox['.$LaTeXwidth.']{'.$pre.'\makebox['.
$LaTeXwidth.'][b]{\hrulefill}'.$post.'}\vskip 0 mm ';	$LaTeXwidth.'][b]{\hrulefill}'.$post.'}\vskip 0 mm ';
	# Turn stuff back on that we can't be inside of.

	if ($restart_sub) {
	$currentstring .= &start_sub($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
	if ($restart_sup) {
	$currentstring .= &start_sup($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 1494 sub start_hr {	Line 1535 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;
Line 1512 sub end_hr {	Line 1553 sub end_hr {
sub start_div {	sub start_div {
my ($target,$token, $tagstack, $parstack, $parser, $safeeval) = @_;	my ($target,$token, $tagstack, $parstack, $parser, $safeeval) = @_;
my $currentstring = &end_p(); # Close enclosing para.	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') {	if ($target eq 'tex') {
# 4 possible alignments: left, right, center, and -missing-.	# 4 possible alignments: left, right, center, and -missing-.
	# If inside a table row, we must let the table logic
	# do the alignment, however.
	#

my $endstring = '';	my $endstring = '';

Line 1525 sub start_div {	Line 1569 sub start_div {
if ($align eq 'center') {	if ($align eq 'center') {
$currentstring .= '\begin{center}';	$currentstring .= '\begin{center}';
$endstring = '\end{center}';	$endstring = '\end{center}';
	if (&is_inside_of($tagstack, "table")) {
	$currentstring = &center_correction().$currentstring;
	$endstring .= &center_end_correction();
	}
}	}
elsif ($align eq 'right') {	elsif ($align eq 'right') {
$currentstring .= '\begin{flushright}';	$currentstring .= '\begin{flushright}';
Line 1545 sub start_div {	Line 1593 sub start_div {
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') {	if ($target eq 'tex') {
Line 1560 sub end_div {	Line 1608 sub end_div {
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') {
my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
undef,1);	undef,1);
$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
} elsif ($target eq 'tex') {	if ($href =~ /\S/) {
my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);	if ($href !~ m{^https?://}) {
my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);	my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
if ($a=~/\S/) {	my $linkurl;
$a=~s/([^\\])%/$1\\\%/g;	if ($href =~ m{^/uploaded/}) {
$currentstring .= '\ref{URI: '.$a.'}';	$linkurl = $href;
} elsif ($b=~/\S/) {	} elsif ($href =~ m{^[^/]}) {
$currentstring .= '\ref{Anchor: '.$b.'}';	my $path = $url;
} else {	$path =~ s{[^/]*$}{};
$currentstring.='';	$linkurl = $path.$href;
}	}
	if ($linkurl =~ m{^/uploaded/}) {
	if (!&Apache::lonnet::allowed('bre',$linkurl)) {
	if (&Apache::lonnet::is_on_map($url)) {
	&Apache::lonxml::extlink($linkurl);
	}
	}
	}
	}
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 1582 sub start_a {	Line 1639 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);
	my $uriprint =
	&Apache::lonxml::get_param('uriprint',$parstack,$safeeval,undef,1);
	my $anchorprint =
	&Apache::lonxml::get_param('anchorprint',$parstack,$safeeval,undef,1);
	if (($href =~ /\S/) && ($uriprint=~/^on\|uriprint\|yes\|1$/i)) {
	$href =~ s/([^\\])%/$1\\\%/g;
	# Substitute special symbols... and allow line breaks at each /
	#
	$href = &Apache::lonxml::latex_special_symbols($href);
	$href =~ s/\//\/\\-/g; # Map / to /\- to allow hyphenation.
	$currentstring .= ' ({\tt URI:'.$href.'})';
	} elsif (($name =~ /\S/) && ($anchorprint=~/^on\|anchorprint\|yes\|1$/i)) {
	$currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
	} else {
	$currentstring.='';
	}
	}
return $currentstring;	return $currentstring;
}	}

Line 1592 sub end_a {	Line 1671 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 1623 sub start_li {	Line 1702 sub start_li {
sub end_li {	sub end_li {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = &end_p(); # In case there's a <p> in the <li>	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 1633 sub end_li {	Line 1712 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 1644 sub start_u {	Line 1723 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 1659 sub end_u {	Line 1738 sub end_u {
sub start_ul {	sub start_ul {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off enclosing list.	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);
Line 1688 sub start_ul {	Line 1767 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 1703 sub end_ul {	Line 1782 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 1714 sub start_menu {	Line 1793 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 1726 sub end_menu {	Line 1805 sub end_menu {
sub start_dir {	sub start_dir {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = &end_p(); # In case there's a <p> prior to the list.	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} ";
Line 1737 sub start_dir {	Line 1816 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 1749 sub end_dir {	Line 1828 sub end_dir {
sub start_ol {	sub start_ol {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # In case there's a <p> prior to the list.	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;
Line 1788 sub start_ol {	Line 1867 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 1803 sub end_ol {	Line 1882 sub end_ol {
sub start_dl {	sub start_dl {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = &end_p(); # In case there's a <p> unclosed prior to the list.	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}';
Line 1819 sub start_dl {	Line 1898 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[-1]) { &end_dt(@_); }	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
Line 1841 sub end_dl {	Line 1920 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[-1]) { &end_dt(@_); }	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
Line 1856 sub start_dt {	Line 1935 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') {
if ($Apache::londefdef::DT[-1]) {	if ($Apache::londefdef::DT[-1]) {
Line 1879 sub item_cleanup {	Line 1958 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[-1]) { &end_dt(@_); }	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
Line 1898 sub start_dd {	Line 1977 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]->[-1].=	$Apache::londefdef::description[-1]->[-1].=
Line 1914 sub end_dd {	Line 1993 sub end_dd {
# only way I could think of to allow <p> in	# only way I could think of to allow <p> in
# <tr> <th> bodies	# <tr> <th> bodies
#	#
#list of supported attributes: border,width,TeXwidth	#list of supported attributes: border,width,TeXwidth,TeXtheme
	# align
sub start_table {	sub start_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $textwidth = '';	my $textwidth = '';
my $currentstring = &end_p();	my $currentstring = &end_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') {
my $aa = {};	&disable_para(); # Can't have paras in a table.
push @Apache::londefdef::table, $aa;

	# New table code:

	# Get the parameters that we can do something about:

	my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0);
	my $width = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0);
	my $theme = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0);
	my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0);

	# The only thing that needs any figuring out is the width.. and then only if it is
	# a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm
	#

	my $table = new Apache::lontable();
	if ($border ne '') {
	$table->table_border(1);
	$table->cell_border(1);
	}
	if ($theme ne '') {
	$table->theme($theme);
	}
	if ($align ne '') {
	$table->alignment($align);
	}

	# Missing width is most of page width

	if ($width eq "") {
	$width = '70%';
	}

	# If a percentage, need to calculate what this means in terms of
	# page width:

	if ($width =~ /%$/) {
	my $textwidth = &recalc($env{'form.textwidth'}); # Page width in mm.
	$width =~ s/%//;
	$width = $width * $textwidth / 100.0;
	$width .= " mm";
	$table->width($width);
	}

	push(@Apache::londefdef::table, $table);
	$currentstring.=' \keephidden{NEW TABLE ENTRY}';

	#--------------------------------------------------------
	# Old table code here.
	#--------------------------------------------------------


	if (0) {
	push(@Apache::londefdef::table, {});
$Apache::londefdef::table[-1]{'row_number'} = -1;	$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.85*$1; #accounts "internal" LaTeX space for table frame
} else {	} else {
if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) {	if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) {
#the maximum width of nested table is determined by LATeX width of parent cell	#the maximum width of nested table is determined by LATeX width of parent cell
Line 1945 sub start_table {	Line 2078 sub start_table {

# width either comes forced from the TeXwidth or the width parameters.	# width either comes forced from the TeXwidth or the width parameters.
# in either case it can be a percentage or absolute width.	# 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)) {
$TeXwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);	my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,
	$safeeval,undef,1);
} else {	if ($htmlwidth =~ /%/) {
$Apache::londefdef::table[-1]{'forcedtablewidth'} = 1;	$TeXwidth = $htmlwidth;
	} else {
	$TeXwidth = $textwidth;
	}
}	}
	# if the width is specified as a % it is converted to an absolute width.
	# otherwise.. just plugged right in the hash

if ($TeXwidth=~/%/) {	if ($TeXwidth=~/%/) {
$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]{'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 1987 sub start_table {	Line 2129 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;
Line 1997 sub start_table {	Line 2139 sub start_table {
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') {


	# New table code:

	my $table = pop(@Apache::londefdef::table);
	my $t = $table->generate();
	$currentstring = $t->generate_string();
	&enable_para();
	#--------------------------------------------------------------
	# Old table code:
	#--------------------------------------------------------------

	if (0) {

	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
my $inmemory = '';	my $inmemory = '';
my $output = '';	my $output = '';
my $WARNING='';	my $WARNING='';
#width of columns from TeXwidth attributes	#width of columns from TeXwidth attributes

	# Protect against unbalanced </table> tag.

	if (scalar(@Apache::londefdef::table) > 0) {

for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $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 2022 sub end_table {	Line 2183 sub end_table {
$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];	$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];
}	}
}	}

#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 2037 sub end_table {	Line 2202 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 2057 sub end_table {	Line 2242 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
my @adjust=();	my @adjust=();
#step 1. adjustment by maximum value	#step 1. adjustment by maximum value
my $space_neeeded=0;	my $space_needed=0;
for (my $jn=0;$jn<=$#max_len;$jn++) {	for (my $jn=0;$jn<=$#max_len;$jn++) {
$space_neeeded=$space_neeeded+$max_len[$jn];	$space_needed=$space_needed+$max_len[$jn];
}	}
if ($space_neeeded<=$available_space) {	if ($space_needed<=$available_space) {

for (my $jn=0;$jn<=$#max_len;$jn++) {	for (my $jn=0;$jn<=$#max_len;$jn++) {
if ($fwidth[$jn]==0) {	if ($fwidth[$jn]==0) {
$fwidth[$jn]=$max_len[$jn];	$fwidth[$jn]=$max_len[$jn];
Line 2074 sub end_table {	Line 2270 sub end_table {
}	}
} else {	} else {
#step 2. adjustment by minimum value (estimation)	#step 2. adjustment by minimum value (estimation)
$space_neeeded=0;	$space_needed=0;
for (my $jn=0;$jn<=$#min_len;$jn++) {	for (my $jn=0;$jn<=$#min_len;$jn++) {
$space_neeeded+=$min_len[$jn];	$space_needed+=$min_len[$jn];
}	}
if ($space_neeeded>$available_space) {	if ($space_needed>$available_space) {
$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';	$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
for (my $jn=0;$jn<=$#max_len;$jn++) {	for (my $jn=0;$jn<=$#max_len;$jn++) {
if ($fwidth[$jn]==0) {	if ($fwidth[$jn]==0) {
Line 2095 sub end_table {	Line 2291 sub end_table {
}	}
}	}
if ($how_many_to_scale>0) {	if ($how_many_to_scale>0) {
my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale;	my $space_to_adjust=($space_needed-$available_space)/$how_many_to_scale;
foreach my $jn (@to_scale) {	foreach my $jn (@to_scale) {
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/;	$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/;
Line 2117 sub end_table {	Line 2313 sub end_table {
}	}
} else {	} else {
#step 3. adjustment over minimal + corrections	#step 3. adjustment over minimal + corrections
my $enlarge_coef=$available_space/$space_neeeded;	my $enlarge_coef=$available_space/$space_needed;
my $acsessive=0;	my $acsessive=0;
for (my $jn=0;$jn<=$#min_len;$jn++) {	for (my $jn=0;$jn<=$#min_len;$jn++) {
$adjust[$jn]=$min_len[$jn]*$enlarge_coef;	$adjust[$jn]=$min_len[$jn]*$enlarge_coef;
Line 2125 sub end_table {	Line 2321 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 2149 sub end_table {	Line 2346 sub end_table {
}	}
}	}
}	}
#use all available width if it is defined in % or as TeXwidth	# use all available width or specified width as if not specified,
if (($Apache::londefdef::table[-1]{'percent'}==1) \|\| ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) {	# the specified width gets defaulted to the available width.
my $current=0;
for (my $i=0;$i<=$#fwidth;$i++) {	my $current=0;
$current+=$fwidth[$i];	for (my $i=0;$i<=$#fwidth;$i++) {
}	$current+=$fwidth[$i];
my $coef=$Apache::londefdef::table[-1]{'width'}/$current;	}
for (my $i=0;$i<=$#fwidth;$i++) {	if ($current == 0) {
$fwidth[$i]*=$coef;	$current = $Apache::londefdef::table[-1]{'width'};
}	}
	my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
	for (my $i=0;$i<=$#fwidth;$i++) {
	$fwidth[$i]*=$coef;
}	}
#removing of empty columns if allowed	#removing of empty columns if allowed
my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);	my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
Line 2179 sub end_table {	Line 2379 sub end_table {
$Apache::londefdef::table[-1]{'content'}=\@cleaned_table;	$Apache::londefdef::table[-1]{'content'}=\@cleaned_table;
@fwidth=@cleaned_header;	@fwidth=@cleaned_header;
}	}


#construct header of the table	#construct header of the table
my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
for (my $in=0;$in<=$#fwidth;$in++) {	for (my $in=0;$in<=$#fwidth;$in++) {
$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}';	#-----------------------------------------------------------
$output.='\begin{center}';	# I think this order of doing things will ensure that
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {	# single rowspan, columspan and combined row/colspans will
$output.=' \hfill \llap{'	# work correctly. LaTeX is delicate here.
	# RF.

	# Start a rowspan if necessary:

	my $primary_col_width = $fwidth[$jn]; # Width of primary column.
	my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
	my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn];
	#
	# Do the appropriate magic if this has a colspan
	#

	my $border_char = "";
	if ($border) {
	$border_char = "\|";
	}
	my $spanwidth = 0;
	if ($colspan > 1) {
	for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
	$spanwidth += $fwidth[$spancol];
	}
	$output .= '\multicolumn{'.
	$colspan
	."}";
	if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
	$output .= '{'.$border_char.'c'.$border_char.'}{';
	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
	$output .= '{'.$border_char.'r'.$border_char.'}{';
	}
	else {
	$output .= '{'.$border_char."p{$spanwidth mm}".$border_char.'}{';
	}

	} else {
	$spanwidth = $primary_col_width; # If no span width will be just colwidth
	}

	# Rowspan... if colspan is 1, and there's an alignment we'll need
	# to kick in a multicolumn in order to get the alignment spec.
	# this must precede the multirow or LaTex gets quite upset.
	# Naturally if colspan > 1 we've already done that above ^
	#
	my $multirow_aligned = 0;
	if ($rowspan > 1) {
	if ($colspan == 1) {
	if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
	$output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
	$multirow_aligned = 1;
	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
	$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
	$multirow_aligned = 1;
	}
	}
	$have_rowspan++;
	if ($multirow_aligned) {
	$output .= '\multirow{'.$rowspan.'}[0]{*}{';
	} else {
	$output .= '\multirow{'.$rowspan."}[0]{$spanwidth mm}{";
	}

	$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
	s{^\s\\par\s}{};
	$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
	s{\s\\vskip\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}{'.$border_char.'c'.$border_char.'}{';
	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
	$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
	}
	}

$output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];	$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) &&
$output.='\end{center}';	(($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') \|\|
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {	($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r'))) {
$output.='} ';	$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'}.' ';
	}
}	}
# Note that \newline destroys alignment env's produced by e.g. <div>	# 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\newline\strut ';
Line 2243 sub end_table {	Line 2568 sub end_table {
pop @Apache::londefdef::table;	pop @Apache::londefdef::table;
undef @Apache::londefdef::table;	undef @Apache::londefdef::table;
}	}
	}
	&enable_para();
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 2251 sub end_table {	Line 2579 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') {

	my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1);
	$Apache::londefdef::table[-1]->start_row();

	if ($align ne '') {
	$Apache::londefdef::table[-1]->configure_row({default_halign => $align});
	}

	#---------------------------------------------------------------
	# Old table code.
	#---------------------------------------------------------------

	if (0) {
$Apache::londefdef::table[-1]{'row_number'}++;	$Apache::londefdef::table[-1]{'row_number'}++;
my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);	my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
if ($alignchar ne '') {	if ($alignchar ne '') {
Line 2272 sub start_tr {	Line 2613 sub start_tr {
push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];	push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];
push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];	push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
push @ {$Apache::londefdef::table[-1]{'content'}}, [];	push @ {$Apache::londefdef::table[-1]{'content'}}, [];
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 2279 sub start_tr {	Line 2621 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 = &end_p(); # Close any pending <p> in the row.	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') {

	# In case the user is missing a </td> or </th> tag:

	if ($Apache::londefdef::TD_redirection) {
	&end_td_tex($parstack,$parser,$safeeval);
	}
	$Apache::londefdef::table[-1]->end_row();

	#-----------------------------------------------
	# Old table code
	#-----------------------------------------------

	if (0) {
if ($Apache::londefdef::TD_redirection) {	if ($Apache::londefdef::TD_redirection) {
&end_td_tex($parstack,$parser,$safeeval);	&end_td_tex($parstack,$parser,$safeeval);
}	}
Line 2290 sub end_tr {	Line 2645 sub end_tr {
if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) {	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'};	$Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'};
}	}
	}


}	}
Line 2301 sub end_tr {	Line 2656 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 2326 sub tag_check {	Line 2681 sub tag_check {
}	}
return '';	return '';
}	}

	#
	# Factor out cell configuration hash generation:
	#

	sub cell_config_hash {
	my ($align, $rowspan, $colspan) = @_;
	my %config;
	if ($align ne '') {
	$config{'halign'} = $align;
	}
	if ($colspan ne "") {
	$config{'colspan'} = $colspan;
	}
	if ($rowspan ne '') {
	$config{'rowspan'} = $rowspan;
	}
	return \%config;
	}

sub start_td_tex {	sub start_td_tex {
my ($parstack,$parser,$safeeval) = @_;	my ($parstack,$parser,$safeeval) = @_;

	# At this stage, an empty cell is created with the
	# appropriate rowspan/colspan and alignment
	# attributes, but empty of text. end_td_tex will
	# fetch the contents from the recursive parse and
	# fill the cell with them:
	my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1);
	my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1);
	my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1);

	my $config = &cell_config_hash($align, $rowspan, $colspan);

	my $table = $Apache::londefdef::table[-1];
	$table->add_cell('', $config);


	#------------------------------------------------
	# Old table code.
	#------------------------------------------------

	if (0) {

my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);	my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
if ($alignchar eq '') {	if ($alignchar eq '') {
$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];	$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];
Line 2341 sub start_td_tex {	Line 2737 sub start_td_tex {
$current_length=~/(\d+\.?\d*)/;	$current_length=~/(\d+\.?\d*)/;
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;
}	}
	}
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
return '';	return '';
}	}

sub end_td_tex {	sub end_td_tex {

	my $text = &Apache::lonxml::endredirection();
	my $table = $Apache::londefdef::table[-1];
	$table->append_cell_text($text);

	#-------------------------------------------------
	# Old table code
	#-------------------------------------------------

	if (0) {
my ($parstack,$parser,$safeeval) = @_;	my ($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 2369 sub end_td_tex {	Line 2821 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 2388 sub end_td_tex {	Line 2842 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 2419 sub end_td_tex {	Line 2875 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.
my $nested = $Apache::londefdef::table[-1]{'include'}[$in];
$nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/;
# $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;	my $nested_count = $#{$Apache::londefdef::table[-1]{'include'}}; # This one is constant...
$data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/;	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 2451 sub end_td {	Line 2938 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 2479 sub tagg_check {	Line 2966 sub tagg_check {

sub start_th_tex {	sub start_th_tex {
my ($parstack,$parser,$safeeval) = @_;	my ($parstack,$parser,$safeeval) = @_;

	my $alignment = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef,1);
	my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 1);
	my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 1);

	my $config = cell_config_hash($alignment, $rowspan, $colspan);
	my $table = $Apache::londefdef::table[-1];
	$table->add_cell('\textbf{', $config);

	#-------------------------------------------------------------------------------------
	#
	# Old table code.
	#
	#--------------------------------------------------------------------------------------

	if (0) {


my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);	my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
if ($alignchar eq '') {	if ($alignchar eq '') {
$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];	$alignchar = $Apache::londefdef::table[-1]{'rows'}[-1];
Line 2491 sub start_th_tex {	Line 2996 sub start_th_tex {
$current_length=~/(\d+\.?\d*)/;	$current_length=~/(\d+\.?\d*)/;
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$1;
}	}
	}

	# Accept xml until the </th> tag.

&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
return '';	return '';
}	}

sub end_th_tex {	sub end_th_tex {
my ($parstack,$parser,$safeeval) = @_;	my ($parstack,$parser,$safeeval) = @_;

	my $table = $Apache::londefdef::table[-1];
	my $text = &Apache::lonxml::endredirection();
	$table->append_cell_text($text.'}');

	#-----------------------------------------------------------------------------
	# Old table code:
	#-----------------------------------------------------------------------------

	if (0) {
my $current_row = $Apache::londefdef::table[-1]{'row_number'};	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
my $data=&Apache::lonxml::endredirection();	my $data=&Apache::lonxml::endredirection();
my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);	my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
Line 2561 sub end_th_tex {	Line 3080 sub end_th_tex {
#make data bold	#make data bold
$data='\textbf{'.$data.'}';	$data='\textbf{'.$data.'}';
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;	push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
	}
return'';	return'';
}	}

sub end_th {	sub end_th {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close any open <p> in the row.	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;
Line 2591 sub start_img {	Line 3111 sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;	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 &&
	($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'tex')
	) {
my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);	my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);
return '';	return '';
}	}
Line 2601 sub start_img {	Line 3123 sub start_img {

# Render unto browsers that which are the browser's...	# Render unto browsers that which are the browser's...

if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
if ($env{'browser.imagesuppress'} ne 'on') {	if ($env{'browser.imagesuppress'} ne 'on') {
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});	my $enc = ('yes' eq
	lc(&Apache::lonxml::get_param('encrypturl',$parstack,
	$safeeval)));
	$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
	$enc);
} else {	} 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.']';
}	}
Line 2628 sub start_img {	Line 3154 sub start_img {
$safeeval,	$safeeval,
undef,1));	undef,1));
if(!$align) {	if(!$align) {
if (&is_inside_of($tagstack, "table")) {
$align = "right"; # Force wraptext use.
} else {
$align = "bottom"; # This is html's default so it's ours too.	$align = "bottom"; # This is html's default so it's ours too.
}
}	}
#	#
&Apache::lonxml::debug("Alignemnt = $align");	&Apache::lonxml::debug("Alignemnt = $align");
Line 2647 sub start_img {	Line 3169 sub start_img {
$parstack,	$parstack,
$safeeval,	$safeeval,
undef,0);	undef,0);
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering");	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
if(!$latex_rendering) {	if(!$latex_rendering) {
$latex_rendering = "texwrap";	$latex_rendering = "texwrap";
}	}
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");	# using texwrap inside a table does not work. So, if after all of this,
	# texwrap is on, we turn it off if we detect we're in a table:
	#
	if (($latex_rendering eq 'texwrap') && &is_inside_of($tagstack, "table")) {
	$latex_rendering = 'parpic';
	}

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

#if original gif/jpg/png file exist do following:	#if original bmp/gif/jpg/png file exist do following:
my $origsrc=$src;	my $origsrc=$src;
my ($path,$file) = &get_eps_image($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);	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
&Apache::lonxml::debug("path = $path file = $file src = $src");	&Apache::lonxml::debug("path = $path file = $file src = $src");
if (-e $src) {	if (-e $src) {
&Apache::lonxml::debug("$src exists");	&Apache::lonxml::debug("$src exists");
my ($height_param,$width_param)=	my ($height_param,$width_param)=
&image_size($origsrc,0.3,$parstack,$safeeval);	&image_size($origsrc,0.3,$parstack,$safeeval);
my $destpath = $path;
$destpath =~ s/ /\_/g; # Spaces in path cause LaTex to vomit.
my $destfile = $file;
$destfile =~ s/ /\_/g;
my $size;	my $size;
if ($width_param) { $size.='width='.$width_param.' mm,'; }	if ($width_param) { $size.='width='.$width_param.' mm,'; }
if ($height_param) { $size.='height='.$height_param.' mm]'; }	if ($height_param) { $size.='height='.$height_param.' mm]'; }
	# Default size if not able to extract that (e.g. eps image).

	# &Apache::lonnet::logthis("Size = $size");

$size='['.$size;	$size='['.$size;
$size=~s/,$/]/;	$size=~s/,$/]/;
$currentstring .= '\graphicspath{{'.$destpath.'}}'	$currentstring .= '\graphicspath{{'.$path.'}}'
.'\includegraphics'.$size.'{'.$destfile.'} ';	.'\includegraphics'.$size.'{'.$file.'} ';
	my $closure;
# If there's an alignment specification we need to honor it here.	($currentstring, $closure) = &align_latex_image($align,
# For the horizontal alignments, we will also honor the	$latex_rendering,
# value of the latex specfication. The default is parbox,	$currentstring,
# and that's used for illegal values too.	$width_param,
#	$height_param);
# Even though we set a default alignment value, the user	$currentstring .= $closure;
# could have given us an illegal value. In that case we
# just use the default alignment of bottom..
if ($align eq "top") {
$currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}';
} elsif (($align eq "center") \|\| ($align eq "middle")) { # Being kind
my $offset = $height_param/2;
$currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}';
} elsif ($align eq "left") {
if ($latex_rendering eq "parpic") {
$currentstring = '\parpic[l]{'.$currentstring.'}';
} else { # wrapfig render
$currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}'
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
}
} elsif ($align eq "right") {
if ($latex_rendering eq "parpic") {
$currentstring = '\parpic[r]{'.$currentstring.'}';
} else { # wrapfig rendering
$currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}'
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';

}
} else { # Bottom is also default.
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
}
} else {	} else {
&Apache::lonxml::debug("$src does not exist");	&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
Line 2720 sub start_img {	Line 3226 sub start_img {
# And here's where the semi-quote breaks down: allow the user	# And here's where the semi-quote breaks down: allow the user
# to edit the beast as well by rendering the problem for edit:	# to edit the beast as well by rendering the problem for edit:
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
	my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
$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).
&Apache::edit::browse('src',undef,'alt').' '.	&Apache::edit::browse('src',undef,'alt',$only).' '.
&Apache::edit::search('src',undef,'alt').'<br />';	&Apache::edit::search('src',undef,'alt').'<br />';
$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';	$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);	$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
Line 2732 sub start_img {	Line 3239 sub start_img {
$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',	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
['', 'parbox', 'parpic'], $token, 2);	['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
	$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
	['no','yes'], $token, 2);
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();	$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);

	if ($token->[2]{'src'}=~/\$/) {
$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';	$currentstring.='Variable image source';
if ($width) { $currentstring.=' width="'.$width.'" '; }	} else {
if ($height) { $currentstring.=' height="'.$height.'" '; }	$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
$currentstring .= ' />';	if ($width) { $currentstring.=' width="'.$width.'" '; }
	if ($height) { $currentstring.=' height="'.$height.'" '; }
	$currentstring .= ' />';
	}
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my ($osrc,$owidth,$oheight)=	my ($osrc,$owidth,$oheight)=
($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', 'TeXwrap',	'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 2792 sub start_img {	Line 3304 sub start_img {
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 2810 sub start_applet {	Line 3322 sub start_applet {
undef,1);	undef,1);
&Apache::lonxml::extlink($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 = &Apache::lonenc::encrypt_ref($token,	$currentstring = &Apache::lonenc::encrypt_ref($token,
{'code'=>$code,	{'code'=>$code,
Line 2826 sub start_applet {	Line 3338 sub start_applet {
$currentstring='[APPLET: '.$alttag.']';	$currentstring='[APPLET: '.$alttag.']';
}	}
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	# Turn off some stuff we can't be inside thank you LaTeX


	my $restart_sub = 0;
	my $restart_sup = 0;

	# Since <sub> and <sup> are simple tags it's ok to turn off/on
	# using the start_ stop_ functions.. those tags only care about
	# $target.

	if (&is_inside_of($tagstack, "sub")) {
	$restart_sub = 1;
	$currentstring .= &end_sub($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
	if (&is_inside_of($tagstack, "sup")) {
	$restart_sup = 1;
	$currentstring .= &end_sup($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}

	# Now process the applet; just replace it with its alt attribute.

my $alttag= &Apache::lonxml::get_param('alt',$parstack,	my $alttag= &Apache::lonxml::get_param('alt',$parstack,
$safeeval,undef,1);	$safeeval,undef,1);
unless ($alttag) {	unless ($alttag) {
Line 2836 sub start_applet {	Line 3371 sub start_applet {
}	}
$currentstring.='\begin{center} \fbox{Java Applet: '.$alttag.	$currentstring.='\begin{center} \fbox{Java Applet: '.$alttag.
'.}\end{center}';	'.}\end{center}';

	# Turn stuff back on that we can't be inside of.

	if ($restart_sub) {
	$currentstring .= &start_sub($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
	if ($restart_sup) {
	$currentstring .= &start_sup($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 2843 sub start_applet {	Line 3389 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 2856 sub start_embed {	Line 3402 sub start_embed {
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
&Apache::lonxml::extlink($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=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});	$currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
} else {	} else {
Line 2875 sub start_embed {	Line 3421 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 2895 sub start_param {	Line 3441 sub start_param {
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
&Apache::lonxml::extlink($src);	&Apache::lonxml::extlink($src);
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
my %toconvert;	my %toconvert;
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
if ($src) { $toconvert{'src'}= $src; }	if ($src) { $toconvert{'src'}= $src; }
Line 2914 sub start_param {	Line 3460 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 2952 sub end_allow {	Line 3498 sub end_allow {
sub start_frameset {	sub start_frameset {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = ''; # Close any pending para.	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 2988 sub start_frameset {	Line 3514 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 2998 sub end_frameset {	Line 3524 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 3009 sub start_xmp {	Line 3535 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 3021 sub end_xmp {	Line 3547 sub end_xmp {
sub start_pre {	sub start_pre {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # close off pending <p>	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 3032 sub start_pre {	Line 3559 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 3044 sub end_pre {	Line 3572 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 3054 sub start_insert {	Line 3582 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 3064 sub end_insert {	Line 3592 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 3074 sub start_externallink {	Line 3602 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 3104 sub end_blankspace {	Line 3632 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 3113 sub start_abbr {	Line 3641 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 3123 sub end_abbr {	Line 3651 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 3132 sub start_acronym {	Line 3660 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 3142 sub end_acronym {	Line 3670 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 3151 sub start_area {	Line 3679 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 3161 sub end_area {	Line 3689 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 3170 sub start_base {	Line 3698 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 3180 sub end_base {	Line 3708 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 3189 sub start_bdo {	Line 3717 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 3199 sub end_bdo {	Line 3727 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 3208 sub start_bgsound {	Line 3736 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 3218 sub end_bgsound {	Line 3746 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 3227 sub start_blink {	Line 3755 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 3237 sub end_blink {	Line 3765 sub end_blink {
sub start_blockquote {	sub start_blockquote {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = &end_p(); # Close any unclosed <p>	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 3256 sub end_blockquote {	Line 3790 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 3265 sub start_button {	Line 3799 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 3275 sub end_button {	Line 3809 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 3284 sub start_caption {	Line 3818 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 3294 sub end_caption {	Line 3828 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 3303 sub start_col {	Line 3837 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 3313 sub end_col {	Line 3847 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 3322 sub start_colgroup {	Line 3856 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 3332 sub end_colgroup {	Line 3866 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 3341 sub start_del {	Line 3875 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 3351 sub end_del {	Line 3885 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 3360 sub start_fieldset {	Line 3894 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 3370 sub end_fieldset {	Line 3904 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 3379 sub start_frame {	Line 3913 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 3389 sub end_frame {	Line 3923 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 3398 sub start_iframe {	Line 3932 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 3408 sub end_iframe {	Line 3942 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 3417 sub start_ins {	Line 3951 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 3427 sub end_ins {	Line 3961 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 3436 sub start_isindex {	Line 3970 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 3446 sub end_isindex {	Line 3980 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 3455 sub start_keygen {	Line 3989 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 3465 sub end_keygen {	Line 3999 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 3474 sub start_label {	Line 4008 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 3484 sub end_label {	Line 4018 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 3493 sub start_layer {	Line 4027 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 3503 sub end_layer {	Line 4037 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 3512 sub start_legend {	Line 4046 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 3522 sub end_legend {	Line 4056 sub end_legend {
sub start_link {	sub start_link {
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 $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
undef,1);	undef,1);
&Apache::lonxml::extlink($href);	&Apache::lonxml::extlink($href);
Line 3534 sub start_link {	Line 4068 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 3544 sub end_link {	Line 4078 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 3553 sub start_marquee {	Line 4087 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 3563 sub end_marquee {	Line 4097 sub end_marquee {
sub start_multicol {	sub start_multicol {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = &end_p(); # Close any pending <p>	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 3572 sub start_multicol {	Line 4106 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 3582 sub end_multicol {	Line 4116 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 3593 sub start_nobr {	Line 4127 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 3605 sub end_nobr {	Line 4139 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 3614 sub start_noembed {	Line 4148 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 3624 sub end_noembed {	Line 4158 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 3633 sub start_noframes {	Line 4167 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 3643 sub end_noframes {	Line 4177 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 3652 sub start_nolayer {	Line 4186 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 3662 sub end_nolayer {	Line 4196 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 3671 sub start_noscript {	Line 4205 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 3681 sub end_noscript {	Line 4215 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 3690 sub start_object {	Line 4224 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 3700 sub end_object {	Line 4234 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 3709 sub start_optgroup {	Line 4243 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 3719 sub end_optgroup {	Line 4253 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 3730 sub start_samp {	Line 4264 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 3742 sub end_samp {	Line 4276 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 3751 sub start_server {	Line 4285 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 3761 sub end_server {	Line 4295 sub end_server {
sub start_spacer {	sub start_spacer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = &end_p(); # Close off any open <p> tag.	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 3770 sub start_spacer {	Line 4304 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 3780 sub end_spacer {	Line 4314 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 3789 sub start_span {	Line 4323 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 3799 sub end_span {	Line 4333 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 3808 sub start_tbody {	Line 4342 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 3818 sub end_tbody {	Line 4352 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 3827 sub start_tfoot {	Line 4361 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 3837 sub end_tfoot {	Line 4371 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 3846 sub start_thead {	Line 4380 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 3856 sub end_thead {	Line 4390 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 3867 sub start_var {	Line 4401 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 3879 sub end_var {	Line 4413 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 3888 sub start_wbr {	Line 4422 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 3897 sub end_wbr {	Line 4431 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 3906 sub start_hideweboutput {	Line 4440 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 3926 sub image_replication {	Line 4460 sub image_replication {
}	}
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 {	sub resize_image {
my ($height_param, $width_param, $scaling,	my ($height_param, $width_param, $scaling,
$parstack, $safeeval, $depth, $cis) = @_;	$parstack, $safeeval, $depth, $cis) = @_;
Line 4049 sub get_eps_image {	Line 4565 sub get_eps_image {
&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.	&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
}	}
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src");	&Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
my ($spath, $sname, $sext) = fileparse($src, qr/\.(gif\|png\|jpg\|jpeg)/i);	my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp\|gif\|png\|jpg\|jpeg)/i);
$src=~s/\.(gif\|png\|jpg\|jpeg)$/\.eps/i;	$src=~s/\.(bmp\|gif\|png\|jpg\|jpeg)$/\.eps/i;
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
&Apache::lonxml::debug("Filelocation gives: $src");	&Apache::lonxml::debug("Filelocation gives: $src");
if (! -e $src) {	if (! -e $src) {
Line 4074 sub get_eps_image {	Line 4590 sub get_eps_image {
my $newsrc=$orig_src;	my $newsrc=$orig_src;
$newsrc =~ s\|(.*)/res/\|/home/httpd/html/res/\|;	$newsrc =~ s\|(.*)/res/\|/home/httpd/html/res/\|;
&Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");	&Apache::lonxml::debug("queueing $newsrc for dynamic eps production.");
print FILE "$newsrc\n";	print FILE ("$newsrc\n");
close FILE;	close(FILE);
$src=~s\|/home/httpd/html/res\|/home/httpd/prtspool\|;	$src=~s\|/home/httpd/html/res\|/home/httpd/prtspool\|;
$src=~s\|/home/([^/]*)/public_html/\|/home/httpd/prtspool/$1/\|;	$src=~s\|/home/([^/]*)/public_html/\|/home/httpd/prtspool/$1/\|;
if ($sext ne "") { # Put the ext. back in to uniquify.	if ($sext ne "") { # Put the ext. back in to uniquify.
$src =~ s/\.eps$/$sext.eps/;	$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\|(.)/([^/])$\|);	my ($path,$file)=($src=~m\|(.)/([^/])$\|);
	$path =~ s/ /\_/g;
	$file =~ s/ /\_/g;
&Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />");	&Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />");
return ($path.'/',$file);	return ($path.'/',$file);
}	}
Line 4095 sub eps_generation {	Line 4627 sub eps_generation {
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/(\.bmp\|\.gif\|\.jpg\|\.jpeg)$/\.eps/i;
$newsrc=~s/\/home\/httpd\/html\/res//;	$newsrc=~s{/home/httpd/html/res}{};
$newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;	$newsrc=~s{/home/($LONCAPA::username_re)/public_html/}{/$1/};
$newsrc=~s/\/\.\//\//;	$newsrc=~s{/\./}{/};
$newsrc=~s/\/([^\/]+)\.(ps\|eps)/\//;	$newsrc=~s{/([^/]+)\.(ps\|eps)}{/};
if ($newsrc=~/\/home\/httpd\/lonUsers\//) {	if ($newsrc=~m{/home/httpd/lonUsers/}) {
$newsrc=~s/\/home\/httpd\/lonUsers//;	$newsrc=~s{/home/httpd/lonUsers}{};
$newsrc=~s/\/([^\/]+)\/(\w)\/(\w)\/(\w)\//\/$1\//;	$newsrc=~s{/($LONCAPA::domain_re)/./././}{/$1/};
}	}
if ($newsrc=~/\/userfiles\//) {	if ($newsrc=~m{/userfiles/}) {
return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';	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 4120 sub file_path {	Line 4652 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 4169 sub LATEX_length {	Line 4698 sub LATEX_length {
}	}


# is_inside_of $tagstack $tag	sub align_latex_image {
# This sub returns true if the current state of Xml processing	my ($align, $latex_rendering, $image, $width, $height) = @_;
# is inside of the tag.	my $currentstring; # The 1/2 wrapped image.
# Parameters:	my $closure; # The closure of the wrappage.
# tagstack - The tagstack from the parser.
# tag - The tag (without the <>'s.).	# if it's none just return it back
# Sample usage:	if ($latex_rendering eq 'none') {
# if (is_inside_of($tagstack "table")) {	return ($image,'');
# # I'm in a table....	}
# }
	# If there's an alignment specification we need to honor it here.
	# For the horizontal alignments, we will also honor the
	# value of the latex specfication. The default is parbox,
	# and that's used for illegal values too.
	#
	# Even though we set a default alignment value, the user
	# could have given us an illegal value. In that case we
	# just use the default alignment of bottom..
	$currentstring = "\n% figurewrapping \n";
	if ($align eq "top") {
	$currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
	$closure = '}';
	} elsif (($align eq "center") \|\| ($align eq "middle")) { # Being kind
	my $offset = $height/2;
	$currentstring .= '\raisebox{-'.$offset.'mm}{'.$image;
	$closure = '}';
	} elsif ($align eq "left") {
	if ($latex_rendering eq "parpic") {
	$currentstring .= '\parpic[l]{'.$image;
	$closure = '}';
	} elsif ($latex_rendering eq "parbox") {
	$currentstring .= '\begin{minipage}[l]{'.$width.'mm}'
	.$image;
	$closure = '\end{minipage}';
	} elsif ($latex_rendering eq "wrapfigure"
	\|\| $latex_rendering ne 'none') { # wrapfig render
	$currentstring .=
	'\begin{wrapfigure}{l}{'.$width.'mm}'
	.'\scalebox{1.0}{'.$image;
	$closure = '}\end{wrapfigure}';
	}
	} elsif ($align eq "right") {
	if ($latex_rendering eq "parpic") {
	$currentstring .= '\parpic[r]{'.$image;
	$closure = '}';
	} elsif ($latex_rendering eq "parbox") {
	$currentstring .= '\begin{minipage}[r]{'.$width.'mm}'
	.$image;
	$closure = '\end{minipage}';
	} elsif ($latex_rendering eq "wrapfigure"
	\|\| $latex_rendering ne 'none') { # wrapfig render
	$currentstring .=
	'\begin{wrapfigure}{r}{'.$width.'mm}'
	.'\scalebox{1.0}{'.$image;
	$closure = '}\end{wrapfigure}';
	}
	} else { # Bottom is also default.
	# $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}';
	$currentstring .= "{$image";
	$closure = '}';
	}
	$currentstring .= "\n% end wrappage\n";
	$closure = "\n% Begin closure\n".$closure."\n% End closure\n";
	return ($currentstring, $closure);
	}


sub is_inside_of {	sub is_inside_of {
my ($tagstack, $tag) = @_;	my ($tagstack, $tag) = @_;
my @stack = @$tagstack;	my @stack = @$tagstack;
Line 4191 sub is_inside_of {	Line 4777 sub is_inside_of {
}	}


	#
	# This sub provides the typical LaTeX prefix matter for tex output:
	#
	sub latex_header
	{
	my $currentstring = '';

	$currentstring .=
	'\documentclass[letterpaper,twoside]{article}\raggedbottom';
	if (($env{'form.latex_type'}=~'batchmode') \|\|
	(!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
	$currentstring .= '\newcommand{\keephidden}[1]{}'.
	'\renewcommand{\deg}{$^{\circ}$}'.
	'\usepackage{multirow}'.
	'\usepackage{longtable}'.
	'\usepackage{textcomp}'.
	'\usepackage{makeidx}'.
	'\usepackage[dvips]{graphicx}'.
	'\usepackage{wrapfig}'.
	'\usepackage{picins}'.
	'\usepackage[T1]{fontenc}'."\n".
	'\usepackage{lmodern}'."\n".
	'\usepackage[postscript]{ucs}'."\n".
	'\usepackage[utf8x]{inputenc}'."\n".
	'\usepackage{pifont}' ."\n".
	'\usepackage{latexsym}'."\n".
	'\usepackage{epsfig}'.
	"\\usepackage{xtab}\n".
	"\\usepackage{tabularx}\n".
	"\\usepackage{booktabs}\n".
	"\\usepackage{array}\n".
	"\\usepackage{colortbl}\n".
	"\\usepackage{xcolor}\n".
	'\usepackage{calc}'.
	'\usepackage{amsmath}'.
	'\usepackage{amssymb}'.
	'\usepackage{amsfonts}'.
	'\usepackage{amsthm}'.
	'\usepackage{amscd}';

	if($env{'form.pdfFormFields'} eq 'yes') {
	$currentstring .= '\usepackage{hyperref}'.
	'\usepackage{eforms}'.
	'\usepackage{tabularx}';
	}

	$currentstring .= '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
	'\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';

	return $currentstring;

	}

	=pod

	=head1 NAME

	Apache::londefdef.pm

	=head1 SYNOPSIS

	Tags Default Definition Module

	This is part of the LearningOnline Network with CAPA project
	described at http://www.lon-capa.org.


	=head1 NOTABLE SUBROUTINES

	=over

	=item start_hideweboutput()

	=item end_hideweboutput()

	=item image_replication()

	=item resize_image()

	Get correct sizing parameter for an image given
	it's initial ht. and wid. This allows sizing of
	images that are generated on-the-fly (e.g. gnuplot)
	as well as serving as a utility for image_size.

	Parameter:
	height_param
	width_param - Initial picture dimensions.
	scaling - A scale factor.
	parstack, - the current stack of tag attributes
	from the xml parser
	safeeval, - pointer to the safespace
	depth, - from what level in the stack to look for attributes
	(assumes -1 if unspecified)
	cis - look for attrubutes case insensitively
	(assumes false)

	Returns:
	height, width - new dimensions.

	=item image_size()

	=item image_width()

	=item image_height()

	=item get_eps_image()

	=item eps_generation()

	=item file_path()

	=item recalc()

	Converts a measurement in to mm from any of
	the other valid LaTeX units of measure.
	If the units of measure are missing from the
	parameter, it is assumed to be in and returned
	with mm units of measure

	=item LATEX_length()

	=item align_latex_image()

	Wrap image 'stuff' inside of the LaTeX required to implement
	alignment:
	align_tex_image(align, latex_rendering, image)
	Where:
	align - The HTML alignment specification.
	latex_rendering - rendering hint for latex.
	image - The LaTeX needed to insert the image itsef.
	width,height - dimensions of the image.
	Returns:
	The 1/2 wrapped image and the stuff required to close the
	wrappage. This allows e.g. randomlabel to insert more stuff
	into the closure.


	=item is_inside_of($tagstack, $tag)
	This sub returns true if the current state of Xml processing is inside of the tag.
	Parameters:
	tagstack - The tagstack from the parser.
	tag - The tag (without the <>'s.).
	Sample usage:
	if (is_inside_of($tagstack "table")) {
	I'm in a table....
	}



	=back

	=cut


1;	1;
__END__	__END__

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

Removed from v.1.300
changed lines
	Added in v.1.400