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.210 and 1.281

version 1.210, 2004/04/15 19:08:31	version 1.281, 2005/07/12 21:05:49
Line 36	Line 36
# The C source of the Code may not be distributed by the Licensee	# The C source of the Code may not be distributed by the Licensee
# to any other parties under any circumstances.	# to any other parties under any circumstances.
#	#
#
# last modified 06/26/00 by Alexander Sakharuk
# 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer
# 01/18 Alex Sakharuk

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

use Apache::lonnet();	use Apache::lonnet;
use strict;	use strict;
use Apache::lonxml;	use Apache::lonxml;
use Apache::File();	use Apache::File();
Line 63 sub initialize_londefdef {	Line 59 sub initialize_londefdef {
$Apache::londefdef::TD_redirection=0;	$Apache::londefdef::TD_redirection=0;
@Apache::londefdef::table = ();	@Apache::londefdef::table = ();
$Apache::londefdef::select=0;	$Apache::londefdef::select=0;
@Apache::londefdef::description=();	undef(@Apache::londefdef::description);
$Apache::londefdef::DD_redirection=0;	@Apache::londefdef::DD=(0);
$Apache::londefdef::DT_redirection=0;	@Apache::londefdef::DT=(0);
	@Apache::londefdef::seenDT=(0);
	$Apache::londefdef::list_index=0;
}	}

#======================= TAG SUBROUTINES =====================	#======================= TAG SUBROUTINES =====================
Line 86 sub start_m {	Line 84 sub start_m {
my $currentstring = '';	my $currentstring = '';
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
if ($target eq 'web' \|\| $target eq 'analyze') {	if ($target eq 'web' \|\| $target eq 'analyze') {
$inside ='\\documentstyle{article}'.$inside;
&Apache::lonxml::debug("M is starting with:$inside:");	&Apache::lonxml::debug("M is starting with:$inside:");
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {	if ($eval eq 'on') {
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
#&Apache::lonxml::debug("M is evaulated to:$inside:");	#&Apache::lonxml::debug("M is evaulated to:$inside:");
}	}
$currentstring = &Apache::lontexconvert::converted(\$inside);	my $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 106 sub start_m {
$currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);	$currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);
}	}
if ($currentstring=~/^(\s\\\\\s)*$/) {$currentstring = ' \vskip 0 mm ';}	if ($currentstring=~/^(\s\\\\\s)*$/) {$currentstring = ' \vskip 0 mm ';}
	# detect simple math mode entry exits, and convert them
	# to use \ensuremath
	if ($currentstring=~/^\s\$[^\$].[^\$]\$\s*$/) {
	$currentstring=~s/^\$//;
	$currentstring=~s/\$$//;
	$currentstring='\ensuremath{'.$currentstring.'}';
	}
$Apache::lonxml::post_evaluate=0;	$Apache::lonxml::post_evaluate=0;
}	}
return $currentstring;	return $currentstring;
Line 128 sub start_tthoption {	Line 133 sub start_tthoption {
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);
$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 147 sub end_tthoption {	Line 152 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();
&Apache::lonxml::fontsettings();
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
@Apache::londefdef::table = ();
$currentstring .= '\documentclass[letterpaper]{article}';	$currentstring .= '\documentclass[letterpaper]{article}';
if ($ENV{'form.latex_type'}=~'batchmode') {$currentstring .='\batchmode';}	if (($env{'form.latex_type'}=~'batchmode') \|\|
$currentstring .= '\newcommand{\keephidden}[1]{}	(!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
\renewcommand{\deg}{$^{\circ}$}	$currentstring .= '\newcommand{\keephidden}[1]{}'.
\usepackage{longtable}	'\renewcommand{\deg}{$^{\circ}$}'.
\usepackage{textcomp}	'\usepackage{longtable}'.
\usepackage{makeidx}	'\usepackage{textcomp}'.
\usepackage[dvips]{graphicx}	'\usepackage{makeidx}'.
\usepackage{epsfig}\usepackage{calc}	'\usepackage[dvips]{graphicx}'.
\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}	'\usepackage{picins}'.
\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';	'\usepackage{epsfig}'.
	'\usepackage{calc}'.
	'\usepackage{amsmath}'.
	'\usepackage{amssymb}'.
	'\usepackage{amsfonts}'.
	'\usepackage{amsthm}'.
	'\usepackage{amscd}'.
	'\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
	'\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
}	}
return $currentstring;	return $currentstring;
}	}

