version 1.173, 2003/09/25 16:09:14
|
version 1.180, 2003/10/14 00:21:12
|
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 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]; |
} |
} |
Line 470 sub start_body {
|
Line 476 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 887 sub start_cite {
|
Line 894 sub start_cite {
|
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 905 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; |
} |
} |
Line 933 sub start_address {
|
Line 940 sub start_address {
|
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 951 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; |
} |
} |
Line 956 sub start_dfn {
|
Line 963 sub start_dfn {
|
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 974 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; |
} |
} |
Line 1002 sub start_kbd {
|
Line 1009 sub start_kbd {
|
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 1020 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; |
} |
} |
Line 1071 sub start_q {
|
Line 1078 sub start_q {
|
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 1089 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; |
} |
} |
Line 1638 sub start_dl {
|
Line 1645 sub start_dl {
|
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; |
} |
} |
Line 1661 sub start_dt {
|
Line 1682 sub start_dt {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
&Apache::lonxml::startredirection();; |
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; |
} |
} |
Line 1673 sub end_dt {
|
Line 1703 sub end_dt {
|
$currentstring = $token->[2]; |
$currentstring = $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $data=&item_cleanup; |
my $data=&item_cleanup; |
$currentstring.='\item['.$data.']'; |
push @Apache::londefdef::description,'\item['.$data.']'; |
|
$Apache::londefdef::DT_redirection=0; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
sub item_cleanup { |
sub item_cleanup { |
my $item=&Apache::lonxml::endredirection();; |
my $item=&Apache::lonxml::endredirection(); |
$item=~s/\\begin{center}//g; |
$item=~s/\\begin{center}//g; |
$item=~s/\\end{center}//g; |
$item=~s/\\end{center}//g; |
return $item; |
return $item; |
Line 1692 sub start_dd {
|
Line 1723 sub start_dd {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
if ($$tagstack[-2] eq 'dt') { |
if ($Apache::londefdef::DT_redirection) { |
my $data=&item_cleanup; |
my $data=&item_cleanup; |
$currentstring.='\item['.$data.']'; |
push @Apache::londefdef::description,'\item['.$data.']'; |
|
$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; |
} |
} |
|
|
Line 2172 sub start_applet {
|
Line 2209 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 2183 sub end_applet {
|
Line 2229 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; |
} |
} |
Line 2206 sub start_embed {
|
Line 2251 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 2216 sub end_embed {
|
Line 2260 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; |
} |
} |
Line 2236 sub start_param {
|
Line 2279 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 2247 sub end_param {
|
Line 2289 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 2284 sub start_frameset {
|
Line 2325 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 2886 sub end_marquee {
|
Line 2928 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 2896 sub start_malticol {
|
Line 2938 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 2905 sub end_malticol {
|
Line 2947 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 2920 sub end_nobr {
|
Line 2964 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 2943 sub end_noembed {
|
Line 2989 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 2962 sub end_noframes {
|
Line 3008 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 2981 sub end_nolayer {
|
Line 3027 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 3000 sub end_noscript {
|
Line 3046 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 3019 sub end_object {
|
Line 3065 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 3038 sub end_optgroup {
|
Line 3084 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 3053 sub end_samp {
|
Line 3101 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 3076 sub end_server {
|
Line 3126 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 3095 sub end_spacer {
|
Line 3145 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 3114 sub end_span {
|
Line 3164 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 = ''; |