Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.171 and 1.181

version 1.171, 2003/09/05 19:35:40	version 1.181, 2003/10/14 14:40:33
Line 92 sub start_m {	Line 92 sub start_m {
$Apache::lontexconvert::errorstring='';	$Apache::lontexconvert::errorstring='';
}	}
#&Apache::lonxml::debug("M is ends with:$currentstring:");	#&Apache::lonxml::debug("M is ends with:$currentstring:");
	$Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);	$currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
	if ($eval eq 'on') {
	$currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);
	}
if ($currentstring=~/^(\s\\\\\s)*$/) {$currentstring = ' \vskip 0 mm ';}	if ($currentstring=~/^(\s\\\\\s)*$/) {$currentstring = ' \vskip 0 mm ';}
	$Apache::lonxml::post_evaluate=0;
} else {	} else {
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
}	}
Line 134 sub end_tthoption {	Line 140 sub end_tthoption {
return $result;	return $result;
}	}

#-- <html> tag	#-- <html> tag (end tag optional)
sub start_html {	sub start_html {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 182 sub end_html {	Line 188 sub end_html {
return $currentstring;	return $currentstring;
}	}

#-- <head> tag	#-- <head> tag (end tag optional)
sub start_head {	sub start_head {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 195 sub start_head {	Line 201 sub start_head {
sub end_head {	sub end_head {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web' && $ENV{'request.state'} eq 'published') {
$currentstring = &Apache::lonmenu::registerurl(undef,$target).	$currentstring = &Apache::lonmenu::registerurl(undef,$target).
$token->[2];	$token->[2];
}	}
return $currentstring;	return $currentstring;
}	}

#-- <map> tag	#-- <map> tag (end tag required)
sub start_map {	sub start_map {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 221 sub end_map {	Line 227 sub end_map {
return $currentstring;	return $currentstring;
}	}

#-- <select> tag	#-- <select> tag (end tag required)
sub start_select {	sub start_select {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	} elsif ($target eq 'tex') {
	$Apache::londefdef::select=0;
	}
return $currentstring;	return $currentstring;
}	}

Line 240 sub end_select {	Line 248 sub end_select {
return $currentstring;	return $currentstring;
}	}

#-- <option> tag	#-- <option> tag (end tag optional)
sub start_option {	sub start_option {
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') {
	$Apache::londefdef::select++;
	if ($Apache::londefdef::select == 1) {
	$currentstring='\noindent\fbox{'.&Apache::lonxml::get_param('value',$parstack,$safeeval).'}\keephidden{';
	} else {
	$currentstring='\keephidden{';
	}
	}
return $currentstring;	return $currentstring;
}	}

Line 255 sub end_option {	Line 270 sub end_option {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	} elsif ($target eq 'tex') {
	$currentstring='}';
	}
return $currentstring;	return $currentstring;
}	}

#-- <input> tag	#-- <input> tag (end tag forbidden)
sub start_input {	sub start_input {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 278 sub end_input {	Line 295 sub end_input {
return $currentstring;	return $currentstring;
}	}

#-- <textarea> tag	#-- <textarea> tag (end tag required)
sub start_textarea {	sub start_textarea {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 297 sub end_textarea {	Line 314 sub end_textarea {
return $currentstring;	return $currentstring;
}	}

#-- <form> tag	#-- <form> tag (end tag required)
sub start_form {	sub start_form {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 316 sub end_form {	Line 333 sub end_form {
return $currentstring;	return $currentstring;
}	}

#-- <title> tag	#-- <title> tag (end tag required)
sub start_title {	sub start_title {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 347 sub end_title {	Line 364 sub end_title {
return $currentstring;	return $currentstring;
}	}

#-- <meta> tag	#-- <meta> tag (end tag forbidden)
sub start_meta {	sub start_meta {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 461 sub end_accessrule {	Line 478 sub end_accessrule {
return $currentstring;	return $currentstring;
}	}

#-- <body> tag	#-- <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) = @_;
my $currentstring = '';	my $currentstring = '';
Line 470 sub start_body {	Line 487 sub start_body {
&Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");	&Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");
return '';	return '';
}	}
if (!$Apache::lonxml::registered) {	if (!$Apache::lonxml::registered &&
	$ENV{'request.state'} eq 'published') {
$currentstring.='<head>'.	$currentstring.='<head>'.
&Apache::lonmenu::registerurl(undef,$target).'</head>';	&Apache::lonmenu::registerurl(undef,$target).'</head>';
}	}
Line 546 sub end_body {	Line 564 sub end_body {
return $currentstring;	return $currentstring;
}	}

#-- <center> tag	#-- <center> tag (end tag required)
sub start_center {	sub start_center {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 569 sub end_center {	Line 587 sub end_center {
return $currentstring;	return $currentstring;
}	}

#-- <b> tag	#-- <b> tag (end tag required)
sub start_b {	sub start_b {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 592 sub end_b {	Line 610 sub end_b {
return $currentstring;	return $currentstring;
}	}

#-- <strong> tag	#-- <strong> tag (end tag required)
sub start_strong {	sub start_strong {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 616 sub end_strong {	Line 634 sub end_strong {
return $currentstring;	return $currentstring;
}	}

#-- <h1> tag	#-- <h1> tag (end tag required)
sub start_h1 {	sub start_h1 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 880 sub end_h6 {	Line 898 sub end_h6 {
return $currentstring;	return $currentstring;
}	}

#--- <cite> tag	#--- <cite> tag (end tag required)
sub start_cite {	sub start_cite {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "\\textit{";	$currentstring .= '\textit{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 898 sub end_cite {	Line 916 sub end_cite {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "}";	$currentstring .= '}';
}	}
return $currentstring;	return $currentstring;
}	}

#-- <i> tag	#-- <i> tag (end tag required)
sub start_i {	sub start_i {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 926 sub end_i {	Line 944 sub end_i {
return $currentstring;	return $currentstring;
}	}

#-- <address> tag	#-- <address> tag (end tag required)
sub start_address {	sub start_address {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "\\textit{";	$currentstring .= '\textit{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 944 sub end_address {	Line 962 sub end_address {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "}";	$currentstring .= '}';
}	}
return $currentstring;	return $currentstring;
}	}

#-- <dfn> tag	#-- <dfn> tag (end tag required)
sub start_dfn {	sub start_dfn {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "\\textit{";	$currentstring .= '\textit{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 967 sub end_dfn {	Line 985 sub end_dfn {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "}";	$currentstring .= '}';
}	}
return $currentstring;	return $currentstring;
}	}

#-- <tt> tag	#-- <tt> tag (end tag required)
sub start_tt {	sub start_tt {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 995 sub end_tt {	Line 1013 sub end_tt {
return $currentstring;	return $currentstring;
}	}

#-- <kbd> tag	#-- <kbd> tag (end tag required)
sub start_kbd {	sub start_kbd {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "\\texttt";	$currentstring .= '\texttt{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1013 sub end_kbd {	Line 1031 sub end_kbd {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "}";	$currentstring .= '}';
}	}
return $currentstring;	return $currentstring;
}	}

#-- <code> tag	#-- <code> tag (end tag required)
sub start_code {	sub start_code {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1041 sub end_code {	Line 1059 sub end_code {
return $currentstring;	return $currentstring;
}	}

#-- <em> tag	#-- <em> tag (end tag required)
sub start_em {	sub start_em {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1064 sub end_em {	Line 1082 sub end_em {
return $currentstring;	return $currentstring;
}	}

#-- <q> tag	#-- <q> tag (end tag required)
sub start_q {	sub start_q {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "\\emph{";	$currentstring .= '\emph{';
}	}
return $currentstring;	return $currentstring;
}	}
Line 1082 sub end_q {	Line 1100 sub end_q {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring .= $token->[2];	$currentstring .= $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= "}";	$currentstring .= '}';
}	}
return $currentstring;	return $currentstring;
}	}

#-- <p> tag	#-- <p> tag (end tag optional)
sub start_p {	sub start_p {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1110 sub end_p {	Line 1128 sub end_p {
return $currentstring;	return $currentstring;
}	}

#-- <br> tag	#-- <br> tag (end tag forbidden)
sub start_br {	sub start_br {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';	my $currentstring = '';
Line 1133 sub end_br {	Line 1151 sub end_br {
return $currentstring;	return $currentstring;
}	}

#-- <big> tag	#-- <big> tag (end tag required)
sub start_big {	sub start_big {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1156 sub end_big {	Line 1174 sub end_big {
return $currentstring;	return $currentstring;
}	}

#-- <small> tag	#-- <small> tag (end tag required)
sub start_small {	sub start_small {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1179 sub end_small {	Line 1197 sub end_small {
return $currentstring;	return $currentstring;
}	}

#-- <basefont> tag	#-- <basefont> tag (end tag forbidden)
sub start_basefont {	sub start_basefont {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';	my $currentstring = '';
Line 1208 sub end_basefont {	Line 1226 sub end_basefont {
return $currentstring;	return $currentstring;
}	}

#-- <font> tag	#-- <font> tag (end tag required)
sub start_font {	sub start_font {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';	my $currentstring = '';
Line 1246 sub end_font {	Line 1264 sub end_font {
return $currentstring;	return $currentstring;
}	}

#-- <strike> tag	#-- <strike> tag (end tag required)
sub start_strike {	sub start_strike {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1272 sub end_strike {	Line 1290 sub end_strike {
return $currentstring;	return $currentstring;
}	}

#-- <s> tag	#-- <s> tag (end tag required)
sub start_s {	sub start_s {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1298 sub end_s {	Line 1316 sub end_s {
return $currentstring;	return $currentstring;
}	}

#-- <sub> tag	#-- <sub> tag (end tag required)
sub start_sub {	sub start_sub {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1321 sub end_sub {	Line 1339 sub end_sub {
return $currentstring;	return $currentstring;
}	}

#-- <sup> tag	#-- <sup> tag (end tag required)
sub start_sup {	sub start_sup {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1344 sub end_sup {	Line 1362 sub end_sup {
return $currentstring;	return $currentstring;
}	}

#-- <hr> tag	#-- <hr> tag (end tag forbidden)
sub start_hr {	sub start_hr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1384 sub end_hr {	Line 1402 sub end_hr {
return $currentstring;	return $currentstring;
}	}

#-- <div> tag	#-- <div> tag (end tag required)
sub start_div {	sub start_div {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1403 sub end_div {	Line 1421 sub end_div {
return $currentstring;	return $currentstring;
}	}

#-- <a> tag	#-- <a> tag (end tag required)
sub start_a {	sub start_a {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1433 sub end_a {	Line 1451 sub end_a {
return $currentstring;	return $currentstring;
}	}

#-- <li> tag	#-- <li> tag (end tag optional)
sub start_li {	sub start_li {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1463 sub end_li {	Line 1481 sub end_li {
return $currentstring;	return $currentstring;
}	}

#-- <u> tag	#-- <u> tag (end tag required)
sub start_u {	sub start_u {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1489 sub end_u {	Line 1507 sub end_u {
return $currentstring;	return $currentstring;
}	}

#-- <ul> tag	#-- <ul> tag (end tag required)
sub start_ul {	sub start_ul {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1532 sub end_ul {	Line 1550 sub end_ul {
return $currentstring;	return $currentstring;
}	}

#-- <menu> tag	#-- <menu> tag (end tag required)
sub start_menu {	sub start_menu {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1555 sub end_menu {	Line 1573 sub end_menu {
return $currentstring;	return $currentstring;
}	}

#-- <dir> tag	#-- <dir> tag (end tag required)
sub start_dir {	sub start_dir {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1578 sub end_dir {	Line 1596 sub end_dir {
return $currentstring;	return $currentstring;
}	}

#-- <ol> tag	#-- <ol> tag (end tag required)
sub start_ol {	sub start_ol {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1631 sub end_ol {	Line 1649 sub end_ol {
return $currentstring;	return $currentstring;
}	}

#-- <dl> tag	#-- <dl> tag (end tag required)
sub start_dl {	sub start_dl {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '\begin{description}';	$currentstring = '\begin{description}';
	@Apache::londefdef::description=();
	$Apache::londefdef::DD_redirection=0;
	$Apache::londefdef::DT_redirection=0;
}	}
return $currentstring;	return $currentstring;
}	}

sub end_dl {	sub end_dl {
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 = '\end{description}';	if ($Apache::londefdef::DT_redirection) {
	my $data=&item_cleanup;
	push @Apache::londefdef::description,'\item['.$data.']';
	$Apache::londefdef::DT_redirection=0;
	} elsif ($Apache::londefdef::DD_redirection) {
	$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
	}
	foreach my $element (@Apache::londefdef::description) {
	$currentstring.=' '.$element.' ';
	}
	@Apache::londefdef::description=();
	$currentstring.='\end{description}';
}	}
return $currentstring;	return $currentstring;
}	}

#-- <dt> tag	#-- <dt> tag (end tag optional)
sub start_dt {	sub start_dt {
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 = '\item[';	if ($Apache::londefdef::DT_redirection) {
	my $data=&item_cleanup;
	push @Apache::londefdef::description,'\item['.$data.']';
	$Apache::londefdef::DT_redirection=0;
	} elsif ($Apache::londefdef::DD_redirection) {
	$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
	$Apache::londefdef::DD_redirection=0;
	}
	&Apache::lonxml::startredirection();
	$Apache::londefdef::DT_redirection=1;
}	}
return $currentstring;	return $currentstring;
}	}

sub end_dt {	sub end_dt {
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 $data=&item_cleanup;
	push @Apache::londefdef::description,'\item['.$data.']';
	$Apache::londefdef::DT_redirection=0;
}	}
return $currentstring;	return $currentstring;
}	}

#-- <dd> tag	sub item_cleanup {
	my $item=&Apache::lonxml::endredirection();
	$item=~s/\\begin{center}//g;
	$item=~s/\\end{center}//g;
	return $item;
	}

	#-- <dd> tag (end tag optional)
sub start_dd {	sub start_dd {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
if ($$tagstack[-2] eq 'dl') {	if ($Apache::londefdef::DT_redirection) {
$currentstring = ' \item [] ';	my $data=&item_cleanup;
} elsif ($$tagstack[-2] eq 'dt') {	push @Apache::londefdef::description,'\item['.$data.']';
$currentstring = ']';	$Apache::londefdef::DT_redirection=0;
}	}
	$Apache::londefdef::DD_redirection=1;
	&Apache::lonxml::startredirection();
}	}
return $currentstring;	return $currentstring;
}	}

sub end_dd {	sub end_dd {
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') {
	$Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
	$Apache::londefdef::DD_redirection=0;
	}
return $currentstring;	return $currentstring;
}	}

#-- <table> tag	#-- <table> tag (end tag required)
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 2028 sub end_th {	Line 2083 sub end_th {
}	}
return $currentstring;	return $currentstring;
}	}
#-- <img> tag	#-- <img> tag (end tag forbidden)
sub start_img {	sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
Line 2140 sub end_img {	Line 2195 sub end_img {
return $currentstring;	return $currentstring;
}	}

#-- <applet> tag	#-- <applet> tag (end tag required)
sub start_applet {	sub start_applet {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;

Line 2165 sub start_applet {	Line 2220 sub start_applet {
$currentstring='[APPLET: '.$alttag.']';	$currentstring='[APPLET: '.$alttag.']';
}	}
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = " \\begin{figure} ";	my $alttag= &Apache::lonxml::get_param('alt',$parstack,
	$safeeval,undef,1);
	unless ($alttag) {
	my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,
	undef,1);
	$alttag=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],
	$code);
	}
	$currentstring.='\begin{center} \fbox{Java Applet: '.$alttag.
	'.}\end{center}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 2176 sub end_applet {	Line 2240 sub end_applet {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = " \\end{figure}";
}	}
return $currentstring;	return $currentstring;
}	}

#-- <embed> tag	#-- <embed> tag (end tag optional/required)
sub start_embed {	sub start_embed {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);	my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
Line 2199 sub start_embed {	Line 2262 sub start_embed {
$currentstring='[EMBED: '.$alttag.']';	$currentstring='[EMBED: '.$alttag.']';
}	}
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = " \\begin{figure} ";
}	}
return $currentstring;	return $currentstring;
}	}
Line 2209 sub end_embed {	Line 2271 sub end_embed {
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 = " \\end{figure}";
}	}
return $currentstring;	return $currentstring;
}	}

#-- <param> tag	#-- <param> tag (end tag forbidden)
sub start_param {	sub start_param {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
if (&Apache::lonxml::get_param	if (&Apache::lonxml::get_param
Line 2229 sub start_param {	Line 2290 sub start_param {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = " \\begin{figure} ";
}	}
return $currentstring;	return $currentstring;
}	}
Line 2240 sub end_param {	Line 2300 sub end_param {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = " \\end{figure}";
}	}
return $currentstring;	return $currentstring;
}	}
Line 2272 sub end_allow {	Line 2331 sub end_allow {
return '';	return '';
}	}

#-- Frames	#-- Frames (end tag required)
	#-- <frameset>
sub start_frameset {	sub start_frameset {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
if (!$Apache::lonxml::registered) {	if (!$Apache::lonxml::registered &&
	$ENV{'request.state'} eq 'published') {
$currentstring.='<head>'.	$currentstring.='<head>'.
&Apache::lonmenu::registerurl(undef,$target).'</head>';	&Apache::lonmenu::registerurl(undef,$target).'</head>';
}	}
Line 2317 sub end_frameset {	Line 2378 sub end_frameset {
return $currentstring;	return $currentstring;
}	}

#-- <xmp>	#-- <xmp> (end tag required)
sub start_xmp {	sub start_xmp {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2340 sub end_xmp {	Line 2401 sub end_xmp {
return $currentstring;	return $currentstring;
}	}

#-- <pre>	#-- <pre> (end tag required)
sub start_pre {	sub start_pre {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2423 sub end_blankspace {	Line 2484 sub end_blankspace {
return $currentstring;	return $currentstring;
}	}

#-- <abbr> tag	#-- <abbr> tag (end tag required)
sub start_abbr {	sub start_abbr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2442 sub end_abbr {	Line 2503 sub end_abbr {
return $currentstring;	return $currentstring;
}	}

#-- <acronym> tag	#-- <acronym> tag (end tag required)
sub start_acronym {	sub start_acronym {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2461 sub end_acronym {	Line 2522 sub end_acronym {
return $currentstring;	return $currentstring;
}	}

#-- <area> tag	#-- <area> tag (end tag forbidden)
sub start_area {	sub start_area {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2480 sub end_area {	Line 2541 sub end_area {
return $currentstring;	return $currentstring;
}	}

#-- <base> tag	#-- <base> tag (end tag forbidden)
sub start_base {	sub start_base {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2499 sub end_base {	Line 2560 sub end_base {
return $currentstring;	return $currentstring;
}	}

#-- <bdo> tag	#-- <bdo> tag (end tag required)
sub start_bdo {	sub start_bdo {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2518 sub end_bdo {	Line 2579 sub end_bdo {
return $currentstring;	return $currentstring;
}	}

#-- <bgsound> tag	#-- <bgsound> tag (end tag optional)
sub start_bgsound {	sub start_bgsound {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2537 sub end_bgsound {	Line 2598 sub end_bgsound {
return $currentstring;	return $currentstring;
}	}

#-- <blink> tag	#-- <blink> tag (end tag required)
sub start_blink {	sub start_blink {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2556 sub end_blink {	Line 2617 sub end_blink {
return $currentstring;	return $currentstring;
}	}

#-- <blockquote> tag	#-- <blockquote> tag (end tag required)
sub start_blockquote {	sub start_blockquote {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2575 sub end_blockquote {	Line 2636 sub end_blockquote {
return $currentstring;	return $currentstring;
}	}

#-- <button> tag	#-- <button> tag (end tag required)
sub start_button {	sub start_button {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2594 sub end_button {	Line 2655 sub end_button {
return $currentstring;	return $currentstring;
}	}

#-- <caption> tag	#-- <caption> tag (end tag required)
sub start_caption {	sub start_caption {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2613 sub end_caption {	Line 2674 sub end_caption {
return $currentstring;	return $currentstring;
}	}

#-- <col> tag	#-- <col> tag (end tag forbdden)
sub start_col {	sub start_col {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2632 sub end_col {	Line 2693 sub end_col {
return $currentstring;	return $currentstring;
}	}

#-- <colgroup> tag	#-- <colgroup> tag (end tag optional)
sub start_colgroup {	sub start_colgroup {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2651 sub end_colgroup {	Line 2712 sub end_colgroup {
return $currentstring;	return $currentstring;
}	}

#-- <del> tag	#-- <del> tag (end tag required)
sub start_del {	sub start_del {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2670 sub end_del {	Line 2731 sub end_del {
return $currentstring;	return $currentstring;
}	}

#-- <fieldset> tag	#-- <fieldset> tag (end tag required)
sub start_fieldset {	sub start_fieldset {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2689 sub end_fieldset {	Line 2750 sub end_fieldset {
return $currentstring;	return $currentstring;
}	}

#-- <frame> tag	#-- <frame> tag (end tag forbidden)
sub start_frame {	sub start_frame {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2708 sub end_frame {	Line 2769 sub end_frame {
return $currentstring;	return $currentstring;
}	}

#-- <iframe> tag	#-- <iframe> tag (end tag required)
sub start_iframe {	sub start_iframe {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2727 sub end_iframe {	Line 2788 sub end_iframe {
return $currentstring;	return $currentstring;
}	}

#-- <ins> tag	#-- <ins> tag (end tag required)
sub start_ins {	sub start_ins {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2746 sub end_ins {	Line 2807 sub end_ins {
return $currentstring;	return $currentstring;
}	}

#-- <isindex> tag	#-- <isindex> tag (end tag forbidden)
sub start_isindex {	sub start_isindex {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2765 sub end_isindex {	Line 2826 sub end_isindex {
return $currentstring;	return $currentstring;
}	}

#-- <keygen> tag	#-- <keygen> tag (end tag forbidden)
sub start_keygen {	sub start_keygen {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2803 sub end_label {	Line 2864 sub end_label {
return $currentstring;	return $currentstring;
}	}

#-- <layer> tag	#-- <layer> tag (end tag required)
sub start_layer {	sub start_layer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2822 sub end_layer {	Line 2883 sub end_layer {
return $currentstring;	return $currentstring;
}	}

#-- <legend> tag	#-- <legend> tag (end tag required)
sub start_legend {	sub start_legend {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2841 sub end_legend {	Line 2902 sub end_legend {
return $currentstring;	return $currentstring;
}	}

#-- <link> tag	#-- <link> tag (end tag forbidden)
sub start_link {	sub start_link {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2860 sub end_link {	Line 2921 sub end_link {
return $currentstring;	return $currentstring;
}	}

#-- <marquee> tag	#-- <marquee> tag (end tag optional)
sub start_marquee {	sub start_marquee {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2879 sub end_marquee {	Line 2940 sub end_marquee {
return $currentstring;	return $currentstring;
}	}

#-- <malticol> tag	#-- <multicol> tag (end tag required)
sub start_malticol {	sub start_multicol {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
Line 2889 sub start_malticol {	Line 2950 sub start_malticol {
return $currentstring;	return $currentstring;
}	}

sub end_malticol {	sub end_multicol {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
Line 2898 sub end_malticol {	Line 2959 sub end_malticol {
return $currentstring;	return $currentstring;
}	}

#-- <nobr> tag	#-- <nobr> tag (end tag required)
sub start_nobr {	sub start_nobr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	} elsif ($target eq 'tex') {
	$currentstring='\mbox{';
	}
return $currentstring;	return $currentstring;
}	}

Line 2913 sub end_nobr {	Line 2976 sub end_nobr {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	} elsif ($target eq 'tex') {
	$currentstring='}';
	}
return $currentstring;	return $currentstring;
}	}

#-- <noembed> tag	#-- <noembed> tag (end tag required)
sub start_noembed {	sub start_noembed {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2936 sub end_noembed {	Line 3001 sub end_noembed {
return $currentstring;	return $currentstring;
}	}

#-- <noframes> tag	#-- <noframes> tag (end tag required)
sub start_noframes {	sub start_noframes {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2955 sub end_noframes {	Line 3020 sub end_noframes {
return $currentstring;	return $currentstring;
}	}

#-- <nolayer> tag	#-- <nolayer> tag (end tag required)
sub start_nolayer {	sub start_nolayer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2974 sub end_nolayer {	Line 3039 sub end_nolayer {
return $currentstring;	return $currentstring;
}	}

#-- <noscript> tag	#-- <noscript> tag (end tag required)
sub start_noscript {	sub start_noscript {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2993 sub end_noscript {	Line 3058 sub end_noscript {
return $currentstring;	return $currentstring;
}	}

#-- <object> tag	#-- <object> tag (end tag required)
sub start_object {	sub start_object {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 3012 sub end_object {	Line 3077 sub end_object {
return $currentstring;	return $currentstring;
}	}

#-- <optgroup> tag	#-- <optgroup> tag (end tag required)
sub start_optgroup {	sub start_optgroup {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 3031 sub end_optgroup {	Line 3096 sub end_optgroup {
return $currentstring;	return $currentstring;
}	}

#-- <samp> tag	#-- <samp> tag (end tag required)
sub start_samp {	sub start_samp {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	} elsif ($target eq 'tex') {
	$currentstring='\texttt{';
	}
return $currentstring;	return $currentstring;
}	}

Line 3046 sub end_samp {	Line 3113 sub end_samp {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
}	} elsif ($target eq 'tex') {
	$currentstring='}';
	}
return $currentstring;	return $currentstring;
}	}

Line 3069 sub end_server {	Line 3138 sub end_server {
return $currentstring;	return $currentstring;
}	}

#-- <spacer> tag	#-- <spacer> tag (end tag forbidden)
sub start_spacer {	sub start_spacer {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 3088 sub end_spacer {	Line 3157 sub end_spacer {
return $currentstring;	return $currentstring;
}	}

#-- <span> tag	#-- <span> tag (end tag required)
sub start_span {	sub start_span {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 3107 sub end_span {	Line 3176 sub end_span {
return $currentstring;	return $currentstring;
}	}

#-- <tbody> tag	#-- <tbody> tag (end tag optional)
sub start_tbody {	sub start_tbody {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';

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

500 Internal Server Error

Internal Server Error

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

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

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

Removed from v.1.171
changed lines
	Added in v.1.181