sub end_html {	sub end_html {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = &Apache::lonxml::xmlend();	$currentstring = '</html>';
}	}
return $currentstring;	return $currentstring;
}	}
Line 183 sub start_head {	Line 194 sub start_head {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4].&Apache::lonxml::fontsettings();
}	}
return $currentstring;	return $currentstring;
}	}
Line 191 sub start_head {	Line 202 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 472 sub end_accessrule {	Line 483 sub end_accessrule {
sub start_body {	sub start_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';

if ($target eq 'web') {	if ($target eq 'web') {
if ($Apache::lonhomework::parsing_a_problem) {	if ($Apache::lonhomework::parsing_a_problem) {
&Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");	&Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");
return '';	return '';
}	}
if (!$Apache::lonxml::registered &&	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 496 sub start_body {	Line 508 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 528 sub start_body {	Line 540 sub start_body {
$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';	$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
}	}
$currentstring.='>';	$currentstring.='>';
if ($ENV{'request.state'} ne 'published') {	if ($env{'request.state'} ne 'published') {
	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 545 EDITBUTTON	Line 562 EDITBUTTON
}	}

sub end_body {	sub end_body {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = &end_p(); # Close off unclosed <p>
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$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;
}	}
Line 558 sub end_body {	Line 575 sub end_body {
#-- <center> tag (end tag required)	#-- <center> tag (end tag required)
sub start_center {	sub start_center {
my ($target,$token) = @_;	my ($target,$token) = @_;
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}';	$currentstring .= '\begin{center}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 579 sub end_center {	Line 596 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 596 sub end_b {	Line 615 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 619 sub end_strong {	Line 641 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 627 sub end_strong {	Line 650 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') {
my $pre;	my $pre;
my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1));	my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1));
if (($align eq 'center') \|\| (not defined $align)) {	if ($align eq 'center') {
$pre='\begin{center}';	$pre='\begin{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$pre='\rlap{';	$pre='\rlap{';
Line 642 sub start_h1 {	Line 665 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 656 sub end_h1 {	Line 679 sub end_h1 {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post;	my $post='\vskip 0 mm ';
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$post='\end{center}';	$post='\end{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$post='} \hfill'.'\vskip 0 mm ';	$post='} \hfill'.'\vskip 0 mm ';
Line 676 sub end_h1 {	Line 699 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') {
my $pre;	my $pre;
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$pre='\begin{center}';	$pre='\begin{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$pre='\rlap{';	$pre='\rlap{';
Line 691 sub start_h2 {	Line 714 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 702 sub end_h2 {	Line 725 sub end_h2 {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post;	my $post='\vskip 0 mm ';
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$post='\end{center}';	$post='\end{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$post='} \hfill'.'\vskip 0 mm ';	$post='} \hfill'.'\vskip 0 mm ';
Line 719 sub end_h2 {	Line 742 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') {
my $pre;	my $pre;
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$pre='\begin{center}';	$pre='\begin{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$pre='\rlap{';	$pre='\rlap{';
Line 734 sub start_h3 {	Line 757 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 745 sub end_h3 {	Line 768 sub end_h3 {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post;	my $post='\vskip 0 mm ';
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$post='\end{center}';	$post='\end{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$post='} \hfill'.'\vskip 0 mm ';	$post='} \hfill'.'\vskip 0 mm ';
Line 762 sub end_h3 {	Line 785 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') {
my $pre;	my $pre;
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$pre='\begin{center}';	$pre='\begin{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$pre='\rlap{';	$pre='\rlap{';
Line 777 sub start_h4 {	Line 800 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 788 sub end_h4 {	Line 811 sub end_h4 {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post;	my $post='\vskip 0 mm ';
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$post='\end{center}';	$post='\end{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$post='} \hfill'.'\vskip 0 mm ';	$post='} \hfill'.'\vskip 0 mm ';
Line 805 sub end_h4 {	Line 828 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') {
my $pre;	my $pre;
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$pre='\begin{center}';	$pre='\begin{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$pre='\rlap{';	$pre='\rlap{';
Line 820 sub start_h5 {	Line 843 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 831 sub end_h5 {	Line 854 sub end_h5 {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post;	my $post='\vskip 0 mm ';
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$post='\end{center}';	$post='\end{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$post='} \hfill'.'\vskip 0 mm ';	$post='} \hfill'.'\vskip 0 mm ';
Line 848 sub end_h5 {	Line 871 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') {
my $pre;	my $pre;
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$pre='\begin{center}';	$pre='\begin{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$pre='\rlap{';	$pre='\rlap{';
Line 863 sub start_h6 {	Line 886 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 874 sub end_h6 {	Line 897 sub end_h6 {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $post;	my $post='\vskip 0 mm ';
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') \|\| (not defined $align)) {	if ($align eq 'center') {
$post='\end{center}';	$post='\end{center}';
} elsif ($align eq 'left') {	} elsif ($align eq 'left') {
$post='} \hfill'.'\vskip 0 mm ';	$post='} \hfill'.'\vskip 0 mm ';
Line 1095 sub end_q {	Line 1118 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}';
} 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}';
my $signal=1;#<p> does not work inside <b>...</b>	} else {
foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}	$currentstring.='\par ';
if (!$signal) {$currentstring = '';}	$closing_string = '\strut\\\\\strut ';
}	}

}	}
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;
if ($$tagstack[-1] eq 'p') {	$closing_string = ''; # Not in a para anymore.
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);	return $current_string;
if ($align eq 'center') {	} else {
$currentstring .= '\end{center}';	return '';
} 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 1146 sub start_br {	Line 1199 sub start_br {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {	my @tempo=@$tagstack;
$currentstring .= '\vskip 0.2 mm ';	my $signal=0;
	for (my $i=$#tempo;$i>=0;$i--) {
	if (($tempo[$i] eq 'b') \|\| ($tempo[$i] eq 'strong') \|\|
	($tempo[$i] eq 'ol') \|\| ($tempo[$i] eq 'ul') \|\|
	($tempo[$i] eq 'td') \|\| ($tempo[$i] eq 'th')) {
	$signal=1;
	last;
	}
	}
	if ($signal) {
	$currentstring .= ' \vskip 0 mm ';
	} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
	$currentstring .= '\strut \\\\ \strut ';
}	}
}	}
return $currentstring;	return $currentstring;
Line 1244 sub start_font {	Line 1309 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 1372 sub end_sup {	Line 1437 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 1410 sub end_hr {	Line 1475 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}';
	}
	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 1424 sub end_div {	Line 1521 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 {
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 .= $token->[4];	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
	undef,1);
	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);	my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);	my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
Line 1465 sub start_li {	Line 1569 sub start_li {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,1);	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
if ($type=~/circle/) {	my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0);
$currentstring .= ' \item[o] ';	#FIXME need to support types i and I
	if ($type=~/disc/) {
	$currentstring .= ' \item[$\bullet$] ';
	} elsif ($type=~/circle/) {
	$currentstring .= ' \item[$\circ$] ';
} elsif ($type=~/square/) {	} elsif ($type=~/square/) {
$currentstring .= ' \item[$\Box$] ';	$currentstring .= ' \item[$\diamond$] ';
} elsif ($type ne '') {	} elsif ($type eq '1') {
$currentstring .= ' \item['.$type.'] ';	$currentstring .= ' \item['.($Apache::londefdef::list_index+1).'.]';
	} elsif ($type eq 'A') {
	$currentstring .= ' \item['.('A'..'Z')[$Apache::londefdef::list_index].'.]';
	} elsif ($type eq 'a') {
	$currentstring .= ' \item['.('a'..'z')[$Apache::londefdef::list_index].'.]';
	} elsif ($value ne '') {
	$currentstring .= ' \item['.$value.'] ';
} else {	} else {
$currentstring .= ' \item ';	$currentstring .= ' \item ';
}	}
}	$Apache::londefdef::list_index++;
	}
return $currentstring;	return $currentstring;
}	}

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 1517 sub end_u {	Line 1632 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;
if ($TeXtype eq 'disc') {	if ($TeXtype eq 'disc') {
$currentstring .= ' \renewcommand{\labelitemi}{$\bullet$}	$currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'.
\renewcommand{\labelitemii}{$\bullet$}	'\renewcommand{\labelitemii}{$\bullet$}'.
\renewcommand{\labelitemiii}{$\bullet$}	'\renewcommand{\labelitemiii}{$\bullet$}'.
\renewcommand{\labelitemiv}{$\bullet$}';	'\renewcommand{\labelitemiv}{$\bullet$}';
} elsif ($TeXtype eq 'circle') {	} elsif ($TeXtype eq 'circle') {
$currentstring .= ' \renewcommand{\labelitemi}{$\circ$}	$currentstring .= '\renewcommand{\labelitemi}{$\circ$}'.
\renewcommand{\labelitemii}{$\circ$}	'\renewcommand{\labelitemii}{$\circ$}'.
\renewcommand{\labelitemiii}{$\circ$}	'\renewcommand{\labelitemiii}{$\circ$}'.
\renewcommand{\labelitemiv}{$\circ$}';	'\renewcommand{\labelitemiv}{$\circ$}';
} elsif ($TeXtype eq 'square') {	} elsif ($TeXtype eq 'square') {
$currentstring .= ' \renewcommand{\labelitemi}{$\diamond$}	$currentstring .= '\renewcommand{\labelitemi}{$\diamond$}'.
\renewcommand{\labelitemii}{$\diamond$}	'\renewcommand{\labelitemii}{$\diamond$}'.
\renewcommand{\labelitemiii}{$\diamond$}	'\renewcommand{\labelitemiii}{$\diamond$}'.
\renewcommand{\labelitemiv}{$\diamond$}';	'\renewcommand{\labelitemiv}{$\diamond$}';
}	}
$currentstring .= '\begin{itemize}';	$currentstring .= '\strut \begin{itemize}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1549 sub end_ul {	Line 1665 sub end_ul {
if ($target eq 'web') {	if ($target eq 'web') {
$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$}'.
\renewcommand{\labelitemii}{$\bullet$}	'\renewcommand{\labelitemii}{$\bullet$}'.
\renewcommand{\labelitemiii}{$\bullet$}	'\renewcommand{\labelitemiii}{$\bullet$}'.
\renewcommand{\labelitemiv}{$\bullet$}';	'\renewcommand{\labelitemiv}{$\bullet$}\strut ';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1583 sub end_menu {	Line 1699 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 1606 sub end_dir {	Line 1722 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;
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
if ($type eq '1') {	if ($type eq '1') {
$currentstring .= ' \renewcommand{\labelenumi}{\arabic{enumi}.}	$currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'.
\renewcommand{\labelenumii}{\arabic{enumii}.}	'\renewcommand{\labelenumii}{\arabic{enumii}.}'.
\renewcommand{\labelenumiii}{\arabic{enumiii}.}	'\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
\renewcommand{\labelenumiv}{\arabic{enumiv}.}';	'\renewcommand{\labelenumiv}{\arabic{enumiv}.}';
} elsif ($type eq 'A') {	} elsif ($type eq 'A') {
$currentstring .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}	$currentstring .= '\renewcommand{\labelenumi}{\Alph{enumi}.}'.
\renewcommand{\labelenumii}{\Alph{enumii}.}	'\renewcommand{\labelenumii}{\Alph{enumii}.}'.
\renewcommand{\labelenumiii}{\Alph{enumiii}.}	'\renewcommand{\labelenumiii}{\Alph{enumiii}.}'.
\renewcommand{\labelenumiv}{\Alph{enumiv}.}';	'\renewcommand{\labelenumiv}{\Alph{enumiv}.}';
} elsif ($type eq 'a') {	} elsif ($type eq 'a') {
$currentstring .= ' \renewcommand{\labelenumi}{\alph{enumi}.}	$currentstring .= '\renewcommand{\labelenumi}{\alph{enumi}.}'.
\renewcommand{\labelenumii}{\alph{enumii}.}	'\renewcommand{\labelenumii}{\alph{enumii}.}'.
\renewcommand{\labelenumiii}{\alph{enumiii}.}	'\renewcommand{\labelenumiii}{\alph{enumiii}.}'.
\renewcommand{\labelenumiv}{\alph{enumiv}.} ';	'\renewcommand{\labelenumiv}{\alph{enumiv}.}';
} elsif ($type eq 'i') {	} elsif ($type eq 'i') {
$currentstring .= ' \renewcommand{\labelenumi}{\roman{enumi}.}	$currentstring .= '\renewcommand{\labelenumi}{\roman{enumi}.}'.
\renewcommand{\labelenumii}{\roman{enumii}.}	'\renewcommand{\labelenumii}{\roman{enumii}.}'.
\renewcommand{\labelenumiii}{\roman{enumiii}.}	'\renewcommand{\labelenumiii}{\roman{enumiii}.}'.
\renewcommand{\labelenumiv}{\roman{enumiv}.} ';	'\renewcommand{\labelenumiv}{\roman{enumiv}.}';
} elsif ($type eq 'I') {	} elsif ($type eq 'I') {
$currentstring .= ' \renewcommand{\labelenumi}{\Roman{enumi}.}	$currentstring .= '\renewcommand{\labelenumi}{\Roman{enumi}.}'.
\renewcommand{\labelenumii}{\Roman{enumii}.}	'\renewcommand{\labelenumii}{\Roman{enumii}.}'.
\renewcommand{\labelenumiii}{\Roman{enumiii}.}	'\renewcommand{\labelenumiii}{\Roman{enumiii}.}'.
\renewcommand{\labelenumiv}{\Roman{enumiv}.} ';	'\renewcommand{\labelenumiv}{\Roman{enumiv}.}';
}	}
$currentstring .= '\begin{enumerate}';	$currentstring .= '\strut \begin{enumerate}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1648 sub end_ol {	Line 1765 sub end_ol {
if ($target eq 'web') {	if ($target eq 'web') {
$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}.}'.
\renewcommand{\labelenumii}{\arabic{enumii}.}	'\renewcommand{\labelenumii}{\arabic{enumii}.}'.
\renewcommand{\labelenumiii}{\arabic{enumiii}.}	'\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
\renewcommand{\labelenumiv}{\arabic{enumiv}.}';	'\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut ';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1659 sub end_ol {	Line 1776 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::description=();	$Apache::londefdef::DL++;
$Apache::londefdef::DD_redirection=0;	push(@Apache::londefdef::description,[]);
$Apache::londefdef::DT_redirection=0;	$Apache::londefdef::DD[$Apache::londefdef::DL]=0;
	$Apache::londefdef::DT[$Apache::londefdef::DL]=0;
	$Apache::londefdef::seenDT[$Apache::londefdef::DL]=0;
}	}
return $currentstring;	return $currentstring;
}	}
Line 1677 sub end_dl {	Line 1796 sub end_dl {
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::DT_redirection) {	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
my $data=&item_cleanup;	if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
push @Apache::londefdef::description,'\item['.$data.']';	foreach my $element (@{$Apache::londefdef::description[-1]}) {
$Apache::londefdef::DT_redirection=0;
} elsif ($Apache::londefdef::DD_redirection) {
$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
}
foreach my $element (@Apache::londefdef::description) {
$currentstring.=' '.$element.' ';	$currentstring.=' '.$element.' ';
}	}
@Apache::londefdef::description=();	pop(@Apache::londefdef::description);
$currentstring.='\end{description}';	$currentstring.='\end{description}';
	delete($Apache::londefdef::DD[$Apache::londefdef::DL]);
	delete($Apache::londefdef::DT[$Apache::londefdef::DL]);
	delete($Apache::londefdef::seenDT[$Apache::londefdef::DL]);
	$Apache::londefdef::DL--;
}	}
return $currentstring;	return $currentstring;
}	}
Line 1700 sub start_dt {	Line 1818 sub start_dt {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
if ($Apache::londefdef::DT_redirection) {	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
my $data=&item_cleanup;	if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
push @Apache::londefdef::description,'\item['.$data.']';
$Apache::londefdef::DT_redirection=0;
} elsif ($Apache::londefdef::DD_redirection) {
$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
$Apache::londefdef::DD_redirection=0;
}
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
$Apache::londefdef::DT_redirection=1;	$Apache::londefdef::DT[-1]++;
	$Apache::londefdef::seenDT[-1]=1;
}	}
return $currentstring;	return $currentstring;
}	}
Line 1720 sub end_dt {	Line 1833 sub end_dt {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $data=&item_cleanup;	if ($Apache::londefdef::DT[-1]) {
push @Apache::londefdef::description,'\item['.$data.']';	my $data=&item_cleanup();
$Apache::londefdef::DT_redirection=0;	push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm');
	$Apache::londefdef::DT[-1]--;
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 1741 sub start_dd {	Line 1856 sub start_dd {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
if ($Apache::londefdef::DT_redirection) {	if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
my $data=&item_cleanup;	if ($Apache::londefdef::DD[-1]) { &end_dd(@_);}
push @Apache::londefdef::description,'\item['.$data.']';	if (!$Apache::londefdef::seenDT[-1]) {
$Apache::londefdef::DT_redirection=0;	push(@{$Apache::londefdef::description[-1]},'\item[\strut] \strut \vskip 0mm ');
}	}
$Apache::londefdef::DD_redirection=1;	push(@{$Apache::londefdef::description[-1]},'');
	$Apache::londefdef::description[-1]->[-1].=' \strut ';
	$Apache::londefdef::DD[-1]++;
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
}	}
return $currentstring;	return $currentstring;
Line 1758 sub end_dd {	Line 1875 sub end_dd {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();	$Apache::londefdef::description[-1]->[-1].=
$Apache::londefdef::DD_redirection=0;	&Apache::lonxml::endredirection().' \vskip 0mm ';
	$Apache::londefdef::DD[-1]--;
}	}
return $currentstring;	return $currentstring;
}	}

#-- <table> tag (end tag required)	#-- <table> tag (end tag required)
	# <table> also ends any prior <p> that is not closed.
	# but, unless I allow <p>'s to nest, that's the
	# only way I could think of to allow <p> in
	# <tr> <th> bodies
	#
#list of supported attributes: border,width,TeXwidth	#list of supported attributes: border,width,TeXwidth
sub start_table {	sub start_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my ($textwidth,$currentstring)=('','');	my $textwidth = '';
	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;
#table's width	#maximum table's width (default coincides with text line length)
#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 1787 sub start_table {	Line 1910 sub start_table {
$textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}];	$textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}];
} else {	} else {
#try to use all space not used before (minus 5% for LaTeX table internal) - rather silly	#try to use all space not used before (minus 5% for LaTeX table internal) - rather silly
my $textwidth=$Apache::londefdef::table[-2]{'width'};	$textwidth=$Apache::londefdef::table[-2]{'width'};
for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) {	for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) {
$textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i];	$textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i];
}	}
Line 1808 sub start_table {	Line 1931 sub start_table {
$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
Line 1824 sub start_table {	Line 1948 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'}='\newline\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'}=[];
$Apache::londefdef::table[-1]{'objectlen'}=[];	$Apache::londefdef::table[-1]{'objectlen'}=[];
	$Apache::londefdef::table[-1]{'objectsignal'}=[];
$Apache::londefdef::table[-1]{'maxlen'}=[];	$Apache::londefdef::table[-1]{'maxlen'}=[];
$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 1857 sub end_table {	Line 1984 sub end_table {
}	}
#free space and number of empty columns	#free space and number of empty columns
my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0);	my ($available_space,$empty_columns)=($Apache::londefdef::table[-1]{'width'},0);
## &Apache::lonnet::logthis("Available space $Apache::londefdef::table[-1]{'width'}");	if ($#Apache::londefdef::table ne 0) {$available_space=0.9*$available_space;}
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]==0) {	if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]==0) {
$empty_columns++;	$empty_columns++;
Line 1888 sub end_table {	Line 2015 sub end_table {
$localmin=$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn];	$localmin=$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn];
}	}
}	}
if ($max_len[$jn]<$localmin) {$max_len[$jn]=$localmin;}#object size is bigger	if ($max_len[$jn]<$localmin) {
if ($min_len[$jn]<$localmin) {$min_len[$jn]=$localmin;}#object size is bigger	$max_len[$jn]=$localmin;
	$Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
	}#object size is bigger
	if ($min_len[$jn]<$localmin) {
	$min_len[$jn]=$localmin;
	$Apache::londefdef::table[-1]{'objectsignal'}[$jn]=1;
	}#object size is bigger
if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) {	if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]!=0) {
$min_len[$jn]=0;	$min_len[$jn]=0;
$max_len[$jn]=0;	$max_len[$jn]=0;
Line 1904 sub end_table {	Line 2037 sub end_table {
$space_neeeded=$space_neeeded+$max_len[$jn];	$space_neeeded=$space_neeeded+$max_len[$jn];
}	}
if ($space_neeeded<=$available_space) {	if ($space_neeeded<=$available_space) {
## &Apache::lonnet::logthis("I am in position 1: $space_neeeded <= $available_space");
for (my $jn=0;$jn<=$#max_len;$jn++) {	for (my $jn=0;$jn<=$#max_len;$jn++) {
if ($fwidth[$jn]==0) {	if ($fwidth[$jn]==0) {
$fwidth[$jn]=$max_len[$jn];	$fwidth[$jn]=$max_len[$jn];
Line 1917 sub end_table {	Line 2049 sub end_table {
$space_neeeded+=$min_len[$jn];	$space_neeeded+=$min_len[$jn];
}	}
if ($space_neeeded>$available_space) {	if ($space_neeeded>$available_space) {
## &Apache::lonnet::logthis("I am in position 2");
$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';	$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
for (my $jn=0;$jn<=$#max_len;$jn++) {	for (my $jn=0;$jn<=$#max_len;$jn++) {
if ($fwidth[$jn]==0) {	if ($fwidth[$jn]==0) {
$fwidth[$jn]=$min_len[$jn];	$fwidth[$jn]=$min_len[$jn];
}	}
}	}
	#check if we have objects which can be scaled
	my $how_many_to_scale=0;
	my @to_scale=();
	for (my $jn=0;$jn<=$#max_len;$jn++) {
	if ($Apache::londefdef::table[-1]{'objectsignal'}[$jn] eq '1') {
	$how_many_to_scale++;
	push @to_scale, $jn;
	}
	}
	if ($how_many_to_scale>0) {
	my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale;
	foreach my $jn (@to_scale) {
	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
	$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/;
	if ($1 ne '') {
	my $current_length=&recalc($1);
	$current_length=~/(\d+\.?\d*)/;
	$current_length=$current_length-$space_to_adjust;
	$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/width=$current_length mm/;
	}
	$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/\[(\d+\.?\d)\smm\]/;
	if ($1 ne '') {
	my $current_length=$1;
	$current_length=$current_length-$space_to_adjust;
	$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~s/\[(\d+\.?\d)\smm\]/\[$current_length mm\]/;
	}
	}
	$fwidth[$jn]=$fwidth[$jn]-$space_to_adjust;
	}
	}
} else {	} else {
#step 3. adjustment over minimal + corrections	#step 3. adjustment over minimal + corrections
## &Apache::lonnet::logthis("I am in position 3");
my $enlarge_coef=$available_space/$space_neeeded;	my $enlarge_coef=$available_space/$space_neeeded;
my $acsessive=0;	my $acsessive=0;
for (my $jn=0;$jn<=$#min_len;$jn++) {	for (my $jn=0;$jn<=$#min_len;$jn++) {
Line 1952 sub end_table {	Line 2112 sub end_table {
$fwidth[$jn]=$adjust[$jn];	$fwidth[$jn]=$adjust[$jn];
}	}
}	}
	} else {
	for (my $jn=0;$jn<=$#min_len;$jn++) {
	$fwidth[$jn]=$adjust[$jn];
	}
}	}
}	}
}	}
#recalculation for the use of all available width if width is defined in %	#use all available width if it is defined in % or as TeXwidth
if ($Apache::londefdef::table[-1]{'percent'}==1) {	if (($Apache::londefdef::table[-1]{'percent'}==1) \|\| ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) {
my $current=0;	my $current=0;
for (my $i=0;$i<=$#fwidth;$i++) {	for (my $i=0;$i<=$#fwidth;$i++) {
$current+=$fwidth[$i];	$current+=$fwidth[$i];
Line 1995 sub end_table {	Line 2159 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.='\begin{center}';	$output.='\vspace*{-6 mm}\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}';	$output.='\end{center}\vspace*{-6 mm}';
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
$output.='} ';	$output.='} ';
}	}
Line 2009 sub end_table {	Line 2173 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}\vskip 0 mm ';	# 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'};
pop @Apache::londefdef::table;	pop @Apache::londefdef::table;
Line 2050 sub start_tr {	Line 2216 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);
Line 2137 sub end_td_tex {	Line 2303 sub end_td_tex {
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	} elsif ($data=~/\\parbox\{\s\d+\.?\d\s(mm\|cm\|in\|pc\|pt)\s\}/ or $data=~/\\epsfxsize\s=\s\d+\.?\d\s(mm\|cm\|in\|pc\|pt)/) {
	my $garbage_data=$data;
	my $fwidth=0;
	while ($garbage_data=~/\\parbox\{\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt))\s*\}/) {
	my $current_length=&recalc($1);
	$current_length=~/(\d+\.?\d*)/;
	if ($fwidth<$1) {$fwidth=$1;}
	$garbage_data=~s/\\parbox\{\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt))//;
	}
	while ($garbage_data=~/\\epsfxsize\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/) {
	my $current_length=&recalc($1);
	$current_length=~/(\d+\.?\d*)/;
	if ($fwidth<$1) {$fwidth=$1;}
	$garbage_data=~s/\\epsfxsize\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)//;
	}
	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	$data=~s/\\\\\s*$//;
} else {	} else {
$data=~s/^\s+(\S.*)/$1/;	$data=~s/^\s+(\S.*)/$1/;
$data=~s/(.*\S)\s+$/$1/;	$data=~s/(.*\S)\s+$/$1/;
Line 2159 sub end_td_tex {	Line 2345 sub end_td_tex {
$current_length=2.5*&LATEX_length($data);	$current_length=2.5*&LATEX_length($data);
my @words=split(/ /,$data);	my @words=split(/ /,$data);
foreach my $word (@words) {	foreach my $word (@words) {
my $lengthword=2.5*&LATEX_length($word);	my $lengthword=2*&LATEX_length($word);
if ($min_length<$lengthword) {$min_length=$lengthword;}	if ($min_length<$lengthword) {$min_length=$lengthword;}
}	}
}	}
Line 2195 sub start_th {	Line 2381 sub start_th {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);	$Apache::londefdef::TD_redirection = 1;
if ($what_to_push eq '') {	&tagg_check('tr','th',$tagstack,$parstack,$parser,$safeeval);
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
}
push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
$Apache::londefdef::table[-1]{'counter_columns'}++;
&Apache::lonxml::startredirection();
}	}
return $currentstring;	return $currentstring;
}	}

	sub tagg_check {
	my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_;
	my @ar=@$parstack;
	for (my $i=$#ar-1;$i>=0;$i--) {
	if (lc($$tagstack[$i]) eq $good_tag) {
	&start_th_tex($parstack,$parser,$safeeval);
	last;
	} elsif (lc($$tagstack[$i]) eq $bad_tag) {
	splice @ar, $i+1;
	&end_th_tex(\@ar,$parser,$safeeval);
	&start_th_tex($parstack,$parser,$safeeval);
	last;
	}
	}
	return '';
	}

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

	sub end_th_tex {
	my ($parstack,$parser,$safeeval) = @_;
	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
	my $data=&Apache::lonxml::endredirection();
	my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
	if (defined $TeXwidth) {
	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	} else {
	if (($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt))/) or ($data=~m/\[(\d+\.?\d)\s*mm\]/)) {
	my $garbage_data=$data;
	my $fwidth=0;
	while ($garbage_data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/) {
	my $current_length=&recalc($1);
	$current_length=~/(\d+\.?\d*)/;
	if ($fwidth<$1) {$fwidth=$1;}
	$garbage_data=~s/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)//;
	}
	while ($garbage_data=~m/\[(\d+\.?\d)\smm\]/) {
	my $current_length=$1;
	if ($fwidth<$current_length) {$fwidth=$current_length;}
	$garbage_data=~s/\[(\d+\.?\d)\smm\]//;
	}
	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	} else {
	$data=~s/^\s+(\S.*)/$1/;
	$data=~s/(.*\S)\s+$/$1/;
	$data=~s/(\s)+/$1/;
	my ($current_length,$min_length)=(0,0);
	if ($data=~/\\vskip/) {
	my $newdata=$data;
	$newdata=~s/\\vskip \d\.?\d\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;
	my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);
	foreach my $elementdata (@newdata) {
	my $lengthnewdata=2.5*&LATEX_length($elementdata);
	if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}
	my @words=split(/ /,$elementdata);
	foreach my $word (@words) {
	my $lengthword=2.5*&LATEX_length($word);
	if ($min_length<$lengthword) {$min_length=$lengthword;}
	}
	}
	} else {
	$current_length=2.5*&LATEX_length($data);
	my @words=split(/ /,$data);
	foreach my $word (@words) {
	my $lengthword=2*&LATEX_length($word);
	if ($min_length<$lengthword) {$min_length=$lengthword;}
	}
	}
	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;
	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
	}
	}
	for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {
	$data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
	}
	#make data bold
	$data='\textbf{'.$data.'}';
	push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
	return'';
	}

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') {
my $current_row = $Apache::londefdef::table[-1]{'row_number'};	$Apache::londefdef::TD_redirection =0;
my $data=&Apache::lonxml::endredirection();	&end_th_tex($parstack,$parser,$safeeval);
my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
if (defined $TeXwidth) {
my $current_length=&recalc($TeXwidth);
$current_length=~/(\d+)/;
$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
$Apache::londefdef::table[-1]{'length'} .= '0,';
} else {
if ($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/) {
my $current_length=&recalc($1);
$current_length=~/(\d+)/;
$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
$Apache::londefdef::table[-1]{'length'} .= '0,';
} else {
$data=~/^\s(\S.)/;
$data=$1;
$data=~/(.\S)\s$/;
$data=$1;
my $current_length=2*length($data);
$Apache::londefdef::table[-1]{'length'} .= $current_length.',';
$Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
}
}
for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {
$data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
}
$data='\textbf{'.$data.'}';
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
}	}
return $currentstring;	return $currentstring;
}	}

