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.123 and 1.142

version 1.123, 2003/03/19 16:50:14	version 1.142, 2003/06/19 19:15:59
Line 46 package Apache::londefdef;	Line 46 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();
use Image::Magick;	use Image::Magick;
use Apache::lonmenu();	use Apache::lonmenu();
Line 54 use Apache::lonmeta();	Line 54 use Apache::lonmeta();

BEGIN {	BEGIN {

&Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr'));	&Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr','hideweboutput'));

}	}

Line 158 sub start_html {	Line 158 sub start_html {
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
@Apache::londefdef::table = ();	@Apache::londefdef::table = ();
$currentstring .= '\documentclass[letterpaper]{article}	$currentstring .= '\documentclass[letterpaper]{article}
	\batchmode
\newcommand{\keephidden}[1]{}	\newcommand{\keephidden}[1]{}
\renewcommand{\deg}{$^{\circ}$}	\renewcommand{\deg}{$^{\circ}$}
\usepackage{textcomp}	\usepackage{textcomp}
Line 354 sub start_meta {	Line 355 sub start_meta {
} else {	} else {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
}	} elsif ($target eq 'meta') {
if ($target eq 'meta') {
unless (&Apache::lonxml::get_param	unless (&Apache::lonxml::get_param
('http-equiv',$parstack,$safeeval,undef,1)) {	('http-equiv',$parstack,$safeeval,undef,1)) {
my $name=$token->[2]->{'name'};	my $name=$token->[2]->{'name'};
Line 366 sub start_meta {	Line 366 sub start_meta {
$currentstring='<'.$name.'>'.	$currentstring='<'.$name.'>'.
&Apache::lonxml::get_param	&Apache::lonxml::get_param
('content',$parstack,$safeeval,undef,1).	('content',$parstack,$safeeval,undef,1).
'</'.$name.'>';	'</'.$name.'>';
}	}
}	}
	} elsif ($target eq 'tex') {
	&Apache::lonxml::startredirection();
}	}
return $currentstring;	return $currentstring;
}	}
Line 382 sub end_meta {	Line 384 sub end_meta {
if ($args ne '') {	if ($args ne '') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
}	} elsif ($target eq 'tex') {
	$currentstring=&Apache::lonxml::endredirection();
	$currentstring='';
	}
return $currentstring;	return $currentstring;
}	}

Line 573 sub end_strong {	Line 578 sub end_strong {

#-- <h1> tag	#-- <h1> tag
sub start_h1 {	sub start_h1 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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 .= '{\large \textbf{';	my $pre;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$pre='\begin{center}';
	} elsif ($align eq 'left') {
	$pre='\rlap{';
	} elsif ($align eq 'right') {
	$pre=' \hfill \llap{';
	}
	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
	if (not defined $TeXsize) {$TeXsize="large";}
	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';
} elsif ($target eq 'meta') {	} elsif ($target eq 'meta') {
$currentstring='<subject>';	$currentstring='<subject>';
&start_output();	&start_output();
Line 587 sub start_h1 {	Line 603 sub start_h1 {
}	}

sub end_h1 {	sub end_h1 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}}';	my $post;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$post='\end{center}';
	} elsif ($align eq 'left') {
	$post='} \hfill'.'\vskip 0 mm ';
	} elsif ($align eq 'right') {
	$post='}'.'\vskip 0 mm ';
	}
	$currentstring .= '}}'.$post;
} elsif ($target eq 'meta') {	} elsif ($target eq 'meta') {
&end_output();	&end_output();
$currentstring='</subject>';	$currentstring='</subject>';
Line 602 sub end_h1 {	Line 627 sub end_h1 {

#-- <h2> tag	#-- <h2> tag
sub start_h2 {	sub start_h2 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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 .= '{\large \textbf{';	my $pre;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$pre='\begin{center}';
	} elsif ($align eq 'left') {
	$pre='\rlap{';
	} elsif ($align eq 'right') {
	$pre=' \hfill \llap{';
	}
	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
	if (not defined $TeXsize) {$TeXsize="large";}
	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}

sub end_h2 {	sub end_h2 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}}';	my $post;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$post='\end{center}';
	} elsif ($align eq 'left') {
	$post='} \hfill'.'\vskip 0 mm ';
	} elsif ($align eq 'right') {
	$post='}'.'\vskip 0 mm ';
	}
	$currentstring .= '}}'.$post;
}	}
return $currentstring;	return $currentstring;
}	}

