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.269 and 1.302.2.4

version 1.269, 2005/04/29 21:22:33	version 1.302.2.4, 2006/03/29 22:54:10
Line 47 use Image::Magick;	Line 47 use Image::Magick;
use Apache::lonmenu();	use Apache::lonmenu();
use Apache::lonmeta();	use Apache::lonmeta();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
	use File::Basename;
	# use Data::Dumper;

BEGIN {	BEGIN {

Line 55 BEGIN {	Line 56 BEGIN {

}	}

	#
	# Dumps all elements of the table structure.
	# Need this 'cause evidently when given an array, Data::Dumper only seems
	# to dump element 0.
	#
	#sub debug_dump_table {
	# my $lastrow = $#Apache::londefdef::table;
	# &Apache::lonnet::logthis("Dumping table: Last row index: $lastrow");
	# my $row;
	# for ($row =0; $row <= $lastrow; $row++ ) {
	# my $text = Dumper($Apache::londefdef::table[$row]);
	# &Apache::lonnet::logthis("table [ $row ]".$text);
	#
	# }
	#}
sub initialize_londefdef {	sub initialize_londefdef {
$Apache::londefdef::TD_redirection=0;	$Apache::londefdef::TD_redirection=0;
@Apache::londefdef::table = ();	@Apache::londefdef::table = ();
Line 90 sub start_m {	Line 106 sub start_m {
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
#&Apache::lonxml::debug("M is evaulated to:$inside:");	#&Apache::lonxml::debug("M is evaulated to:$inside:");
}	}
$currentstring = &Apache::lontexconvert::converted(\$inside);	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
	$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
if ($Apache::lontexconvert::errorstring) {	if ($Apache::lontexconvert::errorstring) {
&Apache::lonxml::warning("tth error: ".	&Apache::lonxml::warning("tth error: ".
$Apache::lontexconvert::errorstring);	$Apache::lontexconvert::errorstring);
Line 108 sub start_m {	Line 125 sub start_m {
# detect simple math mode entry exits, and convert them	# detect simple math mode entry exits, and convert them
# to use \ensuremath	# to use \ensuremath
if ($currentstring=~/^\s\$[^\$].[^\$]\$\s*$/) {	if ($currentstring=~/^\s\$[^\$].[^\$]\$\s*$/) {
$currentstring=~s/^\$//;	$currentstring=~s/^(\s*)\$/$1/;
$currentstring=~s/\$$//;	$currentstring=~s/\$(\s*)$/$1/;
$currentstring='\ensuremath{'.$currentstring.'}';	$currentstring='\ensuremath{'.$currentstring.'}';
}	}
$Apache::lonxml::post_evaluate=0;	$Apache::lonxml::post_evaluate=0;
Line 127 sub end_m {	Line 144 sub end_m {
}	}

sub start_tthoption {	sub start_tthoption {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $result;	my $result;
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser);	my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser,
	$style);
$inside=~s/^\s*//;	$inside=~s/^\s*//;
if ($env{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
&tth::ttmoptions($inside);	&tth::ttmoptions($inside);
Line 165 sub start_html {	Line 183 sub start_html {
'\usepackage{textcomp}'.	'\usepackage{textcomp}'.
'\usepackage{makeidx}'.	'\usepackage{makeidx}'.
'\usepackage[dvips]{graphicx}'.	'\usepackage[dvips]{graphicx}'.
	'\usepackage{wrapfig}'.
'\usepackage{picins}'.	'\usepackage{picins}'.
'\usepackage{epsfig}'.	'\usepackage{epsfig}'.
'\usepackage{calc}'.	'\usepackage{calc}'.
Line 212 sub end_head {	Line 231 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 221 sub start_map {	Line 240 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 231 sub end_map {	Line 250 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 242 sub start_select {	Line 261 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 252 sub end_select {	Line 271 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 268 sub start_option {	Line 287 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 280 sub end_option {	Line 299 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 289 sub start_input {	Line 308 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 299 sub end_input {	Line 318 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 308 sub start_textarea {	Line 327 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 318 sub end_textarea {	Line 337 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 327 sub start_form {	Line 346 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 366 sub end_title {	Line 385 sub end_title {

#-- <meta> tag (end tag forbidden)	#-- <meta> tag (end tag forbidden)
sub start_meta {	sub start_meta {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
my $args='';	my $args='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
if ($args eq '') {	if ($args eq '') {
&Apache::lonxml::get_all_text("/meta",$parser);	&Apache::lonxml::get_all_text("/meta",$parser,$style);
} else {	} else {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
Line 417 sub start_meta {	Line 436 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 435 sub end_meta {	Line 454 sub end_meta {

# accessrule	# accessrule
sub start_accessrule {	sub start_accessrule {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $currentstring = '';	my $currentstring = '';
my $eff=&Apache::lonxml::get_param	my $eff=&Apache::lonxml::get_param
('effect',$parstack,$safeeval,undef,1);	('effect',$parstack,$safeeval,undef,1);
Line 454 sub start_accessrule {	Line 473 sub start_accessrule {
my $args='';	my $args='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
if ($args eq '') {	if ($args eq '') {
&Apache::lonxml::get_all_text("/accessrule",$parser);	&Apache::lonxml::get_all_text("/accessrule",$parser,$style);
} else {	} else {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
Line 534 sub start_body {	Line 553 sub start_body {
$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().	$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
';'.$onUnload;	';'.$onUnload;

if ($env{'request.state'} ne 'construct') {	$currentstring .= '<'.$token->[1];
$currentstring .= '<'.$token->[1];
}
foreach (keys %{$token->[2]}) {	foreach (keys %{$token->[2]}) {
$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';	$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
}	}
if ($env{'request.state'} ne 'construct') {	$currentstring.='>';
$currentstring.='>';	&Apache::lontexconvert::jsMath_reset();
	if ($env{'environment.texengine'} eq 'jsMath') {
	$currentstring.=&Apache::lontexconvert::jsMath_header();
}	}
if ($env{'request.state'} ne 'published') {	if ($env{'request.state'} ne 'published') {
my $remote=($env{'environment.remote'} ne 'off');	if ($env{'environment.remote'} eq 'off') {
$currentstring=&Apache::loncommon::bodytag(undef,undef,	$currentstring.=
$currentstring,$remote);	&Apache::lonmenu::constspaceform().
	&Apache::lonmenu::menubuttons(1,'web',1);
	}
$currentstring.=(<<EDITBUTTON);	$currentstring.=(<<EDITBUTTON);
<form method="post">	<form method="post">
<input type="submit" name="editmode" accesskey="e" value="Edit" />	<input type="submit" name="editmode" accesskey="e" value="Edit" />
</form>	</form>
EDITBUTTON	EDITBUTTON
} else {	} else {
$currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);	$currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
Line 564 EDITBUTTON	Line 585 EDITBUTTON

sub end_body {	sub end_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off unclosed <p>
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = &Apache::lonxml::xmlend($target,$parser);	$currentstring .= &Apache::lonxml::xmlend($target,$parser);
} 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
	sub center_correction { return '\vspace*{-6 mm}'; }
#-- <center> tag (end tag required)	#-- <center> tag (end tag required)
sub start_center {	sub start_center {
my ($target,$token) = @_;	my ($target,$token,$tagstack) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off any prior para.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '\begin{center}';	if (&is_inside_of($tagstack, "table")) {
	$currentstring .= &center_correction();
	}
	$currentstring .= '\begin{center}';
}	}
return $currentstring;	return $currentstring;
}	}

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

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

#-- <strong> tag (end tag required)	#-- <strong> tag (end tag required)
	# NOTE: in TeX mode disables internal <p>
sub start_strong {	sub start_strong {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	&disable_para();
$currentstring = '\textbf{';	$currentstring = '\textbf{';
}	}
return $currentstring;	return $currentstring;
Line 634 sub start_strong {	Line 669 sub start_strong {
sub end_strong {	sub end_strong {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	&enable_para();
$currentstring = '}';	$currentstring = '}';
}	}
return $currentstring;	return $currentstring;
Line 645 sub end_strong {	Line 681 sub end_strong {
#-- <h1> tag (end tag required)	#-- <h1> tag (end tag required)
sub start_h1 {	sub start_h1 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off any prior para.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 660 sub start_h1 {	Line 696 sub start_h1 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
} elsif ($target eq 'meta') {	} elsif ($target eq 'meta') {
$currentstring='<subject>';	$currentstring.='<subject>';
&start_output($target);	&start_output($target);
}	}
return $currentstring;	return $currentstring;
Line 671 sub start_h1 {	Line 707 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 694 sub end_h1 {	Line 730 sub end_h1 {
#-- <h2> tag	#-- <h2> tag
sub start_h2 {	sub start_h2 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off any prior para.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 709 sub start_h2 {	Line 745 sub start_h2 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 717 sub start_h2 {	Line 753 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 737 sub end_h2 {	Line 773 sub end_h2 {
#-- <h3> tag	#-- <h3> tag
sub start_h3 {	sub start_h3 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off any prior para.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 752 sub start_h3 {	Line 788 sub start_h3 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 760 sub start_h3 {	Line 796 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 780 sub end_h3 {	Line 816 sub end_h3 {
#-- <h4> tag	#-- <h4> tag
sub start_h4 {	sub start_h4 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off any prior para.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 795 sub start_h4 {	Line 831 sub start_h4 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 803 sub start_h4 {	Line 839 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 823 sub end_h4 {	Line 859 sub end_h4 {
#-- <h5> tag	#-- <h5> tag
sub start_h5 {	sub start_h5 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off any prior paras.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 838 sub start_h5 {	Line 874 sub start_h5 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 846 sub start_h5 {	Line 882 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 866 sub end_h5 {	Line 902 sub end_h5 {
#-- <h6> tag	#-- <h6> tag
sub start_h6 {	sub start_h6 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off any prior paras.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $pre;	my $pre;
Line 881 sub start_h6 {	Line 917 sub start_h6 {
}	}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}	if (not defined $TeXsize) {$TeXsize="large";}
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';	$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 889 sub start_h6 {	Line 925 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 910 sub end_h6 {	Line 946 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 921 sub start_cite {	Line 957 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 933 sub end_cite {	Line 969 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 944 sub start_i {	Line 980 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 956 sub end_i {	Line 992 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 967 sub start_address {	Line 1003 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 979 sub end_address {	Line 1015 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 990 sub start_dfn {	Line 1026 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 1002 sub end_dfn {	Line 1038 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 1013 sub start_tt {	Line 1049 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 1025 sub end_tt {	Line 1061 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 1036 sub start_kbd {	Line 1072 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 1048 sub end_kbd {	Line 1084 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 1059 sub start_code {	Line 1095 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 1071 sub end_code {	Line 1107 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 1082 sub start_em {	Line 1118 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 1094 sub end_em {	Line 1130 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 1105 sub start_q {	Line 1141 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 1113 sub end_q {	Line 1149 sub end_q {
return $currentstring;	return $currentstring;
}	}

	# <p> is a bit strange since it does not require a closing </p>
	# However in latex, we must often output closing stuff to end
	# environments and {}'s etc. Therefore we do all the work
	# of figuring out the ending strings in the start tag processing,
	# and provide a mechanism to output the stop text external
	# to tag processing.
	#
	{

	my $closing_string = ''; # String required to close <p>

	# Some tags are <p> fragile meaning that <p> inside of them
	# does not work within TeX mode. This is managed via the
	# counter below:
	#

	my $para_disabled = 0;

	sub disable_para {
	$para_disabled++;
	}
	sub enable_para {
	$para_disabled--;
	}


#-- <p> tag (end tag optional)	#-- <p> tag (end tag optional)
#optional attribute - align="center\|left\|right"	#optional attribute - align="center\|left\|right"
sub start_p {	sub start_p {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
	$currentstring .= &end_p(); # close off prior para if in progress.
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	if (! ($currentstring =~ /\//)) {
	$closing_string = '</p>'; # Deal correctly with <p /> e.g.
	}
	} elsif ($target eq 'tex' && !$para_disabled) {
	$currentstring .= &end_p(); # close off prior para if in progress.
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
if ($align eq 'center') {	if ($align eq 'center') {
$currentstring='\begin{center}\par';	$currentstring .='\begin{center}\par';
	$closing_string = '\end{center}';
	if (&is_inside_of($tagstack, "table")) {
	$currentstring = &center_correction().$currentstring;
	#$closing_string .= &center_correction();
	}
} elsif ($align eq 'right') {	} elsif ($align eq 'right') {
$currentstring='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';	$currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
	$closing_string= '}}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$currentstring='\noindent\makebox['.$env{'form.textwidth'}.']{\rlap{';	$currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{\rlap{';
	$closing_string = '}\hfill}';
} else {	} else {
$currentstring='\par ';	$currentstring.='\par ';
	$closing_string = '\strut\\\\\strut ';
}	}
my $signal=1;#<p> does not work inside <b>...</b>
foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}
if (!$signal) {$currentstring = '';}
}
}	}
return $currentstring;	return $currentstring;
}	}
	#
	# End paragraph processing just requires that we output the
	# closing string that was saved and blank it.
sub end_p {	sub end_p {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	# Note only 'tex' mode uses disable_para and enable_para
my $currentstring = '';	# so we don't need to know the target in the check below:
if ($target eq 'web') {
$currentstring .= $token->[2];	if (!$para_disabled) {
} elsif ($target eq 'tex') {	my $current_string = $closing_string;
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);	$closing_string = ''; # Not in a para anymore.
if (not defined $align) {	return $current_string;
$currentstring.='\strut\\\\\strut ';	} else {
} elsif ($align eq 'center') {	return '';
$currentstring .= '\end{center}';
} elsif ($align eq 'right') {
$currentstring .= '}}';
} elsif ($align eq 'left') {
$currentstring .= '}\hfill}';
}
}	}
return $currentstring;
}

	}
	}
#-- <br> tag (end tag forbidden)	#-- <br> tag (end tag forbidden)
sub start_br {	sub start_br {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my @tempo=@$tagstack;	my @tempo=@$tagstack;
my $signal=0;	my $signal=0;
	# Not going to factor this to is_inside_of since that would require
	# multiple stack traversals.
	#
for (my $i=$#tempo;$i>=0;$i--) {	for (my $i=$#tempo;$i>=0;$i--) {
if (($tempo[$i] eq 'b') \|\| ($tempo[$i] eq 'strong') \|\|	if (($tempo[$i] eq 'b') \|\| ($tempo[$i] eq 'strong') \|\|
($tempo[$i] eq 'ol') \|\| ($tempo[$i] eq 'ul') \|\|	($tempo[$i] eq 'ol') \|\| ($tempo[$i] eq 'ul') \|\|
Line 1188 sub start_br {	Line 1259 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 1198 sub end_br {	Line 1269 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 1209 sub start_big {	Line 1280 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 1221 sub end_big {	Line 1292 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 1232 sub start_small {	Line 1303 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 1244 sub end_small {	Line 1315 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 1258 sub start_basefont {	Line 1329 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 1273 sub end_basefont {	Line 1344 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 1292 sub start_font {	Line 1363 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 1307 sub end_font {	Line 1378 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 1318 sub start_strike {	Line 1389 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 1333 sub end_strike {	Line 1404 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 1344 sub start_s {	Line 1415 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 1359 sub end_s {	Line 1430 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 .= '\ensuremath{_{';
Line 1370 sub start_sub {	Line 1441 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 1382 sub end_sub {	Line 1453 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 .= '\ensuremath{^{';
Line 1393 sub start_sup {	Line 1464 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 1404 sub end_sup {	Line 1475 sub end_sup {
#-- <hr> tag (end tag forbidden)	#-- <hr> tag (end tag forbidden)
sub start_hr {	sub start_hr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # End enclosing para.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);	my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
Line 1435 sub start_hr {	Line 1506 sub start_hr {
sub end_hr {	sub end_hr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
}	}
return $currentstring;	return $currentstring;
}	}

#-- <div> tag (end tag required)	#-- <div> tag (end tag required)
	{

	# Since div can be nested, the stack below is used
	# in 'tex' mode to store the ending strings
	# for the div stack.

	my @div_end_stack;

sub start_div {	sub start_div {
my ($target,$token) = @_;	my ($target,$token, $tagstack, $parstack, $parser, $safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close enclosing para.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
}	}
	if ($target eq 'tex') {
	# 4 possible alignments: left, right, center, and -missing-.

	my $endstring = '';

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

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

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

#-- <a> tag (end tag required)	#-- <a> tag (end tag required)
sub start_a {	sub start_a {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
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});
Line 1486 sub start_a {	Line 1598 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];
}	}
return $currentstring;	return $currentstring;
Line 1496 sub end_a {	Line 1608 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 1526 sub start_li {	Line 1638 sub start_li {

sub end_li {	sub end_li {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # In case there's a <p> in the <li>
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring .= $token->[2];
}	}
return $currentstring;	return $currentstring;
}	}
Line 1537 sub end_li {	Line 1649 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 1548 sub start_u {	Line 1660 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 1562 sub end_u {	Line 1674 sub end_u {
#-- <ul> tag (end tag required)	#-- <ul> tag (end tag required)
sub start_ul {	sub start_ul {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off enclosing list.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);	my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
$Apache::londefdef::list_index=0;	$Apache::londefdef::list_index=0;
Line 1592 sub start_ul {	Line 1704 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 1607 sub end_ul {	Line 1719 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 1618 sub start_menu {	Line 1730 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 1629 sub end_menu {	Line 1741 sub end_menu {
#-- <dir> tag (end tag required)	#-- <dir> tag (end tag required)
sub start_dir {	sub start_dir {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # In case there's a <p> prior to the list.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = " \\begin{itemize} ";	$currentstring .= " \\begin{itemize} ";
}	}
return $currentstring;	return $currentstring;
}	}
Line 1641 sub start_dir {	Line 1753 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 1652 sub end_dir {	Line 1764 sub end_dir {
#-- <ol> tag (end tag required)	#-- <ol> tag (end tag required)
sub start_ol {	sub start_ol {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # In case there's a <p> prior to the list.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::list_index=0;	$Apache::londefdef::list_index=0;
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
Line 1692 sub start_ol {	Line 1804 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 1706 sub end_ol {	Line 1818 sub end_ol {
#-- <dl> tag (end tag required)	#-- <dl> tag (end tag required)
sub start_dl {	sub start_dl {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # In case there's a <p> unclosed prior to the list.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '\begin{description}';	$currentstring .= '\begin{description}';
$Apache::londefdef::DL++;	$Apache::londefdef::DL++;
push(@Apache::londefdef::description,[]);	push(@Apache::londefdef::description,[]);
$Apache::londefdef::DD[$Apache::londefdef::DL]=0;	$Apache::londefdef::DD[$Apache::londefdef::DL]=0;
Line 1723 sub start_dl {	Line 1835 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 1745 sub end_dl {	Line 1857 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 1760 sub start_dt {	Line 1872 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 1783 sub item_cleanup {	Line 1895 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 1802 sub start_dd {	Line 1914 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 1813 sub end_dd {	Line 1925 sub end_dd {
}	}

#-- <table> tag (end tag required)	#-- <table> tag (end tag required)
	# <table> also ends any prior <p> that is not closed.
	# but, unless I allow <p>'s to nest, that's the
	# only way I could think of to allow <p> in
	# <tr> <th> bodies
	#
#list of supported attributes: border,width,TeXwidth	#list of supported attributes: border,width,TeXwidth
sub start_table {	sub start_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my ($textwidth,$currentstring)=('','');	my $textwidth = '';
if ($target eq 'web') {	my $currentstring = &end_p();
$currentstring = $token->[4];	if ($target eq 'web' \|\| $target eq 'webgrade') {
	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $aa = {};	my $aa = {};
push @Apache::londefdef::table, $aa;	push @Apache::londefdef::table, $aa;
Line 1840 sub start_table {	Line 1958 sub start_table {
}	}
}	}
}	}

	# width either comes forced from the TeXwidth or the width parameters.
	# in either case it can be a percentage or absolute width.
	# in the width case we ignore absolute width
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);	my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
if (not defined $TeXwidth) {	if (!defined($TeXwidth)) {
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);	my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,
if ($htmlwidth=~/%/) {	$safeeval,undef,1);
$Apache::londefdef::table[-1]{'percent'}=1;	if ($htmlwidth =~ /%/) {
$htmlwidth=~/(\d+)/;	$TeXwidth = $htmlwidth;
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;;	} else {
} else {	$TeXwidth = $textwidth;
$Apache::londefdef::table[-1]{'width'}=$textwidth;
}	}
} elsif ($TeXwidth=~/%/) {	} else {
	$Apache::londefdef::table[-1]{'forcedtablewidth'} = 1;
	}
	if ($TeXwidth=~/%/) {
$Apache::londefdef::table[-1]{'percent'}=1;	$Apache::londefdef::table[-1]{'percent'}=1;
$TeXwidth=~/(\d+)/;	$TeXwidth=~/(\d+)/;
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;	$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
} else {	} else {
$Apache::londefdef::table[-1]{'forcetablewidth'}=1;
$Apache::londefdef::table[-1]{'width'}=$TeXwidth;	$Apache::londefdef::table[-1]{'width'}=$TeXwidth;
}	}

#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 1872 sub start_table {	Line 1996 sub start_table {
$Apache::londefdef::table[-1]{'vvinc'} = '';	$Apache::londefdef::table[-1]{'vvinc'} = '';
}	}
if ($#Apache::londefdef::table==0) {	if ($#Apache::londefdef::table==0) {
$Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}';	# Note that \newline seems to destroy the alignment envs.
	# $Apache::londefdef::table[-1]{'output'}='\strut\newline\strut\setlength{\tabcolsep}{1 mm}';
	$Apache::londefdef::table[-1]{'output'}='\strut'.'\\\\'."\n".'\strut\setlength{\tabcolsep}{1 mm}';
}	}
$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';	$Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} ';
$Apache::londefdef::table[-1]{'TeXlen'}=[];	$Apache::londefdef::table[-1]{'TeXlen'}=[];
Line 1882 sub start_table {	Line 2008 sub start_table {
$Apache::londefdef::table[-1]{'minlen'}=[];	$Apache::londefdef::table[-1]{'minlen'}=[];
$Apache::londefdef::table[-1]{'content'}=[];	$Apache::londefdef::table[-1]{'content'}=[];
$Apache::londefdef::table[-1]{'align'}=[];	$Apache::londefdef::table[-1]{'align'}=[];
$currentstring='\keephidden{NEW TABLE ENTRY}';	$currentstring.='\keephidden{NEW TABLE ENTRY}';
}

	}
return $currentstring;	return $currentstring;
}	}

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

for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {	if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {
Line 2081 sub end_table {	Line 2210 sub end_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++) {
for (my $jn=0;$jn<=$#fwidth;$jn++) {	for (my $jn=0;$jn<=$#fwidth;$jn++) {
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {	if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
$output.='\vspace*{-6 mm}\begin{center}';	$output.=&center_correction().'\begin{center}';
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
$output.=' \hfill \llap{'	$output.=' \hfill \llap{'
}	}
$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') {	if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
$output.='\end{center}\vspace*{-6 mm}';	$output.='\end{center}';#.&center_correction();
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
$output.='} ';	$output.='} ';
}	}
Line 2095 sub end_table {	Line 2224 sub end_table {
}	}
$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';	$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
}	}
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';	# Note that \newline destroys alignment env's produced by e.g. <div>
	# $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut'.'\\\\'."\n".'\strut ';
if ($#Apache::londefdef::table > 0) {	if ($#Apache::londefdef::table > 0) {
my $inmemory = $Apache::londefdef::table[-1]{'output'};	my $inmemory = $Apache::londefdef::table[-1]{'output'};
	# Figure out max/and min width by summing us and then
	# apply that to the current column of the table we nest in
	# if it's larger than the current width or the current width
	# is undefined.
	#
	my $min_nested_width = 0;
	my $max_nested_width = 0;
	for (my $col = 0; $col <= $Apache::londefdef::table[-1]{'counter_columns'}; $col++) {
	$min_nested_width += $min_len[$col];
	$max_nested_width += $max_len[$col];

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

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

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

pop @Apache::londefdef::table;	pop @Apache::londefdef::table;
push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;	push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;
} else {	} else {
Line 2113 sub end_table {	Line 2270 sub end_table {
sub start_tr {	sub start_tr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::table[-1]{'row_number'}++;	$Apache::londefdef::table[-1]{'row_number'}++;
Line 2124 sub start_tr {	Line 2281 sub start_tr {
push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';	push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';
}	}
push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});	push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
	#
	# Need to save the number of table columns to preserve the max # columns.
	#
	$Apache::londefdef::table[-1]{'prior_columns'} = $Apache::londefdef::table[-1]{'counter_columns'};
$Apache::londefdef::table[-1]{'counter_columns'} = -1;	$Apache::londefdef::table[-1]{'counter_columns'} = -1;
push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];	push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];
push @ {$Apache::londefdef::table[-1]{'objectlen'}}, [];	push @ {$Apache::londefdef::table[-1]{'objectlen'}}, [];
Line 2136 sub start_tr {	Line 2297 sub start_tr {

sub end_tr {	sub end_tr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close any pending <p> in the row.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
if ($Apache::londefdef::TD_redirection) {	if ($Apache::londefdef::TD_redirection) {
&end_td_tex($parstack,$parser,$safeeval);	&end_td_tex($parstack,$parser,$safeeval);
}	}
	# Counter columns must be the maximum number of columns seen
	# in the table so far so:
	if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) {
	$Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'};
	}



}	}
return $currentstring;	return $currentstring;
}	}
Line 2151 sub end_tr {	Line 2320 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 2275 sub end_td_tex {	Line 2444 sub end_td_tex {
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
}	}
}	}
for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {	# Substitute all of the tables nested in this cell in their appropriate places.
$data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
}
	my $nested_count = $#{$Apache::londefdef::table[-1]{'include'}}; # This one is constant...
	for (my $in=0; $in<=$nested_count; $in++) {
	my $nested = shift @{$Apache::londefdef::table[-1]{'include'}};
	$nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/;
	# $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
	$data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/;

	}
	# Should be be killing off the 'include' elements as they're used up?
push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;	push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
return'';	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 2298 sub end_td {	Line 2476 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 2413 sub end_th_tex {	Line 2591 sub end_th_tex {

sub end_th {	sub end_th {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close any open <p> in the row.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::TD_redirection =0;	$Apache::londefdef::TD_redirection =0;
&end_th_tex($parstack,$parser,$safeeval);	&end_th_tex($parstack,$parser,$safeeval);
Line 2435 sub end_th {	Line 2613 sub end_th {
# (Note there seems to also be support for this as a % of page size)	# (Note there seems to also be support for this as a % of page size)
#	#
sub start_img {	sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
undef,1);	undef,1);
if (not $src and ($target eq 'web' or $target eq 'tex')) {	if (! $src &&
my $inside = &Apache::lonxml::get_all_text("/img",$parser);	($target eq 'web' \|\| $target eq 'webgrade' \|\| $target eq 'tex')
	) {
	my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);
return '';	return '';
}	}
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;	&Apache::lonxml::extlink($src);
my $currentstring = '';	my $currentstring = '';
my $scaling = .3;	my $scaling = .3;

# 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});	$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
} else {	} else {
Line 2475 sub start_img {	Line 2655 sub start_img {
$safeeval,	$safeeval,
undef,1));	undef,1));
if(!$align) {	if(!$align) {
$align = "bottom"; # This is html's default so it's ours too.	# disabled for now see BUG#4535
	if (&is_inside_of($tagstack, "table")) {
	$align = "top"; # Force top of image to top of table cell
	} else {
	$align = "bottom"; # This is html's default so it's ours too.
	}
}	}
#	#
&Apache::lonxml::debug("Alignemnt = $align");	&Apache::lonxml::debug("Alignemnt = $align");
Line 2492 sub start_img {	Line 2677 sub start_img {
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 = "parbox";	$latex_rendering = "texwrap";
}	}
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");

Line 2533 sub start_img {	Line 2718 sub start_img {
} elsif ($align eq "left") {	} elsif ($align eq "left") {
if ($latex_rendering eq "parpic") {	if ($latex_rendering eq "parpic") {
$currentstring = '\parpic[l]{'.$currentstring.'}';	$currentstring = '\parpic[l]{'.$currentstring.'}';
} else { # parbox rendering	} else { # wrapfig render
$currentstring = "\\strut\\newline\n".	$currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}'
'\parbox{'.$width_param.'mm}{'.$currentstring.'}';	.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';
}	}
} elsif ($align eq "right") {	} elsif ($align eq "right") {
if ($latex_rendering eq "parpic") {	if ($latex_rendering eq "parpic") {
$currentstring = '\parpic[r]{'.$currentstring.'}';	$currentstring = '\parpic[r]{'.$currentstring.'}';
} else { # parbox rendering.	} else { # wrapfig rendering
$currentstring = '\parbox{'.$width_param.'mm}{\begin{flushright}'	$currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}'
.$currentstring.'\end{flushright}} \newline'."\n";	.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}';

}	}
} else { # Bottom is also default.	} else { # Bottom is also default.
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';	# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
Line 2634 sub start_img {	Line 2820 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 2647 sub start_applet {	Line 2833 sub start_applet {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;

my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,undef,1);	my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,undef,1);
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$code;	&Apache::lonxml::extlink($code);

my $archive=&Apache::lonxml::get_param('archive',$parstack,$safeeval,	my $archive=&Apache::lonxml::get_param('archive',$parstack,$safeeval,
undef,1);	undef,1);
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$archive;	&Apache::lonxml::extlink($archive);

my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
if ($env{'browser.appletsuppress'} ne 'on') {	if ($env{'browser.appletsuppress'} ne 'on') {
$currentstring = &Apache::lonenc::encrypt_ref($token,	$currentstring = &Apache::lonenc::encrypt_ref($token,
{'code'=>$code,	{'code'=>$code,
Line 2687 sub start_applet {	Line 2871 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 2698 sub end_applet {	Line 2882 sub end_applet {
sub start_embed {	sub start_embed {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;	&Apache::lonxml::extlink($src);
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
if ($env{'browser.embedsuppress'} ne 'on') {	if ($env{'browser.embedsuppress'} ne 'on') {
$currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});	$currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
} else {	} else {
Line 2719 sub start_embed {	Line 2903 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 2729 sub end_embed {	Line 2913 sub end_embed {
#-- <param> tag (end tag forbidden)	#-- <param> tag (end tag forbidden)
sub start_param {	sub start_param {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
if (&Apache::lonxml::get_param	if (&Apache::lonxml::get_param('name',$parstack,
('name',$parstack,$safeeval,undef,1)=~/^cabbase$/i) {	$safeeval,undef,1)=~/^cabbase$/i) {
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=	my $value=&Apache::lonxml::get_param('value',$parstack,
&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,1);	$safeeval,undef,1);
}	&Apache::lonxml::extlink($value);
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=	}
&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
	&Apache::lonxml::extlink($src);
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
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 2756 sub start_param {	Line 2942 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 2767 sub end_param {	Line 2953 sub end_param {
sub start_allow {	sub start_allow {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);	&Apache::lonxml::extlink($src);
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
&Apache::lonnet::clutter($src);
if ($target eq 'tex') { &image_replication($src); }	if ($target eq 'tex') { &image_replication($src); }
my $result;	my $result;
if ($target eq 'edit') {	if ($target eq 'edit') {
Line 2794 sub end_allow {	Line 2979 sub end_allow {
#-- <frameset>	#-- <frameset>
sub start_frameset {	sub start_frameset {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = ''; # Close any pending para.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
if (!$Apache::lonxml::registered &&	if (!$Apache::lonxml::registered &&
$env{'request.state'} eq 'published') {	$env{'request.state'} eq 'published') {
$currentstring.='<head>'.	$currentstring.='<head>'.
Line 2831 sub start_frameset {	Line 3016 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 2841 sub end_frameset {	Line 3026 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 2852 sub start_xmp {	Line 3037 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 2863 sub end_xmp {	Line 3048 sub end_xmp {
#-- <pre> (end tag required)	#-- <pre> (end tag required)
sub start_pre {	sub start_pre {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # close off pending <p>
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\begin{verbatim}';	$currentstring .= '\begin{verbatim}';
Line 2875 sub start_pre {	Line 3060 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}';
Line 2887 sub end_pre {	Line 3072 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 2897 sub start_insert {	Line 3082 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 2907 sub end_insert {	Line 3092 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 2917 sub start_externallink {	Line 3102 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 2926 sub end_externallink {	Line 3111 sub end_externallink {
#-- <blankspace heigth="">	#-- <blankspace heigth="">
sub start_blankspace {	sub start_blankspace {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # closes off any unclosed <p>
if ($target eq 'tex') {	if ($target eq 'tex') {
my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);	my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
$currentstring .= '\vskip '.$howmuch.' ';	$currentstring .= '\vskip '.$howmuch.' ';
Line 2947 sub end_blankspace {	Line 3132 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 2956 sub start_abbr {	Line 3141 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 2966 sub end_abbr {	Line 3151 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 2975 sub start_acronym {	Line 3160 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 2985 sub end_acronym {	Line 3170 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 2994 sub start_area {	Line 3179 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 3004 sub end_area {	Line 3189 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 3013 sub start_base {	Line 3198 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 3023 sub end_base {	Line 3208 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 3032 sub start_bdo {	Line 3217 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 3042 sub end_bdo {	Line 3227 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 3051 sub start_bgsound {	Line 3236 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 3061 sub end_bgsound {	Line 3246 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 3070 sub start_blink {	Line 3255 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 3079 sub end_blink {	Line 3264 sub end_blink {
#-- <blockquote> tag (end tag required)	#-- <blockquote> tag (end tag required)
sub start_blockquote {	sub start_blockquote {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close any unclosed <p>
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
}	}
return $currentstring;	return $currentstring;
}	}
Line 3089 sub start_blockquote {	Line 3274 sub start_blockquote {
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];
}	}
return $currentstring;	return $currentstring;
Line 3099 sub end_blockquote {	Line 3284 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 3108 sub start_button {	Line 3293 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 3118 sub end_button {	Line 3303 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 3127 sub start_caption {	Line 3312 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 3137 sub end_caption {	Line 3322 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 3146 sub start_col {	Line 3331 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 3156 sub end_col {	Line 3341 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 3165 sub start_colgroup {	Line 3350 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 3175 sub end_colgroup {	Line 3360 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 3184 sub start_del {	Line 3369 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 3194 sub end_del {	Line 3379 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 3203 sub start_fieldset {	Line 3388 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 3213 sub end_fieldset {	Line 3398 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 3222 sub start_frame {	Line 3407 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 3232 sub end_frame {	Line 3417 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 3241 sub start_iframe {	Line 3426 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 3251 sub end_iframe {	Line 3436 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 3260 sub start_ins {	Line 3445 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 3270 sub end_ins {	Line 3455 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 3279 sub start_isindex {	Line 3464 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 3289 sub end_isindex {	Line 3474 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 3298 sub start_keygen {	Line 3483 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 3308 sub end_keygen {	Line 3493 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 3317 sub start_label {	Line 3502 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 3327 sub end_label {	Line 3512 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 3336 sub start_layer {	Line 3521 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 3346 sub end_layer {	Line 3531 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 3355 sub start_legend {	Line 3540 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 3363 sub end_legend {	Line 3548 sub end_legend {

#-- <link> tag (end tag forbidden)	#-- <link> tag (end tag forbidden)
sub start_link {	sub start_link {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
	undef,1);
	&Apache::lonxml::extlink($href);
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
return $currentstring;	return $currentstring;
Line 3374 sub start_link {	Line 3562 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 3384 sub end_link {	Line 3572 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 3393 sub start_marquee {	Line 3581 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 3402 sub end_marquee {	Line 3590 sub end_marquee {
#-- <multicol> tag (end tag required)	#-- <multicol> tag (end tag required)
sub start_multicol {	sub start_multicol {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close any pending <p>
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
}	}
return $currentstring;	return $currentstring;
}	}
Line 3412 sub start_multicol {	Line 3600 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 3422 sub end_multicol {	Line 3610 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 3433 sub start_nobr {	Line 3621 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 3445 sub end_nobr {	Line 3633 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 3454 sub start_noembed {	Line 3642 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 3464 sub end_noembed {	Line 3652 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 3473 sub start_noframes {	Line 3661 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 3483 sub end_noframes {	Line 3671 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 3492 sub start_nolayer {	Line 3680 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 3502 sub end_nolayer {	Line 3690 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 3511 sub start_noscript {	Line 3699 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 3521 sub end_noscript {	Line 3709 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 3530 sub start_object {	Line 3718 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 3540 sub end_object {	Line 3728 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 3549 sub start_optgroup {	Line 3737 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 3559 sub end_optgroup {	Line 3747 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 3570 sub start_samp {	Line 3758 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 3582 sub end_samp {	Line 3770 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 3591 sub start_server {	Line 3779 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 3600 sub end_server {	Line 3788 sub end_server {
#-- <spacer> tag (end tag forbidden)	#-- <spacer> tag (end tag forbidden)
sub start_spacer {	sub start_spacer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off any open <p> tag.
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
}	}
return $currentstring;	return $currentstring;
}	}
Line 3610 sub start_spacer {	Line 3798 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 3620 sub end_spacer {	Line 3808 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 3629 sub start_span {	Line 3817 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 3639 sub end_span {	Line 3827 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 3648 sub start_tbody {	Line 3836 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 3658 sub end_tbody {	Line 3846 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 3667 sub start_tfoot {	Line 3855 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 3677 sub end_tfoot {	Line 3865 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 3686 sub start_thead {	Line 3874 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 3696 sub end_thead {	Line 3884 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 3707 sub start_var {	Line 3895 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 3719 sub end_var {	Line 3907 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 3728 sub start_wbr {	Line 3916 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 3737 sub end_wbr {	Line 3925 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 3746 sub start_hideweboutput {	Line 3934 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 3766 sub image_replication {	Line 3954 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 {
	my ($height_param, $width_param, $scaling,
	$parstack, $safeeval, $depth, $cis) = @_;

sub image_size {	# First apply the scaling...
my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
	$height_param = $height_param * $scaling;
	$width_param = $width_param * $scaling;

#size of image from gif/jpg/jpeg/png
my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
if (-e $ressrc) {
$src = $ressrc;
}
my $image = Image::Magick->new;
my $current_figure = $image->Read($src);
my $width_param = $image->Get('width') * $scaling;;
my $height_param = $image->Get('height') * $scaling;
&Apache::lonxml::debug("Image magick says: $src : Height = $height_param width = $width_param");
undef($image);
#do we have any specified LaTeX size of the picture?	#do we have any specified LaTeX size of the picture?
my $toget='TeXwidth';	my $toget='TeXwidth';
if ($cis) {	if ($cis) {
Line 3825 sub image_size {	Line 4028 sub image_size {
$height_param=$width_param/$old_width_param*$height_param;	$height_param=$width_param/$old_width_param*$height_param;
}	}
}	}

	return ($height_param, $width_param);
	}

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

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

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

return ($height_param, $width_param);	return ($height_param, $width_param);
}	}

Line 3843 sub image_height {	Line 4069 sub image_height {
sub get_eps_image {	sub get_eps_image {
my ($src)=@_;	my ($src)=@_;
my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src);	my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src);
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src<BR />");
	# In order to prevent the substitution of the alt text, we need to
	# be sure the orig_src file is on system now so:

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

#if replication failed try to produce eps file dynamically	#if replication failed try to produce eps file dynamically
Line 3865 sub get_eps_image {	Line 4101 sub get_eps_image {
open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");	open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
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. <BR/>");	&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.
	$src =~ s/\.eps$/$sext.eps/;
	}
}	}
}	}
}	}
Line 3909 sub file_path {	Line 4148 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 3954 sub LATEX_length {	Line 4197 sub LATEX_length {
}	}


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


1;	1;

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

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