#-- <img> tag (end tag forbidden)	#-- <img> tag (end tag forbidden)
	#
	# Render the <IMG> tag.
	# <IMG> has the following attributes (in addition to the
	# standard HTML ones:
	# TeXwrap - Governs how the tex target will try to wrap text around
	# horizontally aligned images.
	# TeXwidth - The width of the image when rendered for print (mm).
	# TeXheight - The height of the image when rendered for print (mm)
	# (Note there seems to also be support for this as a % of page size)
	#
sub start_img {	sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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);
&Apache::lonnet::logthis("inside was $inside");
return '';	return '';
}	}
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;	$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
my $currentstring = '';	my $currentstring = '';
my $scaling = .3;	my $scaling = .3;

	# 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.= $token->[4];	$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
} else {	} else {
my $alttag= &Apache::lonxml::get_param	my $alttag= &Apache::lonxml::get_param
('alt',$parstack,$safeeval,undef,1);	('alt',$parstack,$safeeval,undef,1);
Line 2269 sub start_img {	Line 2540 sub start_img {
}	}
$currentstring.='[IMAGE: '.$alttag.']';	$currentstring.='[IMAGE: '.$alttag.']';
}	}

	# and render unto TeX that which is LaTeX

} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);	#
	# The alignment will require some superstructure to be put around
	# the \includegraphics stuff. At present we can only partially
	# simulate the alignments offered by html.
	#
	#
	my $align = lc(&Apache::lonxml::get_param('align',
	$parstack,
	$safeeval,
	undef,1));
	if(!$align) {
	$align = "bottom"; # This is html's default so it's ours too.
	}
	#
	&Apache::lonxml::debug("Alignemnt = $align");
	# LaTeX's image/text wrapping is really bad since it wants to
	# make figures float.
	# The user has the optional parameter (applicable only to l/r
	# alignment to use the picins/parpic directive to get wrapped text
	# this is also imperfect.. that's why we give them a choice...
	# so they can't yell at us for our choice.
	#
	my $latex_rendering = &Apache::lonxml::get_param('TeXwrap',
	$parstack,
	$safeeval,
	undef,0);
	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
	if(!$latex_rendering) {
	$latex_rendering = "parbox";
	}
	&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);
	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
	&Apache::lonxml::debug("path = $path file = $file src = $src");
