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.353 and 1.415.4.6

version 1.353, 2007/01/22 11:28:08	version 1.415.4.6, 2011/11/15 17:34:19
Line 42 package Apache::londefdef;	Line 42 package Apache::londefdef;
use Apache::lonnet;	use Apache::lonnet;
use strict;	use strict;
use Apache::lonxml;	use Apache::lonxml;
	use Apache::lontable;
use Apache::File();	use Apache::File();
use Image::Magick;	use Image::Magick;
use Apache::lonmenu();	use Apache::lonmenu();
use Apache::lonmeta();	use Apache::lonmeta();
	use Apache::lonlocal;
	use Apache::loncommon();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use File::Basename;	use File::Basename;
use LONCAPA();	use LONCAPA();
Line 57 BEGIN {	Line 60 BEGIN {

}	}

#
# Dumps all elements of the table structure.
# Need this 'cause evidently when given an array, Data::Dumper only seems
# to dump element 0.
#
#sub debug_dump_table {
# my $lastrow = $#Apache::londefdef::table;
# &Apache::lonnet::logthis("Dumping table: Last row index: $lastrow");
# my $row;
# for ($row =0; $row <= $lastrow; $row++ ) {
# my $text = Dumper($Apache::londefdef::table[$row]);
# &Apache::lonnet::logthis("table [ $row ]".$text);
# }
#}
sub initialize_londefdef {	sub initialize_londefdef {
$Apache::londefdef::TD_redirection=0;	$Apache::londefdef::TD_redirection=0;
@Apache::londefdef::table = ();	@Apache::londefdef::table = ();
Line 106 sub start_m {	Line 96 sub start_m {
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {	if ($eval eq 'on') {
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
#&Apache::lonxml::debug("M is evaulated to:$inside:");	#&Apache::lonxml::debug("M is evaluated to:$inside:");
}	}
my $tex = $inside;	my $tex = $inside;
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
$currentstring = &Apache::lontexconvert::converted(\$inside,$display);	$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
if ($Apache::lontexconvert::errorstring) {	if ($Apache::lontexconvert::errorstring) {
my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occured while attempting to convert this TeX: <pre>';	my $errormsg='<pre>'.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'</pre> occurred while attempting to convert this TeX: <pre>';
$tex = &HTML::Entities::encode($tex,'<>&"');	$tex = &HTML::Entities::encode($tex,'<>&"');
my ($linenumber) =	my ($linenumber) =
($Apache::lontexconvert::errorstring =~ /Line (\d+)/);	($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
Line 128 sub start_m {	Line 118 sub start_m {
#&Apache::lonxml::debug("M is ends with:$currentstring:");	#&Apache::lonxml::debug("M is ends with:$currentstring:");
$Apache::lonxml::post_evaluate=0;	$Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {

$currentstring = $inside;	$currentstring = $inside;
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {	if ($eval eq 'on') {
Line 135 sub start_m {	Line 126 sub start_m {
}	}
if ($currentstring=~/^(\s\\\\\s)*$/) {$currentstring = ' \vskip 0 mm ';}	if ($currentstring=~/^(\s\\\\\s)*$/) {$currentstring = ' \vskip 0 mm ';}
# detect simple math mode entry exits, and convert them	# detect simple math mode entry exits, and convert them
# to use \ensuremath	# to use \ensuremath ... unless there's a \verb inside.
if ($currentstring=~/^\s\$[^\$].[^\$]\$\s*$/) {	if (! ($currentstring=~/\\verb/)) {
$currentstring=~s/^(\s*)\$/$1/;	if ($currentstring=~/^\s\$[^\$].\$\s*$/) {
$currentstring=~s/\$(\s*)$/$1/;	$currentstring=~s/^(\s*)\$/$1/;
$currentstring='\ensuremath{'.$currentstring.'}';	$currentstring=~s/\$(\s*)$/$1/;
	$currentstring='\ensuremath{'.$currentstring.'}';
	}
}	}
$Apache::lonxml::post_evaluate=0;	$Apache::lonxml::post_evaluate=0;
}	}
Line 184 sub start_html {	Line 177 sub start_html {
if ($target eq 'web' \|\| $target eq 'edit' \|\| $target eq 'webgrade' ) {	if ($target eq 'web' \|\| $target eq 'edit' \|\| $target eq 'webgrade' ) {
# start_body() takes care of emitting the <html>	# start_body() takes care of emitting the <html>
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .=
'\documentclass[letterpaper,twoside]{article}\raggedbottom';	$currentstring .= &latex_header();
if (($env{'form.latex_type'}=~'batchmode') \|\|
(!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
$currentstring .= '\newcommand{\keephidden}[1]{}'.
'\renewcommand{\deg}{$^{\circ}$}'.
'\usepackage{multirow}'.
'\usepackage{longtable}'.
'\usepackage{textcomp}'.
'\usepackage{makeidx}'.
'\usepackage[dvips]{graphicx}'.
'\usepackage{wrapfig}'.
'\usepackage{picins}'.
'\usepackage{epsfig}'.
'\usepackage{calc}'.
'\usepackage{amsmath}'.
'\usepackage{amssymb}'.
'\usepackage{amsfonts}'.
'\usepackage{amsthm}'.
'\usepackage{amscd}'.
'\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
'\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 445 sub start_meta {	Line 418 sub start_meta {
if ((not defined $content) && (not defined $name)) {	if ((not defined $content) && (not defined $name)) {
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
}	}
	} elsif ($target eq 'edit') {
	$currentstring .= &Apache::edit::tag_start($target,$token);
	$currentstring .= &Apache::edit::text_arg('Name:','name',$token,30);
	$currentstring .= &Apache::edit::text_arg('Content:','content',$token,70);
	$currentstring .= &Apache::edit::end_row();
	} elsif ($target eq 'modified') {
	my $constructtag =
	&Apache::edit::get_new_args($token,$parstack,$safeeval,
	'name','content');
	if ($constructtag) { $currentstring = &Apache::edit::rebuild_tag($token); }
}	}
return $currentstring;	return $currentstring;
}	}
Line 468 sub end_meta {	Line 451 sub end_meta {
return $currentstring;	return $currentstring;
}	}

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

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

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

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

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

#-- <body> tag (end tag required)	#-- <body> tag (end tag required)
sub start_body {	sub start_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
Line 527 sub start_body {	Line 536 sub start_body {
if (&is_inside_of($tagstack, "head")) {	if (&is_inside_of($tagstack, "head")) {
&end_head(@_);	&end_head(@_);
}	}

	my $extra_head = &generate_css_links();

	# Breadcrumbs
	&Apache::lonhtmlcommon::clear_breadcrumbs();
	if ($env{'request.state'} eq 'construct') {
	&Apache::lonhtmlcommon::add_breadcrumb({
	'text' => 'Construction Space',
	'href' => &Apache::loncommon::authorspace(),
	});
	&Apache::lonhtmlcommon::add_breadcrumb({
	'text' => 'HTML Editor',
	'href' => '',
	});
	# breadcrumbs (and tools) will be created
	# in start_page->bodytag->innerregister
	} else {
	# FIXME Where are we?
	}

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

if ($env{'request.state'} ne 'published') {	my $header = '';
$currentstring.=&Apache::lonmenu::constspaceform();	if ($env{'request.state'} ne 'published' &&
$currentstring.=(<<EDITBUTTON);	$env{'request.state'} ne 'construct') {
<form method="post">	$header=&Apache::lonmenu::constspaceform();
<input type="submit" name="editmode" accesskey="e" value="Edit" />	}
</form>	if ($env{'request.state'} ne 'published') {
<br />	$header.=&Apache::londefdef::edit_controls();
EDITBUTTON	}
}	if ($env{'request.state'} eq 'construct') {
$currentstring.=&Apache::lonxml::message_location();	$currentstring.=&Apache::loncommon::head_subbox(
	&Apache::loncommon::CSTR_pageheader()
	.$header);
	} elsif ($env{'request.state'} eq 'edit') {
	$currentstring.=&Apache::loncommon::head_subbox($header);
	}
	$currentstring.=&Apache::lonxml::message_location();
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '\begin{document}';	$currentstring = ''; # '\begin{document}' is in header.
}	}

return $currentstring;	return $currentstring;
}	}

	sub edit_controls {
	my ($nochgview) = @_;
	my $result .= '
	<form method="post" action="">
	<div class="LC_edit_problem_header">';
	unless ($nochgview) {
	$result .= '
	<div class="LC_edit_problem_header_row1">'.
	&Apache::lonxml::renderingoptions().'
	<input type="submit" name="changeproblemmode" value="'.&mt('Change View').'" />
	</div>';
	}
	$result .= '
	<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />';
	if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
	my $viewtext = &mt('Course View');
	if (&Apache::loncommon::course_type() eq 'Community') {
	$viewtext = &mt('Community View');
	}
	$result .= (' ' x 3).'<input type="button" value="'.
	$viewtext.'" onclick="javascript:location.href=currentURL" />';
	}
	$result .= '</div>
	</div>
	</form>
	';
	return $result;
	}

sub end_body {	sub end_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off unclosed <p>	my $currentstring = &end_p(); # Close off unclosed <p>
Line 1225 sub start_br {	Line 1291 sub start_br {
$signal = 1;	$signal = 1;
}	}
}	}
if ($signal eq 1) {	if ($signal != 1) {
$currentstring .= ' \vskip 0 mm ';
} elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
$currentstring .= '\strut \\\\ \strut ';	$currentstring .= '\strut \\\\ \strut ';
} else { # Honor break in simple <sup></sup>
$currentstring .= '}} \strut \\\\ \strut \ensuremath{^{';
}	}

}	}
return $currentstring;	return $currentstring;
}	}
Line 1326 sub start_font {	Line 1389 sub start_font {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
if ($face!~/symbol/i) {
if (($env{'browser.fontenhance'} eq 'on') \|\|
($env{'browser.blackwhite'} eq 'on')) { return ''; }
}
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
Line 1413 sub start_sub {	Line 1472 sub start_sub {
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\ensuremath{_{';	$currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1436 sub start_sup {	Line 1495 sub start_sup {
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\ensuremath{^{';	$currentstring .= '\raisebox{\smallskipamount}{\scriptsize{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1459 sub start_hr {	Line 1518 sub start_hr {
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {

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

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

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

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

	if ($restart_sub) {
	$currentstring .= &start_sub($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
	if ($restart_sup) {
	$currentstring .= &start_sup($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 1509 sub start_div {	Line 1599 sub start_div {
}	}
if ($target eq 'tex') {	if ($target eq 'tex') {
# 4 possible alignments: left, right, center, and -missing-.	# 4 possible alignments: left, right, center, and -missing-.
	# If inside a table row, we must let the table logic
	# do the alignment, however.
	#

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

Line 1519 sub start_div {	Line 1612 sub start_div {
$endstring = '\end{center}';	$endstring = '\end{center}';
if (&is_inside_of($tagstack, "table")) {	if (&is_inside_of($tagstack, "table")) {
$currentstring = &center_correction().$currentstring;	$currentstring = &center_correction().$currentstring;
	$endstring .= &center_end_correction();
}	}
}	}
elsif ($align eq 'right') {	elsif ($align eq 'right') {
Line 1559 sub start_a {	Line 1653 sub start_a {
my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,	my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
undef,1);	undef,1);
$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});	$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href});
	if ($href =~ /\S/) {
	if ($href !~ m{^https?://}) {
	my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
	my $linkurl;
	if ($href =~ m{^/uploaded/}) {
	$linkurl = $href;
	} elsif ($href =~ m{^[^/]}) {
	my $path = $url;
	$path =~ s{[^/]*$}{};
	$linkurl = $path.$href;
	}
	if ($linkurl =~ m{^/uploaded/}) {
	if (!&Apache::lonnet::allowed('bre',$linkurl)) {
	if (&Apache::lonnet::is_on_map($url)) {
	&Apache::lonxml::extlink($linkurl);
	}
	}
	}
	}
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 1574 sub end_a {	Line 1688 sub end_a {
&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);	&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1);
my $name =	my $name =
&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);	&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
if ($href =~ /\S/) {	my $uriprint =
	&Apache::lonxml::get_param('uriprint',$parstack,$safeeval,undef,1);
	my $anchorprint =
	&Apache::lonxml::get_param('anchorprint',$parstack,$safeeval,undef,1);
	if (($href =~ /\S/) && ($uriprint=~/^on\|uriprint\|yes\|1$/i)) {
$href =~ s/([^\\])%/$1\\\%/g;	$href =~ s/([^\\])%/$1\\\%/g;
$currentstring .= ' ({\tt URI:'.&Apache::lonxml::latex_special_symbols($href).'})';	# Substitute special symbols... and allow line breaks at each /
} elsif ($name =~ /\S/) {	#
	$href = &Apache::lonxml::latex_special_symbols($href);
	$href =~ s/\//\/\\-/g; # Map / to /\- to allow hyphenation.
	$currentstring .= ' ({\tt URI:'.$href.'})';
	} elsif (($name =~ /\S/) && ($anchorprint=~/^on\|anchorprint\|yes\|1$/i)) {
$currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';	$currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
} else {	} else {
$currentstring.='';	$currentstring.='';
Line 1912 sub end_dd {	Line 2034 sub end_dd {
# only way I could think of to allow <p> in	# only way I could think of to allow <p> in
# <tr> <th> bodies	# <tr> <th> bodies
#	#
#list of supported attributes: border,width,TeXwidth	#list of supported attributes: border,width,TeXwidth,TeXtheme
	# align
sub start_table {	sub start_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $textwidth = '';	my $textwidth = '';
Line 1920 sub start_table {	Line 2043 sub start_table {
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
push(@Apache::londefdef::table, {});	&disable_para(); # Can't have paras in a table.
$Apache::londefdef::table[-1]{'row_number'} = -1;
#maximum table's width (default coincides with text line length)
if ($#Apache::londefdef::table==0) {
$textwidth=&recalc($env{'form.textwidth'}); #result is always in mm
$textwidth=~/(\d+\.?\d*)/;
$textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame
} else {
if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) {
#the maximum width of nested table is determined by LATeX width of parent cell
$textwidth=$Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}];
} else {
#try to use all space not used before (minus 5% for LaTeX table internal) - rather silly
$textwidth=$Apache::londefdef::table[-2]{'width'};
for (my $i=0;$i<$Apache::londefdef::table[-2]{'counter_columns'};$i++) {
$textwidth=$textwidth-$Apache::londefdef::table[-2]{'TeXlen'}[0][$i];
}
}
}

# width either comes forced from the TeXwidth or the width parameters.	# Get the parameters that we can do something about:
# in either case it can be a percentage or absolute width.
# in the width case we ignore absolute width	my $border = &Apache::lonxml::get_param('border', $parstack, $safeeval, undef, 0);
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);	my $width = &Apache::lonxml::get_param('TeXwidth', $parstack, $safeeval, undef, 0);
if (!defined($TeXwidth)) {	my $theme = &Apache::lonxml::get_param('TeXtheme', $parstack, $safeeval, undef, 0);
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,	my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 0);
$safeeval,undef,1);	my $cell_border = &Apache::lonxml::get_param('rules', $parstack, $safeeval, undef, 0);
if ($htmlwidth =~ /%/) {
$TeXwidth = $htmlwidth;	# The only thing that needs any figuring out is the width.. and then only if it is
} else {	# a percent. If not it's assumed to be some valid TeX measurement unit e.g. 3.0cm
$TeXwidth = $textwidth;	#
}
} else {	my $table = new Apache::lontable();
$Apache::londefdef::table[-1]{'forcedtablewidth'} = 1;	if ((defined $border) && ($border > 0)) {
}	# &Apache::lonnet::logthis("Turning on table borders: $border");
if ($TeXwidth=~/%/) {	$table->table_border(1);
$Apache::londefdef::table[-1]{'percent'}=1;	if (!defined $cell_border) {
$TeXwidth=~/(\d+)/;	$table->cell_border(1); # Default for rules is all if rules not defined.
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;	}
} else {	}
$Apache::londefdef::table[-1]{'width'}=$TeXwidth;
	if ((defined $cell_border)) {
	if ($cell_border eq 'all') {
	$table->cell_border(1);
	} elsif ($cell_border eq 'rows') {
	$table->cell_border(2);
	} elsif ($cell_border eq 'cols') {
	$table->cell_border(3);
	} elsif($cell_border eq 'groups') {
	$table->cell_border(4);
	} else {
	$table->cell_border(0);
	}
	}
	if (defined $theme) {
	$table->theme($theme);
}	}
# In the end, however the table width cannot be wider than $textwidth...	if (defined $align) {
	$table->alignment($align);
if ($Apache::londefdef::table[-1]{'width'} > $textwidth) {
$Apache::londefdef::table[-1]{'width'} = $textwidth;
}	}

#table's border	# Missing width is most of page width
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);	if (!(defined $width)) {
unless (defined $border) { $border = 0; }	$width = '70%';
if ($border) {
$Apache::londefdef::table[-1]{'hinc'} = '\hline ';
$Apache::londefdef::table[-1]{'vinc'} = '&';
$Apache::londefdef::table[-1]{'vvinc'} = '\|';
} else {
$Apache::londefdef::table[-1]{'hinc'} = '';
$Apache::londefdef::table[-1]{'vinc'} = '&';
$Apache::londefdef::table[-1]{'vvinc'} = '';
}
if ($#Apache::londefdef::table==0) {
# 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]{'TeXlen'}=[];
$Apache::londefdef::table[-1]{'objectlen'}=[];
$Apache::londefdef::table[-1]{'objectsignal'}=[];
$Apache::londefdef::table[-1]{'maxlen'}=[];
$Apache::londefdef::table[-1]{'minlen'}=[];
$Apache::londefdef::table[-1]{'content'}=[];
$Apache::londefdef::table[-1]{'align'}=[];
if (&is_inside_of($tagstack, 'sup')) {
$currentstring .= '}} \\\\ \ensuremath{^{ ';
}	}
if (&is_inside_of($tagstack, 'sub')) {
$currentstring .= '}} \\\\ \ensuremath{_{ ';	# If a percentage, need to calculate what this means in terms of
	# page width:

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

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

}	}
return $currentstring;	return $currentstring;
Line 2013 sub end_table {	Line 2116 sub end_table {
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {


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

	if (0) {

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

	# Protect against unbalanced </table> tag.

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

for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {	for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {	if ($Apache::londefdef::table[-1]{'TeXlen'}[0][$jn]<$Apache::londefdef::table[-1]{'TeXlen'}[$in][$jn]) {
Line 2035 sub end_table {	Line 2155 sub end_table {
$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];	$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];
}	}
}	}

#boundaries for contents columns	#boundaries for contents columns
my @min_len=();#columns can not be narrower	my @min_len=();#columns can not be narrower
my @max_len=();#maximum length of column	my @max_len=();#maximum length of column
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {	my $avg_max;
	my $avg_min;
	my $counter_cols = $Apache::londefdef::table[-1]{'counter_columns'};
	for (my $jn=0;$jn<=$counter_cols; $jn++) {
my ($localmin,$localmax)=(0,0);	my ($localmin,$localmax)=(0,0);
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) {	if ($localmin<$Apache::londefdef::table[-1]{'minlen'}[$in][$jn]) {
Line 2050 sub end_table {	Line 2174 sub end_table {
}	}
push @min_len, $localmin;	push @min_len, $localmin;
push @max_len, $localmax;	push @max_len, $localmax;
	$avg_max = $localmax + $avg_max;
	$avg_min = $localmin + $avg_min;
}	}
for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {	# Does not really matter what the average max/min are if there are no cols.
	# and this prevents div 0 in that case.

	if ($counter_cols != 0) {
	$avg_max = $avg_max/$counter_cols;
	$avg_min = $avg_min/$counter_cols;
	}


	# I don't think the below is needed.. but just in case:

	if ($avg_min > $avg_max) {
	my $temp = $avg_min;
	$avg_min = $avg_max;
	$avg_max = $temp;
	}


	for (my $jn=0;$jn<=$counter_cols;$jn++) {
my $localmin=0,;	my $localmin=0,;
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {	if ($localmin<$Apache::londefdef::table[-1]{'objectlen'}[$in][$jn]) {
Line 2070 sub end_table {	Line 2214 sub end_table {
$min_len[$jn]=0;	$min_len[$jn]=0;
$max_len[$jn]=0;	$max_len[$jn]=0;
}	}
	# Spans seem to be really bothered by max/min = 0. So if we have one
	# make it an average joe max/min.

	if ($max_len[$jn] == 0) {
	$max_len[$jn] = $avg_max;
	}
	if ($min_len[$jn] == 0) {
	$min_len[$jn] = $avg_min;
	}

}	}
#final adjustment of column width	#final adjustment of column width
my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array	my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
my @adjust=();	my @adjust=();
#step 1. adjustment by maximum value	#step 1. adjustment by maximum value
my $space_neeeded=0;	my $space_needed=0;
for (my $jn=0;$jn<=$#max_len;$jn++) {	for (my $jn=0;$jn<=$#max_len;$jn++) {
$space_neeeded=$space_neeeded+$max_len[$jn];	$space_needed=$space_needed+$max_len[$jn];
}	}
if ($space_neeeded<=$available_space) {	if ($space_needed<=$available_space) {

for (my $jn=0;$jn<=$#max_len;$jn++) {	for (my $jn=0;$jn<=$#max_len;$jn++) {
if ($fwidth[$jn]==0) {	if ($fwidth[$jn]==0) {
$fwidth[$jn]=$max_len[$jn];	$fwidth[$jn]=$max_len[$jn];
Line 2087 sub end_table {	Line 2242 sub end_table {
}	}
} else {	} else {
#step 2. adjustment by minimum value (estimation)	#step 2. adjustment by minimum value (estimation)
$space_neeeded=0;	$space_needed=0;
for (my $jn=0;$jn<=$#min_len;$jn++) {	for (my $jn=0;$jn<=$#min_len;$jn++) {
$space_neeeded+=$min_len[$jn];	$space_needed+=$min_len[$jn];
}	}
if ($space_neeeded>$available_space) {	if ($space_needed>$available_space) {
$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';	$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
for (my $jn=0;$jn<=$#max_len;$jn++) {	for (my $jn=0;$jn<=$#max_len;$jn++) {
if ($fwidth[$jn]==0) {	if ($fwidth[$jn]==0) {
Line 2108 sub end_table {	Line 2263 sub end_table {
}	}
}	}
if ($how_many_to_scale>0) {	if ($how_many_to_scale>0) {
my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale;	my $space_to_adjust=($space_needed-$available_space)/$how_many_to_scale;
foreach my $jn (@to_scale) {	foreach my $jn (@to_scale) {
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/;	$Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/;
Line 2130 sub end_table {	Line 2285 sub end_table {
}	}
} else {	} else {
#step 3. adjustment over minimal + corrections	#step 3. adjustment over minimal + corrections
my $enlarge_coef=$available_space/$space_neeeded;	my $enlarge_coef=$available_space/$space_needed;
my $acsessive=0;	my $acsessive=0;
for (my $jn=0;$jn<=$#min_len;$jn++) {	for (my $jn=0;$jn<=$#min_len;$jn++) {
$adjust[$jn]=$min_len[$jn]*$enlarge_coef;	$adjust[$jn]=$min_len[$jn]*$enlarge_coef;
Line 2138 sub end_table {	Line 2293 sub end_table {
$fwidth[$jn]=$max_len[$jn];	$fwidth[$jn]=$max_len[$jn];
$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];	$acsessive=$acsessive+$adjust[$jn]-$max_len[$jn];
$adjust[$jn]=0;	$adjust[$jn]=0;

}	}
}	}
if ($acsessive>0) {	if ($acsessive>0) {
Line 2162 sub end_table {	Line 2318 sub end_table {
}	}
}	}
}	}
#use all available width if it is defined in % or as TeXwidth	# use all available width or specified width as if not specified,
if (($Apache::londefdef::table[-1]{'percent'}==1) \|\| ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) {	# the specified width gets defaulted to the available width.
my $current=0;
for (my $i=0;$i<=$#fwidth;$i++) {	my $current=0;
$current+=$fwidth[$i];	for (my $i=0;$i<=$#fwidth;$i++) {
}	$current+=$fwidth[$i];
my $coef=$Apache::londefdef::table[-1]{'width'}/$current;	}
for (my $i=0;$i<=$#fwidth;$i++) {	if ($current == 0) {
$fwidth[$i]*=$coef;	$current = $Apache::londefdef::table[-1]{'width'};
}	}
	my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
	for (my $i=0;$i<=$#fwidth;$i++) {
	$fwidth[$i]*=$coef;
}	}
#removing of empty columns if allowed	#removing of empty columns if allowed
my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);	my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
Line 2192 sub end_table {	Line 2351 sub end_table {
$Apache::londefdef::table[-1]{'content'}=\@cleaned_table;	$Apache::londefdef::table[-1]{'content'}=\@cleaned_table;
@fwidth=@cleaned_header;	@fwidth=@cleaned_header;
}	}


#construct header of the table	#construct header of the table
my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
for (my $in=0;$in<=$#fwidth;$in++) {	for (my $in=0;$in<=$#fwidth;$in++) {
$header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'};	$header_of_table.='p{'.$fwidth[$in].' mm}'.$Apache::londefdef::table[-1]{'vvinc'};
}	}
$header_of_table .= '}';	$header_of_table .= '}';

#fill the table	#fill the table
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
my $have_rowspan = 0;	my $have_rowspan = 0;
Line 2208 sub end_table {	Line 2370 sub end_table {
# single rowspan, columspan and combined row/colspans will	# single rowspan, columspan and combined row/colspans will
# work correctly. LaTeX is delicate here.	# work correctly. LaTeX is delicate here.
# RF.	# RF.

# Start a rowspan if necessary:	# Start a rowspan if necessary:

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

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

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

# Rowspan... if colspan is 1, and there's an alignment we'll need	# Rowspan... if colspan is 1, and there's an alignment we'll need
Line 2245 sub end_table {	Line 2414 sub end_table {
if ($rowspan > 1) {	if ($rowspan > 1) {
if ($colspan == 1) {	if ($colspan == 1) {
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {	if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
$output .= '\multicolumn{1}{\|c\|}{';	$output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
$multirow_aligned = 1;	$multirow_aligned = 1;
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
$output .= '\multicolumn{1}{\|r\|}{';	$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
$multirow_aligned = 1;	$multirow_aligned = 1;
}	}
}	}
$have_rowspan++;	$have_rowspan++;
$output .= '\multirow{'.$rowspan.'}[0]{*}{';	if ($multirow_aligned) {
	$output .= '\multirow{'.$rowspan.'}[0]{*}{';
	} else {
	$output .= '\multirow{'.$rowspan."}[0]{$spanwidth mm}{";
	}

$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~	$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
s{^\s\\par\s}{};	s{^\s\\par\s}{};
$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~	$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~
s{\s\\vskip\s0pt\s*$}{};	s{\s\\vskip\s0pt\s*$}{};

#	#
# If we did not throw in a multicolumn to align, then add	# If we did not throw in a multicolumn to align, then add
# an extra {	# an extra {
Line 2273 sub end_table {	Line 2446 sub end_table {
if (($rowspan eq '^') \|\| ($rowspan eq '_')) {	if (($rowspan eq '^') \|\| ($rowspan eq '_')) {
$have_rowspan++;	$have_rowspan++;
}	}
#--------------------------------------------------------------	#--------------------------------------------------------------


# For right and center alignment of single cells.	# For right and center alignment of single cells.
Line 2281 sub end_table {	Line 2454 sub end_table {
#	#
if ($colspan == 1 && $rowspan == 1) {	if ($colspan == 1 && $rowspan == 1) {
if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {	if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
$output .= '\multicolumn{1}{\|c\|}{';	$output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {	} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
$output .= '\multicolumn{1}{\|r\|}{';	$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
}	}
}	}

Line 2367 sub end_table {	Line 2540 sub end_table {
pop @Apache::londefdef::table;	pop @Apache::londefdef::table;
undef @Apache::londefdef::table;	undef @Apache::londefdef::table;
}	}
	}
	&enable_para();
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 2378 sub start_tr {	Line 2554 sub start_tr {
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {

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

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

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

	if (0) {
$Apache::londefdef::table[-1]{'row_number'}++;	$Apache::londefdef::table[-1]{'row_number'}++;
my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);	my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
if ($alignchar ne '') {	if ($alignchar ne '') {
Line 2396 sub start_tr {	Line 2585 sub start_tr {
push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];	push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];
push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];	push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
push @ {$Apache::londefdef::table[-1]{'content'}}, [];	push @ {$Apache::londefdef::table[-1]{'content'}}, [];
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 2406 sub end_tr {	Line 2596 sub end_tr {
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {

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

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

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

	if (0) {
if ($Apache::londefdef::TD_redirection) {	if ($Apache::londefdef::TD_redirection) {
&end_td_tex($parstack,$parser,$safeeval);	&end_td_tex($parstack,$parser,$safeeval);
}	}
Line 2414 sub end_tr {	Line 2617 sub end_tr {
if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) {	if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) {
$Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'};	$Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'};
}	}
	}


}	}
Line 2450 sub tag_check {	Line 2653 sub tag_check {
}	}
return '';	return '';
}	}

	#
	# Factor out cell configuration hash generation:
	#

	sub cell_config_hash {
	my ($align, $rowspan, $colspan, $width) = @_;
	if ($rowspan ne '') {
	$rowspan =~ s/^\s+\|\s+$//g;
	}
	if ($colspan ne '') {
	$colspan =~ s/^\s+\|\s+$//g;
	}
	my %config;
	if ($align ne '') {
	$config{'halign'} = $align;
	}
	if (($colspan =~ /^\d+$/) && ($colspan > 0)) {
	$config{'colspan'} = $colspan;
	}
	if (($rowspan =~ /^\d+$/) && ($rowspan > 0)) {
	$config{'rowspan'} = $rowspan;
	}
	if ($width ne '') {
	$config{'width'} = $width;
	}
	return \%config;
	}

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

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

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


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

	if (0) {

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

sub end_td_tex {	sub end_td_tex {

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

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

	if (0) {
my ($parstack,$parser,$safeeval) = @_;	my ($parstack,$parser,$safeeval) = @_;
my $current_row = $Apache::londefdef::table[-1]{'row_number'};	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
my $current_column = $Apache::londefdef::table[-1]{'counter_columns'};	my $current_column = $Apache::londefdef::table[-1]{'counter_columns'};
Line 2518 sub end_td_tex {	Line 2782 sub end_td_tex {

my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);	my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
if (defined $TeXwidth) {	if (defined $TeXwidth) {
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	for (my $c = 0; $c < $colspan; $c++) {
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	}
} else {	} else {
if (($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt))/) or ($data=~m/\[(\d+\.?\d)\s*mm\]/)) {	if (($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt))/) or ($data=~m/\[(\d+\.?\d)\s*mm\]/)) {
my $garbage_data=$data;	my $garbage_data=$data;
Line 2536 sub end_td_tex {	Line 2802 sub end_td_tex {
if ($fwidth<$current_length) {$fwidth=$current_length;}	if ($fwidth<$current_length) {$fwidth=$current_length;}
$garbage_data=~s/\[(\d+\.?\d)\smm\]//;	$garbage_data=~s/\[(\d+\.?\d)\smm\]//;
}	}
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	for (my $c = 0; $c < $colspan; $c++) {
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	}
} elsif ($data=~/\\parbox\{\s\d+\.?\d\s(mm\|cm\|in\|pc\|pt)\s\}/ or $data=~/\\epsfxsize\s=\s\d+\.?\d\s(mm\|cm\|in\|pc\|pt)/) {	} elsif ($data=~/\\parbox\{\s\d+\.?\d\s(mm\|cm\|in\|pc\|pt)\s\}/ or $data=~/\\epsfxsize\s=\s\d+\.?\d\s(mm\|cm\|in\|pc\|pt)/) {
my $garbage_data=$data;	my $garbage_data=$data;
my $fwidth=0;	my $fwidth=0;
Line 2555 sub end_td_tex {	Line 2823 sub end_td_tex {
if ($fwidth<$1) {$fwidth=$1;}	if ($fwidth<$1) {$fwidth=$1;}
$garbage_data=~s/\\epsfxsize\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)//;	$garbage_data=~s/\\epsfxsize\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)//;
}	}
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	for (my $c = 0; $c < $colspan; $c++) {
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
	}
$data=~s/\\\\\s*$//;	$data=~s/\\\\\s*$//;
} else {	} else {
$data=~s/^\s+(\S.*)/$1/;	$data=~s/^\s+(\S.*)/$1/;
Line 2586 sub end_td_tex {	Line 2856 sub end_td_tex {
if ($min_length<$lengthword) {$min_length=$lengthword;}	if ($min_length<$lengthword) {$min_length=$lengthword;}
}	}
}	}
push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	for (my $c = 0; $c < $colspan; $c++) {
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';	push @ {$Apache::londefdef::table[-1]{'TeXlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;	push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;	push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;
	push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
	}
}	}
}	}
# Substitute all of the tables nested in this cell in their appropriate places.	# Substitute all of the tables nested in this cell in their appropriate places.
Line 2626 sub end_td_tex {	Line 2898 sub end_td_tex {

}	}

	}

return '';	return '';
}	}
Line 2675 sub tagg_check {	Line 2947 sub tagg_check {

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

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

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

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

	if (0) {


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

	# Accept xml until the </th> tag.

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

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

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

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

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

Line 2858 sub start_img {	Line 3163 sub start_img {

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

#if original gif/jpg/png file exist do following:	#if original bmp/gif/jpg/png file exist do following:
my $origsrc=$src;	my $origsrc=$src;
my ($path,$file) = &get_eps_image($src);	my ($path,$file) = &get_eps_image($src);
# &Apache::lonnet::logthis("Image source: $src result: $path $file");	# &Apache::lonnet::logthis("Image source: $src result: $path $file");
Line 2879 sub start_img {	Line 3184 sub start_img {
$size=~s/,$/]/;	$size=~s/,$/]/;
$currentstring .= '\graphicspath{{'.$path.'}}'	$currentstring .= '\graphicspath{{'.$path.'}}'
.'\includegraphics'.$size.'{'.$file.'} ';	.'\includegraphics'.$size.'{'.$file.'} ';
$currentstring = &align_latex_image($align, $latex_rendering,	my $closure;
$currentstring,	($currentstring, $closure) = &align_latex_image($align,
$width_param, $height_param);	$latex_rendering,
	$currentstring,
	$width_param,
	$height_param);
	$currentstring .= $closure;

} else {	} else {
&Apache::lonxml::debug("$src does not exist");	&Apache::lonxml::debug("$src does not exist");
Line 2898 sub start_img {	Line 3207 sub start_img {
# And here's where the semi-quote breaks down: allow the user	# And here's where the semi-quote breaks down: allow the user
# to edit the beast as well by rendering the problem for edit:	# to edit the beast as well by rendering the problem for edit:
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
	my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
$currentstring .=&Apache::edit::tag_start($target,$token);	$currentstring .=&Apache::edit::tag_start($target,$token);
$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).	$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
&Apache::edit::browse('src',undef,'alt').' '.	&Apache::edit::browse('src',undef,'alt',$only).' '.
&Apache::edit::search('src',undef,'alt').'<br />';	&Apache::edit::search('src',undef,'alt').'<br />';
$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';	$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);	$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
Line 2911 sub start_img {	Line 3221 sub start_img {
['','bottom','middle','top','left','right'],$token,5);	['','bottom','middle','top','left','right'],$token,5);
$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',	$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap',
['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);	['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
	my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval);
	my $enc= &Apache::lonxml::get_param('encrypturl',$parstack,$safeeval);

$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',	$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
['no','yes'], $token, 2);	['no','yes'], $token, 2);
	if (($alt=~/\S/) && (lc($enc) eq 'yes')) {
	$currentstring.='<br /><span class="LC_warning">'.&mt('Warning: the description "[_1]" will be available, even for encrypted URL',$alt).'</span><br />';
	}
$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 $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);	my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);	my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);

	if ($token->[2]{'src'}=~/\$/) {
$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';	$currentstring.=&mt('Variable image source');
if ($width) { $currentstring.=' width="'.$width.'" '; }	} elsif ($token->[2]{'src'}=~/\S/) {
if ($height) { $currentstring.=' height="'.$height.'" '; }	$currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
$currentstring .= ' />';	if ($width) { $currentstring.=' width="'.$width.'" '; }
	if ($height) { $currentstring.=' height="'.$height.'" '; }
	$currentstring .= ' />';
	} else {
	$currentstring.=&mt("No image source specified");
	}
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my ($osrc,$owidth,$oheight)=	my ($osrc,$owidth,$oheight)=
($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});	($token->[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
Line 2992 sub start_applet {	Line 3312 sub start_applet {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
if ($env{'browser.appletsuppress'} ne 'on') {	if ($env{'browser.appletsuppress'} ne 'on') {
$currentstring = &Apache::lonenc::encrypt_ref($token,	$currentstring = $token->[4];
{'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 3006 sub start_applet {	Line 3323 sub start_applet {
$currentstring='[APPLET: '.$alttag.']';	$currentstring='[APPLET: '.$alttag.']';
}	}
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	# Turn off some stuff we can't be inside thank you LaTeX


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

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

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

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

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

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

	if ($restart_sub) {
	$currentstring .= &start_sub($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
	if ($restart_sup) {
	$currentstring .= &start_sup($target, $token, $tagstack,
	$parstack, $parser, $safeeval);
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 3137 sub start_frameset {	Line 3488 sub start_frameset {
&Apache::loncommon::start_page($Apache::londefdef::title,	&Apache::loncommon::start_page($Apache::londefdef::title,
$Apache::londefdef::head,	$Apache::londefdef::head,
{'add_entries' => $token->[2],	{'add_entries' => $token->[2],
'no_title' => 1,	# 'no_title' => 1,
'force_register' => 1,	'force_register' => 1,
'frameset' => 1,});	'frameset' => 1,});

Line 3479 sub end_col {	Line 3830 sub end_col {

#-- <colgroup> tag (end tag optional)	#-- <colgroup> tag (end tag optional)
sub start_colgroup {	sub start_colgroup {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
	if ($target eq 'tex') {
	# TODO: Ensure this tag is in a table:

	# Fetch the attributes and build the hash for the
	# call to define_colgroup.

	my $span = &Apache::lonxml::get_param('span', $parstack, $safeeval);
	my $halign = &Apache::lonxml::get_param('halign', $parstack, $safeeval);

	my %colgroup_params;
	if ($span ne '') {
	$colgroup_params{'span'} = $span;
	}
	if ($halign ne '') {
	$colgroup_params{'halign'} = $halign;
	}

	my $table = $Apache::londefdef::table[-1];
	$table->define_colgroup(\%colgroup_params);

	}
return $currentstring;	return $currentstring;
}	}

Line 3969 sub start_tbody {	Line 4341 sub start_tbody {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
	}
	if ($target eq 'tex') {
	# TODO: Ensure this tag is within a table:

	my $table = $Apache::londefdef::table[-1];
	$table->start_body();
}	}
return $currentstring;	return $currentstring;
}	}
Line 3978 sub end_tbody {	Line 4356 sub end_tbody {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
	}
	if($target eq 'tex') {
	# TODO: Ensure this tag is within a table:

	my $table = $Apache::londefdef::table[-1];
	$table->end_body();
}	}
return $currentstring;	return $currentstring;
}	}
Line 3988 sub start_tfoot {	Line 4372 sub start_tfoot {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
	}
	if ($target eq 'tex') {
	# TODO: ensure this is within a table tag.
	my $table = $Apache::londefdef::table[-1];
	$table->start_foot();
}	}
return $currentstring;	return $currentstring;
}	}
Line 3997 sub end_tfoot {	Line 4386 sub end_tfoot {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
	}
	if ($target eq 'tex') {
	# TODO: Ensure this is in side a table
	my $table = $Apache::londefdef::table[-1];
	$table->end_foot();
}	}
return $currentstring;	return $currentstring;
}	}
Line 4007 sub start_thead {	Line 4401 sub start_thead {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[4];	$currentstring = $token->[4];
	}
	if ($target eq 'tex') {
	# Assume we're in a table... TODO: Verify that and ignore tag if not.
	my $table = $Apache::londefdef::table[-1];
	$table->start_head();
}	}
return $currentstring;	return $currentstring;
}	}
Line 4016 sub end_thead {	Line 4415 sub end_thead {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring = $token->[2];	$currentstring = $token->[2];
	}
	if ($target eq 'tex') {
	# TODO: Verify we are in a table and ignore tag if not.

	my $table = $Apache::londefdef::table[-1];
	$table->end_head();
}	}
return $currentstring;	return $currentstring;
}	}
Line 4094 sub image_replication {	Line 4499 sub image_replication {
}	}
return '';	return '';
}	}
#
# Get correct sizing parameter for an image given
# it's initial ht. and wid. This allows sizing of
# images that are generated on-the-fly (e.g. gnuplot)
# as well as serving as a utility for image_size.
#
# Parameter:
# height_param
# width_param - Initial picture dimensions.
# scaling - A scale factor.
# parstack, - the current stack of tag attributes
# from the xml parser
# safeeval, - pointer to the safespace
# depth, - from what level in the stack to look for attributes
# (assumes -1 if unspecified)
# cis - look for attrubutes case insensitively
# (assumes false)
#
# Returns:
# height, width - new dimensions.
#
sub resize_image {	sub resize_image {
my ($height_param, $width_param, $scaling,	my ($height_param, $width_param, $scaling,
$parstack, $safeeval, $depth, $cis) = @_;	$parstack, $safeeval, $depth, $cis) = @_;
Line 4217 sub get_eps_image {	Line 4604 sub get_eps_image {
&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.	&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
}	}
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src");	&Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
my ($spath, $sname, $sext) = &fileparse($src, qr/\.(gif\|png\|jpg\|jpeg)/i);	my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp\|gif\|png\|jpg\|jpeg)/i);
$src=~s/\.(gif\|png\|jpg\|jpeg)$/\.eps/i;	$src=~s/\.(bmp\|gif\|png\|jpg\|jpeg)$/\.eps/i;
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
&Apache::lonxml::debug("Filelocation gives: $src");	&Apache::lonxml::debug("Filelocation gives: $src");
if (! -e $src) {	if (! -e $src) {
Line 4279 sub eps_generation {	Line 4666 sub eps_generation {
my $temp_file = Apache::File->new('>>'.$filename);	my $temp_file = Apache::File->new('>>'.$filename);
print $temp_file "$src\n";	print $temp_file "$src\n";
my $newsrc = $src;	my $newsrc = $src;
$newsrc =~ s/(\.gif\|\.jpg\|\.jpeg)$/\.eps/i;	$newsrc =~ s/(\.bmp\|\.gif\|\.jpg\|\.jpeg)$/\.eps/i;
$newsrc=~s{/home/httpd/html/res}{};	$newsrc=~s{/home/httpd/html/res}{};
$newsrc=~s{/home/($LONCAPA::username_re)/public_html/}{/$1/};	$newsrc=~s{/home/($LONCAPA::username_re)/public_html/}{/$1/};
$newsrc=~s{/\./}{/};	$newsrc=~s{/\./}{/};
Line 4304 sub file_path {	Line 4691 sub file_path {
}	}
return $file,$path;	return $file,$path;
}	}
# Converts a measurement in to mm from any of
# the other valid LaTeX units of measure.
# If the units of measure are missing from the
# parameter, it is assumed to be in and returned
# with mm units of measure
sub recalc {	sub recalc {
my $argument = shift;	my $argument = shift;
if (not $argument=~/(mm\|cm\|in\|pc\|pt)/) {return $argument.' mm';}	if (not $argument=~/(mm\|cm\|in\|pc\|pt)/) {return $argument.' mm';}
Line 4352 sub LATEX_length {	Line 4736 sub LATEX_length {
return $value;	return $value;
}	}

# Wrap image 'stuff' inside of the LaTeX required to implement
# alignment:
# align_tex_image(align, latex_rendering, image)
# Where:
# align - The HTML alignment specification.
# latex_rendering - rendering hint for latex.
# image - The LaTeX needed to insert the image itsef.
# width,height - dimensions of the image.
#
sub align_latex_image {	sub align_latex_image {
my ($align, $latex_rendering, $image, $width, $height) = @_;	my ($align, $latex_rendering, $image, $width, $height) = @_;
my $currentstring; # The result.	my $currentstring; # The 1/2 wrapped image.
	my $closure; # The closure of the wrappage.

	# if it's none just return it back
	if ($latex_rendering eq 'none') {
	return ($image,'');
	}

# If there's an alignment specification we need to honor it here.	# If there's an alignment specification we need to honor it here.
# For the horizontal alignments, we will also honor the	# For the horizontal alignments, we will also honor the
# value of the latex specfication. The default is parbox,	# value of the latex specfication. The default is parbox,
Line 4373 sub align_latex_image {	Line 4755 sub align_latex_image {
# Even though we set a default alignment value, the user	# Even though we set a default alignment value, the user
# could have given us an illegal value. In that case we	# could have given us an illegal value. In that case we
# just use the default alignment of bottom..	# just use the default alignment of bottom..
	$currentstring = '';
if ($align eq "top") {	if ($align eq "top") {
$currentstring = '\raisebox{-'.$height.'mm}{'.$image.'}';	$currentstring .= '\raisebox{-'.$height.'mm}{'.$image;
	$closure = '}';
} elsif (($align eq "center") \|\| ($align eq "middle")) { # Being kind	} elsif (($align eq "center") \|\| ($align eq "middle")) { # Being kind
my $offset = $height/2;	my $offset = $height/2;
$currentstring = '\raisebox{-'.$offset.'mm}{'.$image.'}';	$currentstring .= '\raisebox{-'.$offset.'mm}{'.$image;
	$closure = '}';
} elsif ($align eq "left") {	} elsif ($align eq "left") {
if ($latex_rendering eq "parpic") {	if ($latex_rendering eq "parpic") {
$currentstring = '\parpic[l]{'.$image.'}';	$currentstring .= '\parpic[l]{'.$image;
	$closure = '}';
} elsif ($latex_rendering eq "parbox") {	} elsif ($latex_rendering eq "parbox") {
$currentstring = '\begin{minipage}[l]{'.$width.'mm}'	$currentstring .= '\begin{minipage}[l]{'.$width.'mm}'
.$image.'\end{minipage}';	.$image;
	$closure = '\end{minipage}';
} elsif ($latex_rendering eq "wrapfigure"	} elsif ($latex_rendering eq "wrapfigure"
\|\| $latex_rendering ne 'none') { # wrapfig render	\|\| $latex_rendering ne 'none') { # wrapfig render
$currentstring =	$currentstring .=
'\begin{wrapfigure}{l}{'.$width.'mm}'	'\begin{wrapfigure}{l}{'.$width.'mm}'
.'\scalebox{1.0}{'.$image.'}\end{wrapfigure}';	.'\scalebox{1.0}{'.$image;
	$closure = '}\end{wrapfigure}';
}	}
} elsif ($align eq "right") {	} elsif ($align eq "right") {
if ($latex_rendering eq "parpic") {	if ($latex_rendering eq "parpic") {
$currentstring = '\parpic[r]{'.$image.'}';	$currentstring .= '\parpic[r]{'.$image;
	$closure = '}';
} elsif ($latex_rendering eq "parbox") {	} elsif ($latex_rendering eq "parbox") {
$currentstring = '\begin{minipage}[r]{'.$width.'mm}'	$currentstring .= '\begin{minipage}[r]{'.$width.'mm}'
.$image.'\end{minipage}';	.$image;
	$closure = '\end{minipage}';
} elsif ($latex_rendering eq "wrapfigure"	} elsif ($latex_rendering eq "wrapfigure"
\|\| $latex_rendering ne 'none') { # wrapfig render	\|\| $latex_rendering ne 'none') { # wrapfig render
$currentstring =	$currentstring .=
'\begin{wrapfigure}{r}{'.$width.'mm}'	'\begin{wrapfigure}{r}{'.$width.'mm}'
.'\scalebox{1.0}{'.$image.'}\end{wrapfigure}';	.'\scalebox{1.0}{'.$image;
	$closure = '}\end{wrapfigure}';
}	}
} else { # Bottom is also default.	} else { # Bottom is also default.
# $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}';	# $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}';
$currentstring = $image;	$currentstring .= "{$image";
	$closure = '}';
}	}
return $currentstring;	return ($currentstring, $closure);
}	}

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


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

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

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

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

	return $currentstring;

	}

	=pod

	=head1 NAME

	Apache::londefdef.pm

	=head1 SYNOPSIS

	Tags Default Definition Module

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


	=head1 NOTABLE SUBROUTINES

	=over

	=item start_hideweboutput()

	=item end_hideweboutput()

	=item image_replication()

	=item resize_image()

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

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

	Returns:
	height, width - new dimensions.

	=item image_size()

	=item image_width()

	=item image_height()

	=item get_eps_image()

	=item eps_generation()

	=item file_path()

	=item recalc()

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

	=item LATEX_length()

	=item align_latex_image()

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


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



	=back

	=cut


1;	1;
__END__	__END__

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

Removed from v.1.353
changed lines
	Added in v.1.415.4.6