#-- <h3> tag	#-- <h3> tag
sub start_h3 {	sub start_h3 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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 .= '{\large \textbf{';	my $pre;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$pre='\begin{center}';
	} elsif ($align eq 'left') {
	$pre='\rlap{';
	} elsif ($align eq 'right') {
	$pre=' \hfill \llap{';
	}
	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
	if (not defined $TeXsize) {$TeXsize="large";}
	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}

sub end_h3 {	sub end_h3 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}}';	my $post;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$post='\end{center}';
	} elsif ($align eq 'left') {
	$post='} \hfill'.'\vskip 0 mm ';
	} elsif ($align eq 'right') {
	$post='}'.'\vskip 0 mm ';
	}
	$currentstring .= '}}'.$post;
}	}
return $currentstring;	return $currentstring;
}	}

#-- <h4> tag	#-- <h4> tag
sub start_h4 {	sub start_h4 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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 .= '{\large \textbf{';	my $pre;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$pre='\begin{center}';
	} elsif ($align eq 'left') {
	$pre='\rlap{';
	} elsif ($align eq 'right') {
	$pre=' \hfill \llap{';
	}
	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
	if (not defined $TeXsize) {$TeXsize="large";}
	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}

sub end_h4 {	sub end_h4 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}}';	my $post;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$post='\end{center}';
	} elsif ($align eq 'left') {
	$post='} \hfill'.'\vskip 0 mm ';
	} elsif ($align eq 'right') {
	$post='}'.'\vskip 0 mm ';
	}
	$currentstring .= '}}'.$post;
}	}
return $currentstring;	return $currentstring;
}	}

#-- <h5> tag	#-- <h5> tag
sub start_h5 {	sub start_h5 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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 .= '{\large \textbf{';	my $pre;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$pre='\begin{center}';
	} elsif ($align eq 'left') {
	$pre='\rlap{';
	} elsif ($align eq 'right') {
	$pre=' \hfill \llap{';
	}
	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
	if (not defined $TeXsize) {$TeXsize="large";}
	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}

sub end_h5 {	sub end_h5 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}}';	my $post;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$post='\end{center}';
	} elsif ($align eq 'left') {
	$post='} \hfill'.'\vskip 0 mm ';
	} elsif ($align eq 'right') {
	$post='}'.'\vskip 0 mm ';
	}
	$currentstring .= '}}'.$post;
}	}
return $currentstring;	return $currentstring;
}	}

#-- <h6> tag	#-- <h6> tag
sub start_h6 {	sub start_h6 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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 .= '{\large \textbf{';	my $pre;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$pre='\begin{center}';
	} elsif ($align eq 'left') {
	$pre='\rlap{';
	} elsif ($align eq 'right') {
	$pre=' \hfill \llap{';
	}
	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
	if (not defined $TeXsize) {$TeXsize="large";}
	$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';
}	}
return $currentstring;	return $currentstring;
}	}

sub end_h6 {	sub end_h6 {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '}}';	my $post;
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$post='\end{center}';
	} elsif ($align eq 'left') {
	$post='} \hfill'.'\vskip 0 mm ';
	} elsif ($align eq 'right') {
	$post='}'.'\vskip 0 mm ';
	}
	$currentstring .= '}}'.$post;
}	}
return $currentstring;	return $currentstring;
}	}
Line 1013 sub start_big {	Line 1138 sub start_big {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\large{';	$currentstring .= '{\large ';
} elsif ($target eq 'latexsource') {	} elsif ($target eq 'latexsource') {
$currentstring .= '{\Large ';	$currentstring .= '{\Large ';
}	}
Line 1062 sub end_small {	Line 1187 sub end_small {

#-- <basefont> tag	#-- <basefont> tag
sub start_basefont {	sub start_basefont {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	} elsif ($target eq 'tex') {
	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
	if (defined $basesize) {
	$currentstring = '{\\'.$basesize.' ';
	}
	}
return $currentstring;	return $currentstring;
}	}

sub end_basefont {	sub end_basefont {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	} elsif ($target eq 'tex') {
	my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
	if (defined $basesize) {
	$currentstring = '}';
	}
	}
return $currentstring;	return $currentstring;
}	}

Line 1087 sub start_font {	Line 1222 sub start_font {
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode++;}	if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode++;}
$currentstring = $token->[4];	$currentstring = $token->[4];
}	} elsif ($target eq 'tex') {
	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
	if (defined $fontsize) {
	$currentstring = '{\\'.$fontsize.' ';
	}
	}