if (-e $src) {	if (-e $src) {
#what is the image size?	&Apache::lonxml::debug("$src exists");
my $width_param=&image_size($src,$scaling,$parstack,$safeeval);	my ($height_param,$width_param)=
my ($file,$path)=&file_path($src);	&image_size($origsrc,0.3,$parstack,$safeeval);
my $newsrc = $src;	my $destpath = $path;
$newsrc =~ s/\.(gif\|jpg\|png)$/.eps/i;	$destpath =~ s/ /\_/g; # Spaces in path cause LaTex to vomit.
$file=~s/\.(gif\|jpg\|png)$/.eps/i;	my $destfile = $file;
#where can we find the picture?	$destfile =~ s/ /\_/g;
if (-e $newsrc) {	my $size;
#eps counterpart for image exist	if ($width_param) { $size.='width='.$width_param.' mm,'; }
if ($path) {	if ($height_param) { $size.='height='.$height_param.' mm]'; }
$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';	$size='['.$size;
	$size=~s/,$/]/;
	$currentstring .= '\graphicspath{{'.$destpath.'}}'
	.'\includegraphics'.$size.'{'.$destfile.'} ';

	# If there's an alignment specification we need to honor it here.
	# For the horizontal alignments, we will also honor the
	# value of the latex specfication. The default is parbox,
	# and that's used for illegal values too.
	#
	# Even though we set a default alignment value, the user
	# could have given us an illegal value. In that case we
	# just use the default alignment of bottom..
	if ($align eq "top") {
	$currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}';
	} elsif (($align eq "center") \|\| ($align eq "middle")) { # Being kind
	my $offset = $height_param/2;
	$currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}';
	} elsif ($align eq "left") {
	if ($latex_rendering eq "parpic") {
	$currentstring = '\parpic[l]{'.$currentstring.'}';
	} else { # parbox rendering
	$currentstring = "\\strut\\newline\n".
	'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
}	}
} else {	} elsif ($align eq "right") {
#there is no eps counterpart for image - check for ps one	if ($latex_rendering eq "parpic") {
$newsrc =~ s/\.eps$/\.ps/;	$currentstring = '\parpic[r]{'.$currentstring.'}';
if (-e $newsrc) {	} else { # parbox rendering.
#ps counterpart for image exist	$currentstring = '\parbox{'.$width_param.'mm}{\begin{flushright}'
$file =~ s/\.eps$/\.ps/;	.$currentstring.'\end{flushright}} \newline'."\n";
if ($path) {
$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
}
} else {
#care about eps dynamical generation
$currentstring.='\vskip 1 mm '.&eps_generation($src,$file,$width_param);
}	}
	} else { # Bottom is also default.
	# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}';
}	}
} else {	} else {
	&Apache::lonxml::debug("$src does not exist");
#original image file doesn't exist so check the alt attribute	#original image file doesn't exist so check the alt attribute
my $alt =	my $alt =
&Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);	&Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
Line 2307 sub start_img {	Line 2636 sub start_img {
$alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);	$alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
}	}

