Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.265 and 1.315

version 1.265, 2005/03/31 15:54:33	version 1.315, 2006/01/25 11:30:14
Line 39	Line 39

package Apache::londefdef;	package Apache::londefdef;

use Apache::lonnet();	use Apache::lonnet;
use strict;	use strict;
use Apache::lonxml;	use Apache::lonxml;
use Apache::File();	use Apache::File();
Line 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 105 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 124 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 143 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') {
my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser);	my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser,
	$style);
$inside=~s/^\s*//;	$inside=~s/^\s*//;
if ($ENV{'browser.mathml'}) {	if ($env{'browser.mathml'}) {
&tth::ttmoptions($inside);	&tth::ttmoptions($inside);
} else {	} else {
&tth::tthoptions($inside);	&tth::tthoptions($inside);
Line 151 sub end_tthoption {	Line 168 sub end_tthoption {
sub start_html {	sub start_html {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};	my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
&Apache::lontexconvert::init_tth();	&Apache::lontexconvert::init_tth();
if ($target eq 'web' \|\| $target eq 'edit') {	if ($target eq 'web' \|\| $target eq 'edit' \|\| $target eq 'webgrade' ) {
$currentstring = &Apache::lonxml::xmlbegin();	$currentstring = &Apache::lonxml::xmlbegin();
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\documentclass[letterpaper]{article}';	$currentstring .= '\documentclass[letterpaper,twoside]{article}';
if (($ENV{'form.latex_type'}=~'batchmode') \|\|	if (($env{'form.latex_type'}=~'batchmode') \|\|
(!$ENV{'request.role.adv'})) {$currentstring .='\batchmode';}	(!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
$currentstring .= '\newcommand{\keephidden}[1]{}'.	$currentstring .= '\newcommand{\keephidden}[1]{}'.
'\renewcommand{\deg}{$^{\circ}$}'.	'\renewcommand{\deg}{$^{\circ}$}'.
	'\usepackage{multirow}'.
'\usepackage{longtable}'.	'\usepackage{longtable}'.
'\usepackage{textcomp}'.	'\usepackage{textcomp}'.
'\usepackage{makeidx}'.	'\usepackage{makeidx}'.
'\usepackage[dvips]{graphicx}'.	'\usepackage[dvips]{graphicx}'.
	'\usepackage{wrapfig}'.
'\usepackage{picins}'.	'\usepackage{picins}'.
'\usepackage{epsfig}'.	'\usepackage{epsfig}'.
'\usepackage{calc}'.	'\usepackage{calc}'.
Line 201 sub start_head {	Line 220 sub start_head {
sub end_head {	sub end_head {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' && $ENV{'request.state'} eq 'published') {	if ($target eq 'web' && $env{'request.state'} eq 'published') {
$currentstring = &Apache::lonmenu::registerurl(undef,$target).	$currentstring = &Apache::lonmenu::registerurl(undef,$target).
$token->[2];	$token->[2];
}	}
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') {
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 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 489 sub start_body {	Line 508 sub start_body {
return '';	return '';
}	}
if (!$Apache::lonxml::registered &&	if (!$Apache::lonxml::registered &&
$ENV{'request.state'} eq 'published') {	$env{'request.state'} eq 'published') {
$currentstring.='<head>'.	$currentstring.='<head>'.
&Apache::lonmenu::registerurl(undef,$target).'</head>';	&Apache::lonmenu::registerurl(undef,$target).'</head>';
}	}
# Accessibility	# Accessibility
if ($ENV{'browser.imagesuppress'} eq 'on') {	if ($env{'browser.imagesuppress'} eq 'on') {
delete($token->[2]->{'background'});	delete($token->[2]->{'background'});
}	}
if ($ENV{'browser.fontenhance'} eq 'on') {	if ($env{'browser.fontenhance'} eq 'on') {
my $style='';	my $style='';
foreach my $key (keys(%{$token->[2]})) {	foreach my $key (keys(%{$token->[2]})) {
if ($key =~ /^style$/i) {	if ($key =~ /^style$/i) {
Line 507 sub start_body {	Line 526 sub start_body {
}	}
$token->[2]->{'style'}=$style.'; font-size: x-large;';	$token->[2]->{'style'}=$style.'; font-size: x-large;';
}	}
if ($ENV{'browser.blackwhite'} eq 'on') {	if ($env{'browser.blackwhite'} eq 'on') {
delete($token->[2]->{'font'});	delete($token->[2]->{'font'});
delete($token->[2]->{'link'});	delete($token->[2]->{'link'});
delete($token->[2]->{'alink'});	delete($token->[2]->{'alink'});
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') {
if ($ENV{'request.state'} ne 'published') {	$currentstring.=&Apache::lontexconvert::jsMath_header();
my $remote=($ENV{'environment.remote'} ne 'off');	}
$currentstring=&Apache::loncommon::bodytag(undef,undef,	if ($env{'request.state'} ne 'published') {
$currentstring,$remote);	if ($env{'environment.remote'} eq 'off') {
	$currentstring.=
	&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') {
$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') {
$currentstring = $token->[2];	$currentstring = $token->[2];
Line 597 sub end_center {	Line 624 sub end_center {
}	}

#-- <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') {
$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 614 sub end_b {	Line 643 sub end_b {
if ($target eq 'web') {	if ($target eq 'web') {
$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') {
$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 637 sub end_strong {	Line 669 sub end_strong {
if ($target eq 'web') {	if ($target eq 'web') {
$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 678 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') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 660 sub start_h1 {	Line 693 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 694 sub end_h1 {	Line 727 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') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 709 sub start_h2 {	Line 742 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 737 sub end_h2 {	Line 770 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') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 752 sub start_h3 {	Line 785 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 780 sub end_h3 {	Line 813 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') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 795 sub start_h4 {	Line 828 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 823 sub end_h4 {	Line 856 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') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 838 sub start_h5 {	Line 871 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 866 sub end_h5 {	Line 899 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') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 881 sub start_h6 {	Line 914 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 1113 sub end_q {	Line 1146 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') {
	$currentstring .= &end_p(); # close off prior para if in progress.
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	if (! ($currentstring =~ /\//)) {
	$closing_string = '</p>'; # Deal correctly with <p /> e.g.
	}
	} elsif ($target eq 'tex' && !$para_disabled) {

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

	}
	}
#-- <br> tag (end tag forbidden)	#-- <br> tag (end tag forbidden)
sub start_br {	sub start_br {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
Line 1168 sub start_br {	Line 1237 sub start_br {
} 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 1276 sub start_font {	Line 1348 sub start_font {
if ($target eq 'web') {	if ($target eq 'web') {
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
if ($face!~/symbol/i) {	if ($face!~/symbol/i) {
if (($ENV{'browser.fontenhance'} eq 'on') \|\|	if (($env{'browser.fontenhance'} eq 'on') \|\|
($ENV{'browser.blackwhite'} eq 'on')) { return ''; }	($env{'browser.blackwhite'} eq 'on')) { return ''; }
}	}
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 1404 sub end_sup {	Line 1476 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') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 1442 sub end_hr {	Line 1514 sub end_hr {
}	}

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

	my $endstring = '';

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

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

Line 1456 sub end_div {	Line 1563 sub end_div {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$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 {
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') {
$currentstring = $token->[2];	$currentstring .= $token->[2];
}	}
return $currentstring;	return $currentstring;
}	}
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') {
$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 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') {
$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 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') {
$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 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') {
$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 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 = '';
	my $currentstring = &end_p();
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$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;
$Apache::londefdef::table[-1]{'row_number'} = -1;	$Apache::londefdef::table[-1]{'row_number'} = -1;
#maximum table's width (default coincides with text line length)	#maximum table's width (default coincides with text line length)
if ($#Apache::londefdef::table==0) {	if ($#Apache::londefdef::table==0) {
$textwidth=&recalc($ENV{'form.textwidth'}); #result is always in mm	$textwidth=&recalc($env{'form.textwidth'}); #result is always in mm
$textwidth=~/(\d+\.?\d*)/;	$textwidth=~/(\d+\.?\d*)/;
$textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame	$textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame
} else {	} else {
Line 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;
}	}

Line 1896 sub end_table {	Line 2024 sub end_table {
my $inmemory = '';	my $inmemory = '';
my $output = '';	my $output = '';
my $WARNING='';	my $WARNING='';
	# &debug_dump_table($Apache::londefdef::table[-1]);
#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 2079 sub end_table {	Line 2209 sub end_table {
$header_of_table .= '}';	$header_of_table .= '}';
#fill the table	#fill the table
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
	my $have_rowspan = 0;
for (my $jn=0;$jn<=$#fwidth;$jn++) {	for (my $jn=0;$jn<=$#fwidth;$jn++) {
	#
	# Do the appropriate magic if this has a colspan
	#
	my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn];
	if ($colspan > 1) {
	$output .= '\multicolumn{'.
	$colspan
	.'}{\|l\|}{';
	}
	my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];

	# Start a rowspan if necessary:

	if ($rowspan > 1) {
	$have_rowspan++;
	$output .= '\multirow{'.$rowspan.'}[0]{'.$fwidth[$jn].'mm}{';
	}
	if (($rowspan eq '^') \|\| ($rowspan eq '_')) {
	$have_rowspan++;
	}

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}';
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
$output.='} ';	$output.='} ';
}	}
	# Close off any open multirow:

	if ($rowspan > 1) {
	$output .= '}';
	}
	# Close off the colspan...
	#
	if ($colspan > 1) {
	$output .= '}';
	$jn += $colspan-1; # Adjust for number of rows really left.
	}
if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}	if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}
}	}
$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';	# If have_rowspan > 0, and borders are on, then
	# we need to do more than put an \hline at the bottom of row.
	# we need to do the appropriate \cline to ensure that
	# the spanned rows don't have \hlines through them.

	if (($Apache::londefdef::table[-1]{'hinc'} =~ /\\hline/) && $have_rowspan) {
	$output .= ' \\\\ ';
	for (my $jn=0; $jn<=$#fwidth;$jn++) {
	my $rowspan = $Apache::londefdef::table[-1]{'rowspan'}[$in][$jn];
	if (($rowspan <= 1) \|\| ($rowspan eq '_')) {
	my $column = $jn+1;
	$output .= '\cline{'.$column.'-'.$column.'} ';
	}
	}

	} else {
	$output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
	}
}	}
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';	# Note that \newline destroys alignment env's produced by e.g. <div>
	# $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut\newline\strut ';
	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut'.'\\\\'."\n".'\strut ';
if ($#Apache::londefdef::table > 0) {	if ($#Apache::londefdef::table > 0) {
my $inmemory = $Apache::londefdef::table[-1]{'output'};	my $inmemory = $Apache::londefdef::table[-1]{'output'};
	# Figure out max/and min width by summing us and then
	# apply that to the current column of the table we nest in
	# if it's larger than the current width or the current width
	# is undefined.
	#
	my $min_nested_width = 0;
	my $max_nested_width = 0;
	for (my $col = 0; $col <= $Apache::londefdef::table[-1]{'counter_columns'}; $col++) {
	$min_nested_width += $min_len[$col];
	$max_nested_width += $max_len[$col];

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

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

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

pop @Apache::londefdef::table;	pop @Apache::londefdef::table;
push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;	push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;
} else {	} else {
Line 2124 sub start_tr {	Line 2332 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 2348 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') {
$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 2197 sub start_td_tex {	Line 2417 sub start_td_tex {

sub end_td_tex {	sub end_td_tex {
my ($parstack,$parser,$safeeval) = @_;	my ($parstack,$parser,$safeeval) = @_;
my $current_row = $Apache::londefdef::table[-1]{'row_number'};	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
my $data=&Apache::lonxml::endredirection();	my $current_column = $Apache::londefdef::table[-1]{'counter_columns'};
	my $data = &Apache::lonxml::endredirection();

	# The rowspan array of the table indicates which cells are part of a span.
	# n indicates the start of a span set of n rows.
	# ^ indicates a cell that continues a span set.
	# _ indicates the cell is at the bottom of a span set.
	# If this and subsequent cells are part of a rowspan, we must
	# push along the row until we find one that is not.

	while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column])
	&& ($Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] =~ /[\^\_]/)) {
	# Part of a span.
	push @ {$Apache::londefdef::table[-1]{'content'}[-1]}, '';
	$current_column++;
	}
	$Apache::londefdef::table[-1]{'counter_columns'} = $current_column;



	my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 0);
	if (!$rowspan) {
	$rowspan = 1;
	}



	$Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] = $rowspan;
	for (my $i = 1; $i < $rowspan; $i++) {
	$Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column] = '^';
	if ($i == ($rowspan-1)) {
	$Apache::londefdef::table[-1]{'rowspan'}[$current_row+$i][$current_column] = '_';
	}
	}

my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);	my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
if (defined $TeXwidth) {	if (defined $TeXwidth) {
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
Line 2275 sub end_td_tex {	Line 2529 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'';
	# Get the column and row spans.
	# Colspan can be done via \multicolumn if I can figure out the data structs.

	my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 0);
	if (!$colspan) {
	$colspan = 1;
	}


	# the colspan array will indicate how many columns will be spanned by this
	# cell..this requires that counter_columns also be adjusted accordingly
	# so that the next bunch of text goes in the right cell. Note that since
	# counter_columns is incremented in the start_td_tex, we adjust by colspan-1.
	#

	$Apache::londefdef::table[-1]{'colspan'}[$current_row][$current_column] = $colspan;
	$Apache::londefdef::table[-1]{'counter_columns'} += $colspan -1;

	# Put empty text in spanned cols.

	for (my $i = 0; $i < ($colspan -1); $i++) {
	push @ {$Apache::londefdef::table[-1]{'content'}[-1] },'';
	}


	return '';
}	}

sub end_td {	sub end_td {
Line 2413 sub end_th_tex {	Line 2703 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') {
$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 2725 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 (not $src and ($target eq 'web' or $target eq 'tex')) {
my $inside = &Apache::lonxml::get_all_text("/img",$parser);	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') {
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 {
my $alttag= &Apache::lonxml::get_param	my $alttag= &Apache::lonxml::get_param
Line 2475 sub start_img {	Line 2765 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.	$align = "bottom"; # This is html's default so it's ours too.
}	}
#	#
&Apache::lonxml::debug("Alignemnt = $align");	&Apache::lonxml::debug("Alignemnt = $align");
Line 2490 sub start_img {	Line 2780 sub start_img {
$parstack,	$parstack,
$safeeval,	$safeeval,
undef,0);	undef,0);
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering");	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
if(!$latex_rendering) {	if(!$latex_rendering) {
$latex_rendering = "parbox";	$latex_rendering = "texwrap";
}	}
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");	# using texwrap inside a table does not work. So, if after all of this,
	# texwrap is on, we turn it off if we detect we're in a table:
	#
	if (($latex_rendering eq 'texwrap') && &is_inside_of($tagstack, "table")) {
	$latex_rendering = 'parpic';
	}
	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");

#if original gif/jpg/png file exist do following:	#if original gif/jpg/png file exist do following:
	my $origsrc=$src;
my ($path,$file) = &get_eps_image($src);	my ($path,$file) = &get_eps_image($src);
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
&Apache::lonxml::debug("path = $path file = $file src = $src");	&Apache::lonxml::debug("path = $path file = $file src = $src");
if (-e $src) {	if (-e $src) {
&Apache::lonxml::debug("$src exists");	&Apache::lonxml::debug("$src exists");
my ($height_param,$width_param)=	my ($height_param,$width_param)=
&image_size($src,0.3,$parstack,$safeeval);	&image_size($origsrc,0.3,$parstack,$safeeval);
my $destpath = $path;	my $destpath = $path;
$destpath =~ s/ /\_/g; # Spaces in path cause LaTex to vomit.	$destpath =~ s/ /\_/g; # Spaces in path cause LaTex to vomit.
my $destfile = $file;	my $destfile = $file;
$destfile =~ s/ /\_/g;	$destfile =~ s/ /\_/g;
	my $size;
	if ($width_param) { $size.='width='.$width_param.' mm,'; }
	if ($height_param) { $size.='height='.$height_param.' mm]'; }
	$size='['.$size;
	$size=~s/,$/]/;
$currentstring .= '\graphicspath{{'.$destpath.'}}'	$currentstring .= '\graphicspath{{'.$destpath.'}}'
.'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$destfile.'} ';	.'\includegraphics'.$size.'{'.$destfile.'} ';

# If there's an alignment specification we need to honor it here.	# If there's an alignment specification we need to honor it here.
# For the horizontal alignments, we will also honor the	# For the horizontal alignments, we will also honor the
Line 2527 sub start_img {	Line 2829 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 2641 sub start_applet {	Line 2944 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') {
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,
'archive'=>$archive}	'archive'=>$archive}
Line 2692 sub end_applet {	Line 2993 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') {
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 {
my $alttag=&Apache::lonxml::get_param	my $alttag=&Apache::lonxml::get_param
Line 2723 sub end_embed {	Line 3024 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') {
my %toconvert;	my %toconvert;
Line 2761 sub end_param {	Line 3064 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 2788 sub end_allow {	Line 3090 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') {
if (!$Apache::lonxml::registered &&	if (!$Apache::lonxml::registered &&
$ENV{'request.state'} eq 'published') {	$env{'request.state'} eq 'published') {
$currentstring.='<head>'.	$currentstring.='<head>'.
&Apache::lonmenu::registerurl(undef,$target).'</head>';	&Apache::lonmenu::registerurl(undef,$target).'</head>';
}	}
Line 2857 sub end_xmp {	Line 3159 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') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
Line 2920 sub end_externallink {	Line 3222 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 3073 sub end_blink {	Line 3375 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') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
}	}
return $currentstring;	return $currentstring;
}	}
Line 3357 sub end_legend {	Line 3659 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 3396 sub end_marquee {	Line 3701 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') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
}	}
return $currentstring;	return $currentstring;
}	}
Line 3594 sub end_server {	Line 3899 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') {
$currentstring = $token->[4];	$currentstring .= $token->[4];
}	}
return $currentstring;	return $currentstring;
}	}
Line 3760 sub image_replication {	Line 4065 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 3791 sub image_size {	Line 4111 sub image_size {
if ($TeXwidth) {	if ($TeXwidth) {
my $old_width_param=$width_param;	my $old_width_param=$width_param;
if ($TeXwidth=~/(\d+)\s*\%/) {	if ($TeXwidth=~/(\d+)\s*\%/) {
$width_param = $1*$ENV{'form.textwidth'}/100;	$width_param = $1*$env{'form.textwidth'}/100;
} else {	} else {
$width_param = $TeXwidth;	$width_param = $TeXwidth;
}	}
$height_param=$TeXwidth/$old_width_param*$height_param;	if ($TeXheight) {
	$height_param = $TeXheight;
	} elsif ($old_width_param) {
	$height_param=$TeXwidth/$old_width_param*$height_param;
	}
} elsif ($TeXheight) {	} elsif ($TeXheight) {
$height_param = $TeXheight;	$height_param = $TeXheight;
$width_param = $TeXheight/$height_param*$width_param;	if ($height_param) {
	$width_param = $TeXheight/$height_param*$width_param;
	}
} elsif ($width) {	} elsif ($width) {
my $old_width_param=$width_param;	my $old_width_param=$width_param;
$width_param = $width*$scaling;	$width_param = $width*$scaling;
$height_param=$width_param/$old_width_param*$height_param;	if ($old_width_param) {
	$height_param=$width_param/$old_width_param*$height_param;
	}
}	}
if ($width_param > $ENV{'form.textwidth'}) {	if ($width_param > $env{'form.textwidth'}) {
my $old_width_param=$width_param;	my $old_width_param=$width_param;
$width_param =0.95*$ENV{'form.textwidth'};	$width_param =0.95*$env{'form.textwidth'};
$height_param=$width_param/$old_width_param*$height_param;	if ($old_width_param) {
	$height_param=$width_param/$old_width_param*$height_param;
	}
}	}

	return ($height_param, $width_param);
	}

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

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

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

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

Line 3827 sub image_height {	Line 4180 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 3838 sub get_eps_image {	Line 4199 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
$src=~s/\.ps$/\.eps/;	$src=~s/\.ps$/\.eps/;
my $temp_file;	my $temp_file;
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 3864 sub get_eps_image {	Line 4230 sub get_eps_image {

sub eps_generation {	sub eps_generation {
my ($src,$file,$width_param) = @_;	my ($src,$file,$width_param) = @_;
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";	my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
my $temp_file = Apache::File->new('>>'.$filename);	my $temp_file = Apache::File->new('>>'.$filename);
print $temp_file "$src\n";	print $temp_file "$src\n";
my $newsrc = $src;	my $newsrc = $src;
Line 3893 sub file_path {	Line 4259 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 3938 sub LATEX_length {	Line 4308 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>

500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.

Removed from v.1.265
changed lines
	Added in v.1.315