--- loncom/xml/londefdef.pm 2001/05/04 17:38:22 1.29
+++ loncom/xml/londefdef.pm 2002/01/17 17:42:34 1.40
@@ -1,6 +1,42 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
+# $Id: londefdef.pm,v 1.40 2002/01/17 17:42:34 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+# Copyright for TtHfunc and TtMfunc by Ian Hutchinson.
+# TtHfunc and TtMfunc (the "Code") may be compiled and linked into
+# binary executable programs or libraries distributed by the
+# Michigan State University (the "Licensee"), but any binaries so
+# distributed are hereby licensed only for use in the context
+# of a program or computational system for which the Licensee is the
+# primary author or distributor, and which performs substantial
+# additional tasks beyond the translation of (La)TeX into HTML.
+# The C source of the Code may not be distributed by the Licensee
+# to any other parties under any circumstances.
+#
+#
# last modified 06/26/00 by Alexander Sakharuk
# 11/6,11/30,02/01/01,5/4 Gerd Kortemeyer
@@ -9,13 +45,13 @@ package Apache::londefdef;
use strict;
use Apache::lonxml;
-sub BEGIN {
+BEGIN {
- &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow'));
+ &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow','frameset'));
}
-#===================================================================== TAG SUBROUTINES
+#======================= TAG SUBROUTINES =====================
#-- <output>
sub start_output {
my ($target) = @_;
@@ -28,39 +64,64 @@ sub end_output {
return '';
}
#-- <m> tag
- sub start_m {
- my ($target,$token,$parstack,$parser) = @_;
- my $currentstring = '';
- if ($target eq 'web') {
- my $inside = &Apache::lonxml::get_all_text("/m",$$parser[$#$parser]);
- $inside ='\\documentstyle{article}'.$inside;
-# &Apache::lonxml::debug($inside);
- $currentstring = &Apache::lontexconvert::converted(\$inside);
-# &Apache::lonxml::debug($currentstring);
-
- } elsif ($target eq 'tex') {
- $currentstring = "";
- }
- return $currentstring;
- }
- sub end_m {
- my ($target,$token) = @_;
- my $currentstring = '';
- if ($target eq 'web') {
- } elsif ($target eq 'tex') {
- $currentstring = "";
- } elsif ($target eq 'meta') {
- }
- return $currentstring;
- }
-#-------------------------------------------------------------------------- <html> tag
+sub start_m {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ my $inside = &Apache::lonxml::get_all_text("/m",$$parser[-1]);
+ $inside ='\\documentstyle{article}'.$inside;
+ &Apache::lonxml::debug("M is starting with:$inside:");
+ my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
+ if ($eval eq 'on') {
+ $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+ #&Apache::lonxml::debug("M is evaulated to:$inside:");
+ }
+ $currentstring = &Apache::lontexconvert::converted(\$inside);
+ if ($Apache::lontexconvert::errorstring) {
+ &Apache::lonxml::warning("tth error: ".
+ $Apache::lontexconvert::errorstring);
+ $Apache::lontexconvert::errorstring='';
+ }
+ #&Apache::lonxml::debug("M is ends with:$currentstring:");
+ } elsif ($target eq 'tex') {
+ $currentstring = "";
+ }
+ return $currentstring;
+}
+sub end_m {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ } elsif ($target eq 'tex') {
+ $currentstring = "";
+ } elsif ($target eq 'meta') {
+ }
+ return $currentstring;
+}
+#-- <html> tag
sub start_html {
my ($target,$token) = @_;
- my $currentstring = '';
+ my $currentstring = '';
+ if ($ENV{'browser.mathml'}) {
+ &tth::ttminit();
+ } else {
+ &tth::tthinit();
+ }
if ($target eq 'web') {
$currentstring = &Apache::lonxml::xmlbegin().
&Apache::lonxml::fontsettings();
- }
+ } elsif ($target eq 'tex') {
+ $currentstring .= '\documentclass[letterpaper]{article}
+ \setlength{\oddsidemargin}{-40pt}
+ \setlength{\evensidemargin}{-60pt}
+ \setlength{\topmargin}{200pt}
+ \setlength{\textwidth}{4.4in}
+ \setlength{\textheight}{6.8in}
+ \setlength{\parindent}{20pt}
+ \setlength{\marginparwidth}{90pt}
+ \setlength{\textfloatsep}{8pt plus 2.0pt minus 4.0pt}
+ \newcommand{\keephidden}[1]{}';
+ }
return $currentstring;
}
sub end_html {
@@ -68,10 +129,10 @@ sub end_output {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = &Apache::lonxml::xmlend();
- }
+ }
return $currentstring;
}
-#-------------------------------------------------------------------------- <head> tag
+#-- <head> tag
sub start_head {
my ($target,$token) = @_;
my $currentstring = '';
@@ -89,7 +150,7 @@ sub end_output {
}
return $currentstring;
}
-#--------------------------------------------------------------------------- <map> tag
+#-- <map> tag
sub start_map {
my ($target,$token) = @_;
my $currentstring = '';
@@ -106,8 +167,7 @@ sub end_output {
}
return $currentstring;
}
-
-#------------------------------------------------------------------------ <select> tag
+#-- <select> tag
sub start_select {
my ($target,$token) = @_;
my $currentstring = '';
@@ -124,7 +184,7 @@ sub end_output {
}
return $currentstring;
}
-#------------------------------------------------------------------------ <option> tag
+#-- <option> tag
sub start_option {
my ($target,$token) = @_;
my $currentstring = '';
@@ -141,7 +201,7 @@ sub end_output {
}
return $currentstring;
}
-#------------------------------------------------------------------------- <input> tag
+#-- <input> tag
sub start_input {
my ($target,$token) = @_;
my $currentstring = '';
@@ -158,7 +218,7 @@ sub end_output {
}
return $currentstring;
}
-#---------------------------------------------------------------------- <textarea> tag
+#-- <textarea> tag
sub start_textarea {
my ($target,$token) = @_;
my $currentstring = '';
@@ -175,7 +235,7 @@ sub end_output {
}
return $currentstring;
}
-#-------------------------------------------------------------------------- <form> tag
+#-- <form> tag
sub start_form {
my ($target,$token) = @_;
my $currentstring = '';
@@ -192,12 +252,14 @@ sub end_output {
}
return $currentstring;
}
-#------------------------------------------------------------------------- <title> tag
+#-- <title> tag
sub start_title {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
+ } elsif ($target eq 'tex') {
+ $currentstring .= '\keephidden{'
}
if ($target eq 'meta') {
$currentstring='<title>';
@@ -210,16 +272,18 @@ sub end_output {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring .= '}';
+ }
if ($target eq 'meta') {
&end_output();
$currentstring='</title>';
}
return $currentstring;
}
-#-------------------------------------------------------------------------- <meta> tag
+#-- <meta> tag
sub start_meta {
- my ($target,$token,$parstack,$parser) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser) = @_;
my $currentstring = '';
if ($target eq 'web') {
my $args='';
@@ -245,7 +309,7 @@ sub end_output {
return $currentstring;
}
sub end_meta {
- my ($target,$token,$parstack,$parser) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser) = @_;
my $currentstring = '';
if ($target eq 'web') {
my $args='';
@@ -256,21 +320,46 @@ sub end_output {
}
return $currentstring;
}
-#-------------------------------------------------------------------------- <body> tag
+#-- <body> tag
sub start_body {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
- $token->[2]->{'onLoad'}.=&Apache::lonxml::loadevents();
- $token->[2]->{'onUnload'}.=&Apache::lonxml::unloadevents();
-
- $currentstring = '<'.$token->[1];
- map {
- $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
- } keys %{$token->[2]};
- $currentstring.='>';
+ if (!$Apache::lonxml::registered) {
+ $currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';
+ }
+ my $onLoad='';
+ foreach my $key (keys(%{$token->[2]})) {
+ if ($key =~ /^onload$/i) {
+ $onLoad.=$token->[2]->{$key}.';';
+ delete($token->[2]->{$key});
+ }
+ }
+ $token->[2]->{'onLoad'}=$onLoad.&Apache::lonxml::loadevents();
+ my $onUnload='';
+ foreach my $key (keys(%{$token->[2]})) {
+ if ($key =~ /^onunload$/i) {
+ $onUnload.=$token->[2]->{$key}.';';
+ delete($token->[2]->{$key});
+ }
+ }
+ $token->[2]->{'onUnload'}=$onUnload.
+ &Apache::lonxml::unloadevents();
+
+ $currentstring .= '<'.$token->[1];
+ foreach (keys %{$token->[2]}) {
+ $currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"';
+ }
+ $currentstring.='>';
+ if ($ENV{'request.state'} ne 'published') {
+ $currentstring.=(<<EDITBUTTON);
+ <form method="post">
+ <input type="submit" name="showmode" value="Edit" />
+ </form>
+EDITBUTTON
+ }
} elsif ($target eq 'tex') {
- $currentstring = " \\begin{document} ";
+ $currentstring = '\begin{document}';
}
return $currentstring;
}
@@ -280,20 +369,20 @@ sub end_output {
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{document}";
+ $currentstring = '\end{document}';
}
return $currentstring;
}
-#------------------------------------------------------------------------ <center> tag
+#-- <center> tag
sub start_center {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\begin{center} ";
+ $currentstring = '\begin{center}';
} elsif ($target eq 'latexsource') {
- $currentstring = " \\begin{center} ";
+ $currentstring = '\begin{center}';
}
return $currentstring;
}
@@ -303,22 +392,22 @@ sub end_output {
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{center}";
+ $currentstring = '\end{center}';
} elsif ($target eq 'latexsource') {
- $currentstring = " \\end{center}";
+ $currentstring = '\end{center}';
}
return $currentstring;
}
-#----------------------------------------------------------------------------- <b> tag
+#-- <b> tag
sub start_b {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\textbf{";
+ $currentstring = '\textbf{';
} elsif ($target eq 'latexsource') {
- $currentstring = " \\textbf{";
+ $currentstring = '\textbf{';
}
return $currentstring;
}
@@ -328,22 +417,23 @@ sub end_output {
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = "}";
+ $currentstring = '}';
+
} elsif ($target eq 'latexsource') {
- $currentstring = "}";
+ $currentstring = '}';
}
return $currentstring;
}
-#------------------------------------------------------------------------ <strong> tag
+#-- <strong> tag
sub start_strong {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\textbf{";
+ $currentstring = '\textbf{';
} elsif ($target eq 'latexsource') {
- $currentstring = " \\textbf{";
+ $currentstring = '\textbf{';
}
return $currentstring;
}
@@ -354,20 +444,20 @@ sub end_output {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = "}";
+ $currentstring = '}';
} elsif ($target eq 'latexsource') {
- $currentstring = "}";
+ $currentstring = '}';
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <h1> tag
+#-- <h1> tag
sub start_h1 {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\chapter{ ";
+ $currentstring .= '\large{\textbf{';
} elsif ($target eq 'meta') {
$currentstring='<subject>';
&start_output();
@@ -380,21 +470,21 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}}';
} elsif ($target eq 'meta') {
&end_output();
$currentstring='</subject>';
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <h2> tag
+#-- <h2> tag
sub start_h2 {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\section{ ";
+ $currentstring .= '\large{\textbf{';
}
return $currentstring;
}
@@ -404,18 +494,18 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}}';
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <h3> tag
+#-- <h3> tag
sub start_h3 {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\subsection{ ";
+ $currentstring .= '\large{\textbf{';
}
return $currentstring;
}
@@ -425,18 +515,18 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}}';
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <h4> tag
+#-- <h4> tag
sub start_h4 {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\subsubsection{ ";
+ $currentstring .= '\large{\textbf';
}
return $currentstring;
}
@@ -446,18 +536,18 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}}';
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <h5> tag
+#-- <h5> tag
sub start_h5 {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\paragraph{ ";
+ $currentstring .= '\large{\textbf{';
}
return $currentstring;
}
@@ -467,18 +557,18 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}}';
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <h6> tag
+#-- <h6> tag
sub start_h6 {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\subparagraph{ ";
+ $currentstring .= '\large{\textbf{';
}
return $currentstring;
}
@@ -488,11 +578,11 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}}';
}
return $currentstring;
}
-#-------------------------------------------------------------------------- <cite> tag
+#--- <cite> tag
sub start_cite {
my ($target,$token) = @_;
my $currentstring = '';
@@ -517,16 +607,16 @@ sub end_output {
}
return $currentstring;
}
-#----------------------------------------------------------------------------- <i> tag
+#-- <i> tag
sub start_i {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\textit{";
+ $currentstring .= '\textit{';
} elsif ($target eq 'latexsource') {
- $currentstring .= "\\textit{";
+ $currentstring .= '\textit{';
}
return $currentstring;
}
@@ -536,13 +626,13 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
} elsif ($target eq 'latexsource') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#----------------------------------------------------------------------- <address> tag
+#-- <address> tag
sub start_address {
my ($target,$token) = @_;
my $currentstring = '';
@@ -567,7 +657,7 @@ sub end_output {
}
return $currentstring;
}
-#--------------------------------------------------------------------------- <dfn> tag
+#-- <dfn> tag
sub start_dfn {
my ($target,$token) = @_;
my $currentstring = '';
@@ -592,16 +682,16 @@ sub end_output {
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <tt> tag
+#-- <tt> tag
sub start_tt {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\texttt{";
+ $currentstring .= '\texttt{';
} elsif ($target eq 'latexsource') {
- $currentstring .= "\\texttt{";
+ $currentstring .= '\texttt{';
}
return $currentstring;
}
@@ -611,13 +701,13 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
} elsif ($target eq 'latexsource') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <kbd> tag
+#-- <kbd> tag
sub start_kbd {
my ($target,$token) = @_;
my $currentstring = '';
@@ -642,14 +732,14 @@ sub end_output {
}
return $currentstring;
}
-#-------------------------------------------------------------------------- <code> tag
+#-- <code> tag
sub start_code {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{ \\tt ";
+ $currentstring .= '\texttt{';
}
return $currentstring;
}
@@ -659,20 +749,20 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <em> tag
+#-- <em> tag
sub start_em {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\emph{";
+ $currentstring .= '\emph{';
} elsif ($target eq 'latexsource') {
- $currentstring .= "\\emph{";
+ $currentstring .= '\emph{';
}
return $currentstring;
}
@@ -682,13 +772,13 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
} elsif ($target eq 'latexsource') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#----------------------------------------------------------------------------- <q> tag
+#-- <q> tag
sub start_q {
my ($target,$token) = @_;
my $currentstring = '';
@@ -713,16 +803,16 @@ sub end_output {
}
return $currentstring;
}
-#----------------------------------------------------------------------------- <p> tag
+#-- <p> tag
sub start_p {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{\\par ";
+ $currentstring .= '{\par ';
} elsif ($target eq 'latexsource') {
- $currentstring .= "{\\par ";
+ $currentstring .= '{\par ';
}
return $currentstring;
}
@@ -732,22 +822,22 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
} elsif ($target eq 'latexsource') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <br> tag
+#-- <br> tag
sub start_br {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\\\";
+ $currentstring .= '\\';
} elsif ($target eq 'latexsource') {
- $currentstring .= "\\\\";
+ $currentstring .= '\\';
}
return $currentstring;
}
@@ -759,16 +849,16 @@ sub end_output {
}
return $currentstring;
}
-#--------------------------------------------------------------------------- <big> tag
+#-- <big> tag
sub start_big {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{\\large ";
+ $currentstring .= '\large{';
} elsif ($target eq 'latexsource') {
- $currentstring .= "{\\large ";
+ $currentstring .= '\large{';
}
return $currentstring;
}
@@ -778,22 +868,22 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }";
+ $currentstring .= '}';
} elsif ($target eq 'latexsource') {
- $currentstring .= " }";
+ $currentstring .= '}';
}
return $currentstring;
}
-#------------------------------------------------------------------------- <small> tag
+#-- <small> tag
sub start_small {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "{\\footnotesize ";
+ $currentstring .= '\footnotesize{';
} elsif ($target eq 'latexsource') {
- $currentstring .= "{\\footnotesize ";
+ $currentstring .= '\footnotesize{';
}
return $currentstring;
}
@@ -803,13 +893,13 @@ sub end_output {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }";
+ $currentstring .= '}';
} elsif ($target eq 'latexsource') {
- $currentstring .= " }";
+ $currentstring .= '}';
}
return $currentstring;
}
-#---------------------------------------------------------------------- <basefont> tag
+#-- <basefont> tag
sub start_basefont {
my ($target,$token) = @_;
my $currentstring = '';
@@ -826,7 +916,7 @@ sub end_output {
}
return $currentstring;
}
-#-------------------------------------------------------------------------- <font> tag
+#-- <font> tag
sub start_font {
my ($target,$token) = @_;
my $currentstring = '';
@@ -843,7 +933,7 @@ sub end_output {
}
return $currentstring;
}
-#------------------------------------------------------------------------ <strike> tag
+#-- <strike> tag
sub start_strike {
my ($target,$token) = @_;
my $currentstring = '';
@@ -864,7 +954,7 @@ sub end_output {
}
return $currentstring;
}
-#----------------------------------------------------------------------------- <s> tag
+#-- <s> tag
sub start_s {
my ($target,$token) = @_;
my $currentstring = '';
@@ -885,7 +975,7 @@ sub end_output {
}
return $currentstring;
}
-#--------------------------------------------------------------------------- <sub> tag
+#-- <sub> tag
sub start_sub {
my ($target,$token) = @_;
my $currentstring = '';
@@ -906,7 +996,7 @@ sub end_output {
}
return $currentstring;
}
-#--------------------------------------------------------------------------- <sup> tag
+#-- <sup> tag
sub start_sup {
my ($target,$token) = @_;
my $currentstring = '';
@@ -927,7 +1017,7 @@ sub end_output {
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <hr> tag
+#-- <hr> tag
sub start_hr {
my ($target,$token) = @_;
my $currentstring = '';
@@ -947,7 +1037,7 @@ sub end_output {
}
return $currentstring;
}
-#----------------------------------------------------------------------------- <a> tag
+#-- <a> tag
sub start_a {
my ($target,$token) = @_;
my $currentstring = '';
@@ -958,7 +1048,7 @@ sub end_output {
return $currentstring;
}
sub end_a {
- my ($target,$token,$stackref) = @_;
+ my ($target,$token,$tagstack,$stackref) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[2];
@@ -974,9 +1064,9 @@ sub end_output {
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <li> tag
+#-- <li> tag
sub start_li {
- my ($target,$token,$stackref) = @_;
+ my ($target,$token,$tagstack,$stackref) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
@@ -1004,7 +1094,7 @@ sub end_output {
}
return $currentstring;
}
-#----------------------------------------------------------------------------- <u> tag
+#-- <u> tag
sub start_u {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1025,7 +1115,7 @@ sub end_output {
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <ul> tag
+#-- <ul> tag
sub start_ul {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1046,7 +1136,7 @@ sub end_output {
}
return $currentstring;
}
-#-------------------------------------------------------------------------- <menu> tag
+#-- <menu> tag
sub start_menu {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1067,7 +1157,7 @@ sub end_output {
}
return $currentstring;
}
-#--------------------------------------------------------------------------- <dir> tag
+#-- <dir> tag
sub start_dir {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1088,7 +1178,7 @@ sub end_output {
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <ol> tag
+#-- <ol> tag
sub start_ol {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1109,7 +1199,7 @@ sub end_output {
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <dl> tag
+#-- <dl> tag
sub start_dl {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1130,7 +1220,7 @@ sub end_output {
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <dt> tag
+#-- <dt> tag
sub start_dt {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1151,7 +1241,7 @@ sub end_output {
}
return $currentstring;
}
-#---------------------------------------------------------------------------- <dd> tag
+#-- <dd> tag
sub start_dd {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1168,7 +1258,7 @@ sub end_output {
}
return $currentstring;
}
-#------------------------------------------------------------------------- <table> tag
+#-- <table> tag
sub start_table {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1189,7 +1279,7 @@ sub end_output {
}
return $currentstring;
}
-#------------------------------------------------------------------------- <tr> tag
+#-- <tr> tag
sub start_tr {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1210,7 +1300,7 @@ sub end_output {
}
return $currentstring;
}
-#------------------------------------------------------------------------- <td> tag
+#-- <td> tag
sub start_td {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1231,7 +1321,7 @@ sub end_output {
}
return $currentstring;
}
-# -------------------------------------------------------------------------- <img> tag
+#-- <img> tag
sub start_img {
my ($target,$token) = @_;
@@ -1255,7 +1345,7 @@ sub end_output {
}
return $currentstring;
}
-# ----------------------------------------------------------------------- <applet> tag
+#-- <applet> tag
sub start_applet {
my ($target,$token) = @_;
@@ -1282,7 +1372,7 @@ sub end_output {
return $currentstring;
}
-# ------------------------------------------------------------------------ <embed> tag
+#-- <embed> tag
sub start_embed {
my ($target,$token) = @_;
@@ -1307,7 +1397,7 @@ sub end_output {
return $currentstring;
}
-# ------------------------------------------------------------------------ <param> tag
+#-- <param> tag
sub start_param {
my ($target,$token) = @_;
@@ -1336,7 +1426,7 @@ sub end_output {
return $currentstring;
}
-# ------------------------------------------------------------------------ <allow> tag
+#-- <allow> tag
sub start_allow {
my ($target,$token) = @_;
@@ -1349,7 +1439,25 @@ sub end_output {
sub end_allow {
return '';
}
-
-
+#-- Frames
+ sub start_frameset {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ if (!$Apache::lonxml::registered) {
+ $currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';
+ }
+ $currentstring .= $token->[4];
+ }
+ return $currentstring;
+ }
+ sub end_frameset {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($target eq 'web') {
+ $currentstring = $token->[2];
+ }
+ return $currentstring;
+ }
1;
__END__