if ($alt) {	if ($alt) { $currentstring .= ' '.$alt.' '; }
$currentstring .= ' '.$alt.' ';
} else {
#<allow> tag will care about replication
}
}	}

	# And here's where the semi-quote breaks down: allow the user
	# to edit the beast as well by rendering the problem for edit:
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$currentstring .=&Apache::edit::tag_start($target,$token);	$currentstring .=&Apache::edit::tag_start($target,$token);
$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).	$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
Line 2323 sub start_img {	Line 2651 sub start_img {
$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />';	$currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />';
$currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5);	$currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5);
$currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5);	$currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5);
	$currentstring .=&Apache::edit::select_arg('Alignment:','align',
	['','bottom','middle','top','left','right'],$token,5);
	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
	['', 'parbox', 'parpic'], $token, 2);
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();	$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval);	my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval);
my $alt=&Apache::lonxml::get_param('alt',$parstack,$safeeval);	my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval);
my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);	my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);	my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);


$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';	$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
if ($width) { $currentstring.=' width="'.$width.'" '; }	if ($width) { $currentstring.=' width="'.$width.'" '; }
if ($height) { $currentstring.=' height="'.$height.'" '; }	if ($height) { $currentstring.=' height="'.$height.'" '; }
Line 2336 sub start_img {	Line 2670 sub start_img {
my ($osrc,$owidth,$oheight)=	my ($osrc,$owidth,$oheight)=
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});	($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
my $ctag=&Apache::edit::get_new_args($token,$parstack,	my $ctag=&Apache::edit::get_new_args($token,$parstack,
$safeeval,'src','alt',	$safeeval,'src','alt','align',
'TeXwidth','TeXheight',	'TeXwidth','TeXheight', 'TeXwrap',
'width','height');	'width','height');
my ($nsrc,$nwidth,$nheight)=	my ($nsrc,$nwidth,$nheight)=
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});	($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc);	my $loc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$nsrc);
&image_replication($loc);	&image_replication($loc);
my ($iwidth,$iheight);	my ($iwidth,$iheight);
&Apache::lonnet::logthis("loc is $loc");
if (-e $loc) {	if (-e $loc) {
my $image = Image::Magick->new;	my $image = Image::Magick->new;
$image->Read($loc);	$image->Read($loc);
Line 2374 sub start_img {	Line 2707 sub start_img {
}	}
if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);}	if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);}
}	}