return $currentstring;	return $currentstring;
}	}

Line 1098 sub end_font {	Line 1238 sub end_font {
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);	my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode--;}	if ($face=~/symbol/i) {$Apache::lonxml::prevent_entity_encode--;}
$currentstring = $token->[2];	$currentstring = $token->[2];
}	} elsif ($target eq 'tex') {
	my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
	if (defined $fontsize) {
	$currentstring = '}';
	}
	}
return $currentstring;	return $currentstring;
}	}

Line 1202 sub end_sup {	Line 1347 sub end_sup {

#-- <hr> tag	#-- <hr> tag
sub start_hr {	sub start_hr {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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 .= '\vskip 0 mm \noindent\makebox[\textwidth/2 ][b]{\hrulefill}\vskip 0 mm ';	my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,0);
	if (defined $LaTeXwidth) {
	if ($LaTeXwidth=~/^%/) {
	substr($LaTeXwidth,0,1)='';
	$LaTeXwidth=($LaTeXwidth/100).'\textwidth';
	}
	} else {
	$LaTeXwidth ='0.95\textwidth';
	}
	my ($pre,$post);
	my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
	if (($align eq 'center') \|\| (not defined $align)) {
	$pre=''; $post='';
	} elsif ($align eq 'left') {
	$pre='\rlap{'; $post='} \hfill';
	} elsif ($align eq 'right') {
	$pre=' \hfill \llap{'; $post='}';
	}
	$currentstring .= ' \vskip 0 mm \noindent\makebox[\textwidth]{'.$pre.'\makebox['.
	$LaTeXwidth.'][b]{\hrulefill}'.$post.'}\vskip 0 mm ';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1329 sub end_u {	Line 1493 sub end_u {

#-- <ul> tag	#-- <ul> tag
sub start_ul {	sub start_ul {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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 = '\begin{itemize}';	my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
	if ($TeXtype eq 'disc') {
	$currentstring .= ' \renewcommand{\labelitemi}{$\bullet$}
	\renewcommand{\labelitemii}{$\bullet$}
	\renewcommand{\labelitemiii}{$\bullet$}
	\renewcommand{\labelitemiv}{$\bullet$}';
	} elsif ($TeXtype eq 'circle') {
	$currentstring .= ' \renewcommand{\labelitemi}{$\circ$}
	\renewcommand{\labelitemii}{$\circ$}
	\renewcommand{\labelitemiii}{$\circ$}
	\renewcommand{\labelitemiv}{$\circ$}';
	} elsif ($TeXtype eq 'square') {
	$currentstring .= ' \renewcommand{\labelitemi}{$\diamond$}
	\renewcommand{\labelitemii}{$\diamond$}
	\renewcommand{\labelitemiii}{$\diamond$}
	\renewcommand{\labelitemiv}{$\diamond$}';
	}
	$currentstring .= '\begin{itemize}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1345 sub end_ul {	Line 1526 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}';	$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}
	\renewcommand{\labelitemii}{$\bullet$}
	\renewcommand{\labelitemiii}{$\bullet$}
	\renewcommand{\labelitemiv}{$\bullet$}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1398 sub end_dir {	Line 1582 sub end_dir {

#-- <ol> tag	#-- <ol> tag
sub start_ol {	sub start_ol {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
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 = '\begin{enumerate}';	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
	if ($type eq '1') {
	$currentstring .= ' \renewcommand{\labelenumi}{\arabic{enumi}.}
	\renewcommand{\labelenumii}{\arabic{enumii}.}
	\renewcommand{\labelenumiii}{\arabic{enumiii}.}
	\renewcommand{\labelenumiv}{\arabic{enumiv}.}';
	} elsif ($type eq 'A') {
	$currentstring .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
	\renewcommand{\labelenumii}{\Alph{enumii}.}
	\renewcommand{\labelenumiii}{\Alph{enumiii}.}
	\renewcommand{\labelenumiv}{\Alph{enumiv}.}';
	} elsif ($type eq 'a') {
	$currentstring .= ' \renewcommand{\labelenumi}{\alph{enumi}.}
	\renewcommand{\labelenumii}{\alph{enumii}.}
	\renewcommand{\labelenumiii}{\alph{enumiii}.}
	\renewcommand{\labelenumiv}{\alph{enumiv}.} ';
	} elsif ($type eq 'i') {
	$currentstring .= ' \renewcommand{\labelenumi}{\roman{enumi}.}
	\renewcommand{\labelenumii}{\roman{enumii}.}
	\renewcommand{\labelenumiii}{\roman{enumiii}.}
	\renewcommand{\labelenumiv}{\roman{enumiv}.} ';
	} elsif ($type eq 'I') {
	$currentstring .= ' \renewcommand{\labelenumi}{\Roman{enumi}.}
	\renewcommand{\labelenumii}{\Roman{enumii}.}
	\renewcommand{\labelenumiii}{\Roman{enumiii}.}
	\renewcommand{\labelenumiv}{\Roman{enumiv}.} ';
	}
	$currentstring .= '\begin{enumerate}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1414 sub end_ol {	Line 1625 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}';	$currentstring = '\end{enumerate} \renewcommand{\labelenumi}{\arabic{enumi}.}
	\renewcommand{\labelenumii}{\arabic{enumii}.}
	\renewcommand{\labelenumiii}{\arabic{enumiii}.}
	\renewcommand{\labelenumiv}{\arabic{enumiv}.}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1487 sub end_dd {	Line 1701 sub end_dd {
#-- <table> tag	#-- <table> tag
sub start_table {	sub start_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
	my $textwidth='';
	if (not defined @Apache::londefdef::table) {
	$textwidth=&recalc($ENV{'form.textwidth'});
	$textwidth=~/(\d+\.?\d*)/;
	$textwidth=0.95*$1;
	} else {
	$textwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
	}
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
Line 1494 sub start_table {	Line 1716 sub start_table {
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;
$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';	#table's width
	my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
	if (not defined $TeXwidth) {
	my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1);
	if ($htmlwidth=~/%/) {
	$htmlwidth=~/(\d+)/;
	my $value=$1*$textwidth/100;
	$Apache::londefdef::table[-1]{'width'}=$value;
	} else {
	$Apache::londefdef::table[-1]{'width'}=$textwidth;
	}
	} elsif ($TeXwidth=~/%/) {
	$TeXwidth=~/(\d+)/;
	my $value=$1*$textwidth/100;
	$Apache::londefdef::table[-1]{'width'}=$value;
	} else {
	$Apache::londefdef::table[-1]{'width'}=$textwidth;
	}
	#table's border
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1);	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1);
unless (defined $border) { $border = 0; }	unless (defined $border) { $border = 0; }
if ($border) {	if ($border) {
Line 1506 sub start_table {	Line 1746 sub start_table {
$Apache::londefdef::table[-1]{'vinc'} = '&';	$Apache::londefdef::table[-1]{'vinc'} = '&';
$Apache::londefdef::table[-1]{'vvinc'} = '';	$Apache::londefdef::table[-1]{'vvinc'} = '';
}	}
my $width;	$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
foreach my $key (keys(%{$token->[2]})) {	$currentstring = '\keephidden{NEW TABLE ENTRY '.$textwidth.' }';
if ($key =~ /^width$/i) {
$width = &Apache::lonxml::get_param($key,$parstack,$safeeval,undef,1);
}
}
if (defined($width)) { $Apache::londefdef::table[-1]{'width'}=$width; }
}	}
return $currentstring;	return $currentstring;
}	}
Line 1527 sub end_table {	Line 1762 sub end_table {
my $output = '';	my $output = '';
#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'};
my $in;	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
for ($in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
$header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};	$header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
}	}
$header_of_table .= '}';	$header_of_table .= '}';
#fill the table
for ($in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
$output .= $Apache::londefdef::table[-1]{'rowdata'}[$in];
chop $output;
$output .= ' \\\\ ';
}
#define the length of the table cells	#define the length of the table cells
my @lengthforoutput = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]);	#always starts with TeXwidth (if defined everything else is ignored)
my $how_many_columns = $#lengthforoutput + 1; #total number of columns in the table	my @length_row_final = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[0]);
my $filled_columns = 0; #number of columns with information about width	for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
my $available_space = ' ';	my @length_row = split(/,/,$Apache::londefdef::table[-1]{'TeXlengthrow'}[$in]);
foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) {	for (my $jn=0;$jn<=$#length_row;$jn++) {
my @length = split(/,/,$tempo_length);	if ($length_row_final[$jn]<$length_row[$jn]) {$length_row_final[$jn]=$length_row[$jn];}
for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {	}
$lengthforoutput[$ico] =~ m/(\d\.?\d)\s*(\w+)/;	}
my $old_value = $1;	#continues trying estimate the width of raw data
my $old_unit = $2;	my @length_raw_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]);
if ($old_unit eq 'cm') {	for (my $in=1;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
$old_value = $old_value * 10;	my @length_row = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[$in]);
} elsif ($old_unit eq 'in') {	for (my $jn=0;$jn<=$#length_row;$jn++) {
$old_value = $old_value * 25.4;	if ($length_raw_row[$jn]<$length_row[$jn]) {$length_raw_row[$jn]=$length_row[$jn];}
} elsif ($old_unit eq 'pt') {	}
$old_value = $old_value * 25.4/72.27;	}
} elsif ($old_unit eq 'pc') {	#comparing of TeXwidth and raw data width
$old_value = $old_value * 25.4/6.022;	my $available_length=$Apache::londefdef::table[-1]{'width'};
}	my $needed=0;
$old_unit = 'mm';	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
$length[$ico] =~ m/(\d\.?\d)\s*(\w+)/;	if ($length_row_final[$jn]!=0) {
my $new_value = $1;	$available_length=$available_length-$length_row_final[$jn];
my $new_unit = $2;	$needed++;
if ($new_unit eq 'cm') {	}
$new_value = $new_value * 10;	}
} elsif ($old_unit eq 'in') {	$needed=$#length_row_final-$needed+1;
$new_value = $new_value * 25.4;	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
} elsif ($old_unit eq 'pt') {	if ($length_row_final[$jn]==0) {
$new_value = $new_value * 25.4/72.27;	if ($length_raw_row[$jn]<$available_length/3) {
} elsif ($old_unit eq 'pc') {	$length_row_final[$jn]=$length_raw_row[$jn];
$new_value = $new_value * 25.4/6.022;	$available_length=$available_length-$length_raw_row[$jn];
}	$needed--;
$new_unit = 'mm';
if ($old_value < $new_value) {
$lengthforoutput[$ico] = $new_value.' mm';
} else {
$lengthforoutput[$ico] = $old_value.' mm';
}	}
}	}
}	}
for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
if (not $lengthforoutput[$ico]=~m/^\s0\s\w\s$/) {	if ($length_row_final[$jn]==0) {
$filled_columns++;	$length_row_final[$jn]=0.9*$available_length/$needed;
$available_space = $available_space.' - '.$lengthforoutput[$ico];
}	}
}	}
my $temp_file;	#fill the table
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.tbl";	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
if (-e $filename) {	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
$temp_file = Apache::File->new($filename);	my $substituted=$length_row_final[$jn];
my @tbl_file_content = <$temp_file>;	$Apache::londefdef::table[-1]{'rowdata'}[$in]=~s/TOBECHANGEDONNUMBER/$substituted mm/;
my ($one,$two,$three) = split(/,/,$tbl_file_content[0]);	}
$how_many_columns+=$one-1;	$output .= $Apache::londefdef::table[-1]{'rowdata'}[$in];
$filled_columns+=$two;	chop $output;
if($three=~/\S/) {$available_space = $available_space.' - '.$three;}	$output .= ' \\\\ ';
} else {
$temp_file = Apache::File->new('>>'.$filename);
}
print $temp_file "$how_many_columns,$filled_columns,$available_space\n";
$output =~ s/\\parbox{TOBECHANGEDONNUMBER}{}/\\parbox{1 mm}{}/g;
$output =~ s/\\parbox{TOBECHANGEDONNUMBER}/\\parbox{\$SpacePerColumn}/g;
my @tagar = @$tagstack;
my $signature = 1;
for (my $ico=0;$ico<$#tagar;$ico++) {
if ($tagar[$ico] eq 'table') { $signature = 0; }
}
if ($signature) {
my $NumberEmptyLength = $how_many_columns - $filled_columns;
my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
my $shorthand = ($filled_columns+1)*4;
$output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
}
if ($how_many_columns==1) {
#start of block with width correction for one column table
$output=~s/^\s\\parbox\{([^\}])\}/\\parbox\{\\textwidth - 1 cm\}/;
#end of block with width correction for one column table
}	}
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
if ($#Apache::londefdef::table > 0) {	if ($#Apache::londefdef::table > 0) {
$inmemory = $Apache::londefdef::table[-1]{'output'};	my $inmemory = $Apache::londefdef::table[-1]{'output'};
pop @Apache::londefdef::table;	pop @Apache::londefdef::table;
$Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory	push @{$Apache::londefdef::table[-1]{'include'}}, $inmemory;
} else {	} else {
$currentstring = $Apache::londefdef::table[-1]{'output'};	$currentstring .= $Apache::londefdef::table[-1]{'output'};
$currentstring =~ s/\\\\\s+\\\\/\\\\/g;
pop @Apache::londefdef::table;	pop @Apache::londefdef::table;
if (-e $filename) {
unlink $filename;
}
}	}
}	}
return $currentstring;	return $currentstring;
Line 1649 sub start_tr {	Line 1846 sub start_tr {
}	}
push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});	push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
$Apache::londefdef::table[-1]{'counter_columns'} = -1;	$Apache::londefdef::table[-1]{'counter_columns'} = -1;
$Apache::londefdef::table[-1]{'length'} = '';	$Apache::londefdef::table[-1]{'TeXlength'} = '';
	$Apache::londefdef::table[-1]{'length'} = '';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1660 sub end_tr {	Line 1858 sub end_tr {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	push @{ $Apache::londefdef::table[-1]{'TeXlengthrow'} },$Apache::londefdef::table[-1]{'TeXlength'};
push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};	push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};

}	}
return $currentstring;	return $currentstring;
}	}
Line 1685 sub start_td {	Line 1883 sub start_td {
}	}

