--- loncom/xml/londefdef.pm 2003/08/22 16:29:15 1.164
+++ loncom/xml/londefdef.pm 2003/10/14 14:40:33 1.181
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.164 2003/08/22 16:29:15 albertel Exp $
+# $Id: londefdef.pm,v 1.181 2003/10/14 14:40:33 sakharuk Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -92,9 +92,15 @@ sub start_m {
$Apache::lontexconvert::errorstring='';
}
#&Apache::lonxml::debug("M is ends with:$currentstring:");
+ $Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'tex') {
$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 ';}
+ $Apache::lonxml::post_evaluate=0;
} else {
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
}
@@ -134,7 +140,7 @@ sub end_tthoption {
return $result;
}
-#-- <html> tag
+#-- <html> tag (end tag optional)
sub start_html {
my ($target,$token) = @_;
my $currentstring = '';
@@ -182,7 +188,7 @@ sub end_html {
return $currentstring;
}
-#-- <head> tag
+#-- <head> tag (end tag optional)
sub start_head {
my ($target,$token) = @_;
my $currentstring = '';
@@ -195,14 +201,14 @@ sub start_head {
sub end_head {
my ($target,$token) = @_;
my $currentstring = '';
- if ($target eq 'web') {
+ if ($target eq 'web' && $ENV{'request.state'} eq 'published') {
$currentstring = &Apache::lonmenu::registerurl(undef,$target).
$token->[2];
}
return $currentstring;
}
-#-- <map> tag
+#-- <map> tag (end tag required)
sub start_map {
my ($target,$token) = @_;
my $currentstring = '';
@@ -221,13 +227,15 @@ sub end_map {
return $currentstring;
}
-#-- <select> tag
+#-- <select> tag (end tag required)
sub start_select {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
- }
+ } elsif ($target eq 'tex') {
+ $Apache::londefdef::select=0;
+ }
return $currentstring;
}
@@ -240,13 +248,20 @@ sub end_select {
return $currentstring;
}
-#-- <option> tag
+#-- <option> tag (end tag optional)
sub start_option {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$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;
}
@@ -255,11 +270,13 @@ sub end_option {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='}';
+ }
return $currentstring;
}
-#-- <input> tag
+#-- <input> tag (end tag forbidden)
sub start_input {
my ($target,$token) = @_;
my $currentstring = '';
@@ -278,7 +295,7 @@ sub end_input {
return $currentstring;
}
-#-- <textarea> tag
+#-- <textarea> tag (end tag required)
sub start_textarea {
my ($target,$token) = @_;
my $currentstring = '';
@@ -297,7 +314,7 @@ sub end_textarea {
return $currentstring;
}
-#-- <form> tag
+#-- <form> tag (end tag required)
sub start_form {
my ($target,$token) = @_;
my $currentstring = '';
@@ -316,14 +333,14 @@ sub end_form {
return $currentstring;
}
-#-- <title> tag
+#-- <title> tag (end tag required)
sub start_title {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= '\keephidden{'
+ $currentstring .= '\keephidden{Title of the document: '
}
if ($target eq 'meta') {
$currentstring='<title>';
@@ -347,7 +364,7 @@ sub end_title {
return $currentstring;
}
-#-- <meta> tag
+#-- <meta> tag (end tag forbidden)
sub start_meta {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -398,7 +415,7 @@ sub start_meta {
}
sub end_meta {
- my ($target,$token,$tagstack,$parstack,$parser) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
my $args='';
@@ -407,8 +424,10 @@ sub end_meta {
$currentstring = $token->[4];
}
} elsif ($target eq 'tex') {
+ my $content=&Apache::lonxml::get_param('content',$parstack,$safeeval);
+ my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
if ((not defined $content) && (not defined $name)) {
- &Apache::lonxml::startredirection();
+ &Apache::lonxml::endredirection();
}
}
return $currentstring;
@@ -459,12 +478,17 @@ sub end_accessrule {
return $currentstring;
}
-#-- <body> tag
+#-- <body> tag (end tag required)
sub start_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
- if (!$Apache::lonxml::registered) {
+ if ($Apache::lonhomework::parsing_a_problem) {
+ &Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");
+ return '';
+ }
+ if (!$Apache::lonxml::registered &&
+ $ENV{'request.state'} eq 'published') {
$currentstring.='<head>'.
&Apache::lonmenu::registerurl(undef,$target).'</head>';
}
@@ -535,12 +559,12 @@ sub end_body {
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = '\end{document}';
+ $currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';
}
return $currentstring;
}
-#-- <center> tag
+#-- <center> tag (end tag required)
sub start_center {
my ($target,$token) = @_;
my $currentstring = '';
@@ -563,7 +587,7 @@ sub end_center {
return $currentstring;
}
-#-- <b> tag
+#-- <b> tag (end tag required)
sub start_b {
my ($target,$token) = @_;
my $currentstring = '';
@@ -586,7 +610,7 @@ sub end_b {
return $currentstring;
}
-#-- <strong> tag
+#-- <strong> tag (end tag required)
sub start_strong {
my ($target,$token) = @_;
my $currentstring = '';
@@ -610,7 +634,7 @@ sub end_strong {
return $currentstring;
}
-#-- <h1> tag
+#-- <h1> tag (end tag required)
sub start_h1 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -874,14 +898,14 @@ sub end_h6 {
return $currentstring;
}
-#--- <cite> tag
+#--- <cite> tag (end tag required)
sub start_cite {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\textit{";
+ $currentstring .= '\textit{';
}
return $currentstring;
}
@@ -892,12 +916,12 @@ sub end_cite {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <i> tag
+#-- <i> tag (end tag required)
sub start_i {
my ($target,$token) = @_;
my $currentstring = '';
@@ -920,14 +944,14 @@ sub end_i {
return $currentstring;
}
-#-- <address> tag
+#-- <address> tag (end tag required)
sub start_address {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\textit{";
+ $currentstring .= '\textit{';
}
return $currentstring;
}
@@ -938,19 +962,19 @@ sub end_address {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <dfn> tag
+#-- <dfn> tag (end tag required)
sub start_dfn {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\textit{";
+ $currentstring .= '\textit{';
}
return $currentstring;
}
@@ -961,12 +985,12 @@ sub end_dfn {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <tt> tag
+#-- <tt> tag (end tag required)
sub start_tt {
my ($target,$token) = @_;
my $currentstring = '';
@@ -989,14 +1013,14 @@ sub end_tt {
return $currentstring;
}
-#-- <kbd> tag
+#-- <kbd> tag (end tag required)
sub start_kbd {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\texttt";
+ $currentstring .= '\texttt{';
}
return $currentstring;
}
@@ -1007,12 +1031,12 @@ sub end_kbd {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <code> tag
+#-- <code> tag (end tag required)
sub start_code {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1035,7 +1059,7 @@ sub end_code {
return $currentstring;
}
-#-- <em> tag
+#-- <em> tag (end tag required)
sub start_em {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1058,14 +1082,14 @@ sub end_em {
return $currentstring;
}
-#-- <q> tag
+#-- <q> tag (end tag required)
sub start_q {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\emph{";
+ $currentstring .= '\emph{';
}
return $currentstring;
}
@@ -1076,12 +1100,12 @@ sub end_q {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <p> tag
+#-- <p> tag (end tag optional)
sub start_p {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1104,7 +1128,7 @@ sub end_p {
return $currentstring;
}
-#-- <br> tag
+#-- <br> tag (end tag forbidden)
sub start_br {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
@@ -1127,7 +1151,7 @@ sub end_br {
return $currentstring;
}
-#-- <big> tag
+#-- <big> tag (end tag required)
sub start_big {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1150,7 +1174,7 @@ sub end_big {
return $currentstring;
}
-#-- <small> tag
+#-- <small> tag (end tag required)
sub start_small {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1173,7 +1197,7 @@ sub end_small {
return $currentstring;
}
-#-- <basefont> tag
+#-- <basefont> tag (end tag forbidden)
sub start_basefont {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
@@ -1202,7 +1226,7 @@ sub end_basefont {
return $currentstring;
}
-#-- <font> tag
+#-- <font> tag (end tag required)
sub start_font {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
@@ -1240,7 +1264,7 @@ sub end_font {
return $currentstring;
}
-#-- <strike> tag
+#-- <strike> tag (end tag required)
sub start_strike {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1266,7 +1290,7 @@ sub end_strike {
return $currentstring;
}
-#-- <s> tag
+#-- <s> tag (end tag required)
sub start_s {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1292,7 +1316,7 @@ sub end_s {
return $currentstring;
}
-#-- <sub> tag
+#-- <sub> tag (end tag required)
sub start_sub {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1315,7 +1339,7 @@ sub end_sub {
return $currentstring;
}
-#-- <sup> tag
+#-- <sup> tag (end tag required)
sub start_sup {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1338,7 +1362,7 @@ sub end_sup {
return $currentstring;
}
-#-- <hr> tag
+#-- <hr> tag (end tag forbidden)
sub start_hr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1378,7 +1402,7 @@ sub end_hr {
return $currentstring;
}
-#-- <div> tag
+#-- <div> tag (end tag required)
sub start_div {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1397,7 +1421,7 @@ sub end_div {
return $currentstring;
}
-#-- <a> tag
+#-- <a> tag (end tag required)
sub start_a {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1419,7 +1443,7 @@ sub start_a {
}
sub end_a {
- my ($target,$token,$tagstack,$parstack,$safeeval) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[2];
@@ -1427,9 +1451,9 @@ sub end_a {
return $currentstring;
}
-#-- <li> tag
+#-- <li> tag (end tag optional)
sub start_li {
- my ($target,$token,$tagstack,$parstack,$safeeval) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
@@ -1457,7 +1481,7 @@ sub end_li {
return $currentstring;
}
-#-- <u> tag
+#-- <u> tag (end tag required)
sub start_u {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1483,7 +1507,7 @@ sub end_u {
return $currentstring;
}
-#-- <ul> tag
+#-- <ul> tag (end tag required)
sub start_ul {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1526,7 +1550,7 @@ sub end_ul {
return $currentstring;
}
-#-- <menu> tag
+#-- <menu> tag (end tag required)
sub start_menu {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1549,7 +1573,7 @@ sub end_menu {
return $currentstring;
}
-#-- <dir> tag
+#-- <dir> tag (end tag required)
sub start_dir {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1572,7 +1596,7 @@ sub end_dir {
return $currentstring;
}
-#-- <ol> tag
+#-- <ol> tag (end tag required)
sub start_ol {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1625,78 +1649,115 @@ sub end_ol {
return $currentstring;
}
-#-- <dl> tag
+#-- <dl> tag (end tag required)
sub start_dl {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} 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;
}
sub end_dl {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
} 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;
}
-#-- <dt> tag
+#-- <dt> tag (end tag optional)
sub start_dt {
- my ($target,$token) = @_;
- my $currentstring = '';
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ my $currentstring='';
if ($target eq 'web') {
$currentstring = $token->[4];
} 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;
}
sub end_dt {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = ']';
+ my $data=&item_cleanup;
+ push @Apache::londefdef::description,'\item['.$data.']';
+ $Apache::londefdef::DT_redirection=0;
}
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 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- if ($$tagstack[-2] eq 'dl') {
- $currentstring = ' \item [] ';
- } elsif ($$tagstack[-2] eq 'dt') {
- $currentstring = ']';
+ if ($Apache::londefdef::DT_redirection) {
+ my $data=&item_cleanup;
+ push @Apache::londefdef::description,'\item['.$data.']';
+ $Apache::londefdef::DT_redirection=0;
}
+ $Apache::londefdef::DD_redirection=1;
+ &Apache::lonxml::startredirection();
}
return $currentstring;
}
sub end_dd {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
- }
+ } elsif ($target eq 'tex') {
+ $Apache::londefdef::description[-1].=&Apache::lonxml::endredirection();
+ $Apache::londefdef::DD_redirection=0;
+ }
return $currentstring;
}
-#-- <table> tag
+#-- <table> tag (end tag required)
sub start_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $textwidth='';
@@ -1793,7 +1854,7 @@ sub end_table {
$needed=$#length_row_final-$needed+1;
for (my $jn=0;$jn<=$#length_row_final;$jn++) {
if ($length_row_final[$jn]==0) {
- if ($length_raw_row[$jn]<$available_length/3) {
+ if ($length_raw_row[$jn]<$available_length) {
$length_row_final[$jn]=$length_raw_row[$jn];
$available_length=$available_length-$length_raw_row[$jn];
$needed--;
@@ -1829,7 +1890,7 @@ sub end_table {
return $currentstring;
}
-#-- <tr> tag
+#-- <tr> tag (end tag optional)
sub start_tr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1866,7 +1927,7 @@ sub end_tr {
return $currentstring;
}
-#-- <td> tag
+#-- <td> tag (end tag optional)
sub start_td {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1925,9 +1986,24 @@ sub end_td_tex {
$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
$Apache::londefdef::table[-1]{'length'} .= '0,';
} else {
- $data=~s/^\s+(\S.*)/$1/;
+ $data=~s/^\s+(\S.*)/$1/;
$data=~s/(.*\S)\s+$/$1/;
- my $current_length=2*length($data);
+ $data=~s/(\s)+/$1/;
+ my $current_length=0;
+ if ($data=~/\\vskip/) {
+ my $newdata=$data;
+ $newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;
+ my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);
+ foreach my $elementdata (@newdata) {
+ $elementdata=~s/^\s+(\S.*)/$1/;
+ $elementdata=~s/(.*\S)\s+$/$1/;
+ $elementdata=~s/(\s)+/$1/;
+ my $lengthnewdata=1.8*length($elementdata);
+ if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}
+ }
+ } else {
+ $current_length=1.8*length($data);
+ }
$Apache::londefdef::table[-1]{'length'} .= $current_length.',';
$Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
}
@@ -1951,7 +2027,7 @@ sub end_td {
return $currentstring;
}
-#-- <th> tag
+#-- <th> tag (end tag optional)
sub start_th {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -2007,7 +2083,7 @@ sub end_th {
}
return $currentstring;
}
-#-- <img> tag
+#-- <img> tag (end tag forbidden)
sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
@@ -2119,7 +2195,7 @@ sub end_img {
return $currentstring;
}
-#-- <applet> tag
+#-- <applet> tag (end tag required)
sub start_applet {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
@@ -2144,7 +2220,16 @@ sub start_applet {
$currentstring='[APPLET: '.$alttag.']';
}
} 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;
}
@@ -2155,12 +2240,11 @@ sub end_applet {
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{figure}";
}
return $currentstring;
}
-#-- <embed> tag
+#-- <embed> tag (end tag optional/required)
sub start_embed {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
@@ -2178,7 +2262,6 @@ sub start_embed {
$currentstring='[EMBED: '.$alttag.']';
}
} elsif ($target eq 'tex') {
- $currentstring = " \\begin{figure} ";
}
return $currentstring;
}
@@ -2188,13 +2271,12 @@ sub end_embed {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
- } elsif ($target eq 'tex') {
- $currentstring = " \\end{figure}";
+ } elsif ($target eq 'tex') {
}
return $currentstring;
}
-#-- <param> tag
+#-- <param> tag (end tag forbidden)
sub start_param {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
if (&Apache::lonxml::get_param
@@ -2208,7 +2290,6 @@ sub start_param {
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\begin{figure} ";
}
return $currentstring;
}
@@ -2219,7 +2300,6 @@ sub end_param {
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{figure}";
}
return $currentstring;
}
@@ -2251,12 +2331,14 @@ sub end_allow {
return '';
}
-#-- Frames
+#-- Frames (end tag required)
+#-- <frameset>
sub start_frameset {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
- if (!$Apache::lonxml::registered) {
+ if (!$Apache::lonxml::registered &&
+ $ENV{'request.state'} eq 'published') {
$currentstring.='<head>'.
&Apache::lonmenu::registerurl(undef,$target).'</head>';
}
@@ -2296,7 +2378,7 @@ sub end_frameset {
return $currentstring;
}
-#-- <xmp>
+#-- <xmp> (end tag required)
sub start_xmp {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -2319,7 +2401,7 @@ sub end_xmp {
return $currentstring;
}
-#-- <pre>
+#-- <pre> (end tag required)
sub start_pre {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -2402,7 +2484,7 @@ sub end_blankspace {
return $currentstring;
}
-#-- <abbr> tag
+#-- <abbr> tag (end tag required)
sub start_abbr {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2421,7 +2503,7 @@ sub end_abbr {
return $currentstring;
}
-#-- <acronym> tag
+#-- <acronym> tag (end tag required)
sub start_acronym {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2440,7 +2522,7 @@ sub end_acronym {
return $currentstring;
}
-#-- <area> tag
+#-- <area> tag (end tag forbidden)
sub start_area {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2459,7 +2541,7 @@ sub end_area {
return $currentstring;
}
-#-- <base> tag
+#-- <base> tag (end tag forbidden)
sub start_base {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2478,7 +2560,7 @@ sub end_base {
return $currentstring;
}
-#-- <bdo> tag
+#-- <bdo> tag (end tag required)
sub start_bdo {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2497,7 +2579,7 @@ sub end_bdo {
return $currentstring;
}
-#-- <bgsound> tag
+#-- <bgsound> tag (end tag optional)
sub start_bgsound {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2516,7 +2598,7 @@ sub end_bgsound {
return $currentstring;
}
-#-- <blink> tag
+#-- <blink> tag (end tag required)
sub start_blink {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2535,7 +2617,7 @@ sub end_blink {
return $currentstring;
}
-#-- <blockquote> tag
+#-- <blockquote> tag (end tag required)
sub start_blockquote {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2554,7 +2636,7 @@ sub end_blockquote {
return $currentstring;
}
-#-- <button> tag
+#-- <button> tag (end tag required)
sub start_button {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2573,7 +2655,7 @@ sub end_button {
return $currentstring;
}
-#-- <caption> tag
+#-- <caption> tag (end tag required)
sub start_caption {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2592,7 +2674,7 @@ sub end_caption {
return $currentstring;
}
-#-- <col> tag
+#-- <col> tag (end tag forbdden)
sub start_col {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2611,7 +2693,7 @@ sub end_col {
return $currentstring;
}
-#-- <colgroup> tag
+#-- <colgroup> tag (end tag optional)
sub start_colgroup {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2630,7 +2712,7 @@ sub end_colgroup {
return $currentstring;
}
-#-- <del> tag
+#-- <del> tag (end tag required)
sub start_del {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2649,7 +2731,7 @@ sub end_del {
return $currentstring;
}
-#-- <fieldset> tag
+#-- <fieldset> tag (end tag required)
sub start_fieldset {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2668,7 +2750,7 @@ sub end_fieldset {
return $currentstring;
}
-#-- <frame> tag
+#-- <frame> tag (end tag forbidden)
sub start_frame {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2687,7 +2769,7 @@ sub end_frame {
return $currentstring;
}
-#-- <iframe> tag
+#-- <iframe> tag (end tag required)
sub start_iframe {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2706,7 +2788,7 @@ sub end_iframe {
return $currentstring;
}
-#-- <ins> tag
+#-- <ins> tag (end tag required)
sub start_ins {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2725,7 +2807,7 @@ sub end_ins {
return $currentstring;
}
-#-- <isindex> tag
+#-- <isindex> tag (end tag forbidden)
sub start_isindex {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2744,7 +2826,7 @@ sub end_isindex {
return $currentstring;
}
-#-- <keygen> tag
+#-- <keygen> tag (end tag forbidden)
sub start_keygen {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2782,7 +2864,7 @@ sub end_label {
return $currentstring;
}
-#-- <layer> tag
+#-- <layer> tag (end tag required)
sub start_layer {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2801,7 +2883,7 @@ sub end_layer {
return $currentstring;
}
-#-- <legend> tag
+#-- <legend> tag (end tag required)
sub start_legend {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2820,7 +2902,7 @@ sub end_legend {
return $currentstring;
}
-#-- <link> tag
+#-- <link> tag (end tag forbidden)
sub start_link {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2839,7 +2921,7 @@ sub end_link {
return $currentstring;
}
-#-- <marquee> tag
+#-- <marquee> tag (end tag optional)
sub start_marquee {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2858,8 +2940,8 @@ sub end_marquee {
return $currentstring;
}
-#-- <malticol> tag
-sub start_malticol {
+#-- <multicol> tag (end tag required)
+sub start_multicol {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
@@ -2868,7 +2950,7 @@ sub start_malticol {
return $currentstring;
}
-sub end_malticol {
+sub end_multicol {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
@@ -2877,13 +2959,15 @@ sub end_malticol {
return $currentstring;
}
-#-- <nobr> tag
+#-- <nobr> tag (end tag required)
sub start_nobr {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='\mbox{';
+ }
return $currentstring;
}
@@ -2892,11 +2976,13 @@ sub end_nobr {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='}';
+ }
return $currentstring;
}
-#-- <noembed> tag
+#-- <noembed> tag (end tag required)
sub start_noembed {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2915,7 +3001,7 @@ sub end_noembed {
return $currentstring;
}
-#-- <noframes> tag
+#-- <noframes> tag (end tag required)
sub start_noframes {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2934,7 +3020,7 @@ sub end_noframes {
return $currentstring;
}
-#-- <nolayer> tag
+#-- <nolayer> tag (end tag required)
sub start_nolayer {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2953,7 +3039,7 @@ sub end_nolayer {
return $currentstring;
}
-#-- <noscript> tag
+#-- <noscript> tag (end tag required)
sub start_noscript {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2972,7 +3058,7 @@ sub end_noscript {
return $currentstring;
}
-#-- <object> tag
+#-- <object> tag (end tag required)
sub start_object {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2991,7 +3077,7 @@ sub end_object {
return $currentstring;
}
-#-- <optgroup> tag
+#-- <optgroup> tag (end tag required)
sub start_optgroup {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3010,13 +3096,15 @@ sub end_optgroup {
return $currentstring;
}
-#-- <samp> tag
+#-- <samp> tag (end tag required)
sub start_samp {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='\texttt{';
+ }
return $currentstring;
}
@@ -3025,7 +3113,9 @@ sub end_samp {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='}';
+ }
return $currentstring;
}
@@ -3048,7 +3138,7 @@ sub end_server {
return $currentstring;
}
-#-- <spacer> tag
+#-- <spacer> tag (end tag forbidden)
sub start_spacer {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3067,7 +3157,7 @@ sub end_spacer {
return $currentstring;
}
-#-- <span> tag
+#-- <span> tag (end tag required)
sub start_span {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3086,7 +3176,7 @@ sub end_span {
return $currentstring;
}
-#-- <tbody> tag
+#-- <tbody> tag (end tag optional)
sub start_tbody {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3105,7 +3195,7 @@ sub end_tbody {
return $currentstring;
}
-#-- <tfoot> tag
+#-- <tfoot> tag (end tag optional)
sub start_tfoot {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3124,7 +3214,7 @@ sub end_tfoot {
return $currentstring;
}
-#-- <thead> tag
+#-- <thead> tag (end tag optional)
sub start_thead {
my ($target,$token) = @_;
my $currentstring = '';