return $currentstring;	return $currentstring;
}	}

Line 2401 sub start_applet {	Line 2735 sub start_applet {

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 = $token->[4];	$currentstring = &Apache::lonenc::encrypt_ref($token,
	{'code'=>$code,
	'archive'=>$archive}
	);
} else {	} else {
my $alttag= &Apache::lonxml::get_param('alt',$parstack,	my $alttag= &Apache::lonxml::get_param('alt',$parstack,
$safeeval,undef,1);	$safeeval,undef,1);
Line 2444 sub start_embed {	Line 2781 sub start_embed {
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;	$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$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 = $token->[4];	$currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
} else {	} else {
my $alttag=&Apache::lonxml::get_param	my $alttag=&Apache::lonxml::get_param
('alt',$parstack,$safeeval,undef,1);	('alt',$parstack,$safeeval,undef,1);
Line 2481 sub start_param {	Line 2818 sub start_param {
&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	my %toconvert;
	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
	if ($src) { $toconvert{'src'}= $src; }
	my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval,
	undef,1);
	if ($name=~/^cabbase$/i) {
	$toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack,
	$safeeval,undef,1);
	}
	$currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert);
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
}	}
return $currentstring;	return $currentstring;
Line 2504 sub start_allow {	Line 2850 sub start_allow {
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=	$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
&Apache::lonnet::clutter($src);	&Apache::lonnet::clutter($src);
&image_replication($src);	if ($target eq 'tex') { &image_replication($src); }
my $result;	my $result;
if ($target eq 'edit') {	if ($target eq 'edit') {
$result .=&Apache::edit::tag_start($target,$token);	$result .=&Apache::edit::tag_start($target,$token);
Line 2528 sub end_allow {	Line 2874 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 2597 sub end_xmp {	Line 2943 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 2660 sub end_externallink {	Line 3006 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 2813 sub end_blink {	Line 3159 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 3136 sub end_marquee {	Line 3482 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 3334 sub end_server {	Line 3680 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 3496 sub image_replication {	Line 3842 sub image_replication {
$pssrc =~ s/\.(gif\|jpg\|jpeg\|png)$/.ps/i;	$pssrc =~ s/\.(gif\|jpg\|jpeg\|png)$/.ps/i;
if (not -e $epssrc && not -e $pssrc) {	if (not -e $epssrc && not -e $pssrc) {
my $result=&Apache::lonnet::repcopy($epssrc);	my $result=&Apache::lonnet::repcopy($epssrc);
if ($result ne OK) { &Apache::lonnet::repcopy($pssrc); }	if ($result ne 'ok') { &Apache::lonnet::repcopy($pssrc); }
}	}
return '';	return '';
}	}
	#
	# Get correct sizing parameter for an image given
	# it's initial ht. and wid. This allows sizing of
	# images that are generated on-the-fly (e.g. gnuplot)
	# as well as serving as a utility for image_size.
	#
	# Parameter:
	# height_param
	# width_param - Initial picture dimensions.
	# scaling - A scale factor.
	# parstack, - the current stack of tag attributes
	# from the xml parser
	# safeeval, - pointer to the safespace
	# depth, - from what level in the stack to look for attributes
	# (assumes -1 if unspecified)
	# cis - look for attrubutes case insensitively
	# (assumes false)
	#
	# Returns:
	# height, width - new dimensions.
	#
	sub resize_image {
	my ($height_param, $width_param, $scaling,
	$parstack, $safeeval, $depth, $cis) = @_;

	# First apply the scaling...

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

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

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

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

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

	return ($height_param, $width_param);
	}

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

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

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

sub eps_generation {	sub eps_generation {
my ($src,$file,$width_param) = @_;	my ($src,$file,$width_param) = @_;
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";	my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
my $temp_file = Apache::File->new('>>'.$filename);	my $temp_file = Apache::File->new('>>'.$filename);
print $temp_file "$src\n";	print $temp_file "$src\n";
my $newsrc = $src;	my $newsrc = $src;
Line 3541 sub eps_generation {	Line 4009 sub eps_generation {
$newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;	$newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;
$newsrc=~s/\/\.\//\//;	$newsrc=~s/\/\.\//\//;
$newsrc=~s/\/([^\/]+)\.(ps\|eps)/\//;	$newsrc=~s/\/([^\/]+)\.(ps\|eps)/\//;
return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';	if ($newsrc=~/\/home\/httpd\/lonUsers\//) {
	$newsrc=~s/\/home\/httpd\/lonUsers//;
	$newsrc=~s/\/([^\/]+)\/(\w)\/(\w)\/(\w)\//\/$1\//;
	}
	if ($newsrc=~/\/userfiles\//) {
	return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
	} else {
	return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
	}
}	}

sub file_path {	sub file_path {
Line 3593 sub LATEX_length {	Line 4069 sub LATEX_length {
$garbage=~s\|\\(\w+)\\\|\\\|g;	$garbage=~s\|\\(\w+)\\\|\\\|g;
$garbage=~s\|\\(\w+)(\s*)\|$2\|g;	$garbage=~s\|\\(\w+)(\s*)\|$2\|g;
$garbage=~s\|\+\|11\|g;	$garbage=~s\|\+\|11\|g;

&Apache::lonnet::logthis("garbage was just $garbage");
my $value=length($garbage);	my $value=length($garbage);
return $value;	return $value;
}	}

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

Removed from v.1.210
changed lines
	Added in v.1.281