sub end_td {	sub end_td {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
my $tempolen = '';
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'};	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
my $data=&Apache::lonxml::endredirection();	my $data=&Apache::lonxml::endredirection();
if ($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt))/) {	my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
$Apache::londefdef::table[-1]{'length'} .= $1.',';	if (defined $TeXwidth) {
$tempolen = $1;	my $current_length=&recalc($TeXwidth);
	$current_length=~/(\d+)/;
	$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
	$Apache::londefdef::table[-1]{'length'} .= '0,';
} else {	} else {
if (length($data)<5) {	if ($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/) {
$Apache::londefdef::table[-1]{'length'} .= '0 mm,';	my $current_length=&recalc($1);
$tempolen = '6 mm';	$current_length=~/(\d+\.?\d*)/;
} else {	$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
$Apache::londefdef::table[-1]{'length'} .= '0 mm,';	$Apache::londefdef::table[-1]{'length'} .= '0,';
$tempolen = 'TOBECHANGEDONNUMBER';	} else {
}	$data=~/^\s(\S.)/;
}	$data=$1;
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$tempolen.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};	$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]/;
	}
	@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{TOBECHANGEDONNUMBER}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
}	}
return $currentstring;	return $currentstring;
}	}
Line 1724 sub start_th {	Line 1934 sub start_th {
push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;	push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
$Apache::londefdef::table[-1]{'counter_columns'}++;	$Apache::londefdef::table[-1]{'counter_columns'}++;
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
;
}	}
return $currentstring;	return $currentstring;
}	}

sub end_th {	sub end_th {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
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'};	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
my $data=&Apache::lonxml::endredirection();	my $data=&Apache::lonxml::endredirection();
if ($data=~m/width\s=\s(\d+\.\d\s*(mm\|cm))/) {	my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
$Apache::londefdef::table[-1]{'length'} .= $1.',';	if (defined $TeXwidth) {
	my $current_length=&recalc($TeXwidth);
	$current_length=~/(\d+)/;
	$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
	$Apache::londefdef::table[-1]{'length'} .= '0,';
} else {	} else {
$Apache::londefdef::table[-1]{'length'} .= '0 mm,';	if ($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/) {
}	my $current_length=&recalc($1);
@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{\textbf{'.$data.'}} '.$Apache::londefdef::table[-1]{'vinc'};	$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	#-- <img> tag
sub start_img {	sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
Line 1970 sub start_allow {	Line 2199 sub start_allow {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;	$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
	&Apache::lonnet::clutter($src);
&image_replication($src);	&image_replication($src);
my $result;	my $result;
if ($target eq 'edit') {	if ($target eq 'edit') {
Line 2000 sub start_frameset {	Line 2230 sub start_frameset {
$currentstring.='<head>'.	$currentstring.='<head>'.
&Apache::lonmenu::registerurl(undef,$target).'</head>';	&Apache::lonmenu::registerurl(undef,$target).'</head>';
}	}
$currentstring .= $token->[4];	my $onLoad='';
	foreach my $key (keys(%{$token->[2]})) {
	if ($key =~ /^onload$/i) {
	$onLoad.=$token->[2]->{$key}.';';
	delete($token->[2]->{$key});
	}
	}
	$token->[2]->{'onload'}=&Apache::lonmenu::loadevents().';'.$onLoad;
	my $onUnload='';
	foreach my $key (keys(%{$token->[2]})) {
	if ($key =~ /^onunload$/i) {
	$onUnload.=$token->[2]->{$key}.';';
	delete($token->[2]->{$key});
	}
	}
	$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
	';'.$onUnload;

	$currentstring .= '<'.$token->[1];
	foreach (keys %{$token->[2]}) {
	$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
	}
	$currentstring.='>';
}	}
return $currentstring;	return $currentstring;
}	}
Line 2016 sub end_frameset {	Line 2268 sub end_frameset {

#-- <pre>	#-- <pre>
sub start_pre {	sub start_pre {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
Line 2876 sub end_wbr {	Line 3128 sub end_wbr {
return $currentstring;	return $currentstring;
}	}


	#-- <hideweboutput> tag
	sub start_hideweboutput {
	my ($target,$token) = @_;
	if ($target eq 'web') {
	&Apache::lonxml::startredirection();
	}
	return '';
	}

	sub end_hideweboutput {
	my ($target,$token) = @_;
	my $currentstring = '';
	if ($target eq 'web') {
	$currentstring = &Apache::lonxml::endredirection();
	}
	return '';
	}


sub image_replication {	sub image_replication {
my $src = shift;	my $src = shift;
if (not -e $src) {	if (not -e $src) {
Line 2894 sub image_replication {	Line 3166 sub image_replication {
return '';	return '';
}	}

	sub recalc {
	my $argument = shift;
	if (not $argument=~/(mm\|cm\|in\|pc\|pt)/) {return $argument.' mm';}
	$argument=~/\s(\d+\.?\d)\s*(mm\|cm\|in\|pc\|pt)/;
	my $value=$1;
	my $units=$2;
	if ($units eq 'cm') {
	$value*=10;
	} elsif ($units eq 'in') {
	$value*=25.4;
	} elsif ($units eq 'pc') {
	$value=(25.412/72.27);
	} elsif ($units eq 'pt') {
	$value*=(25.4/72.27);
	}
	return $value.' mm';
	}

1;	1;
__END__	__END__

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

Removed from v.1.123
changed lines
	Added in v.1.142