[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm
raeburn
raeburn at source.lon-capa.org
Wed Mar 15 12:53:49 EDT 2023
raeburn Wed Mar 15 16:53:49 2023 EDT
Modified files:
/loncom/xml londefdef.pm
Log:
- Remove trailing whitespace. No code changes.
-------------- next part --------------
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.467 loncom/xml/londefdef.pm:1.468
--- loncom/xml/londefdef.pm:1.467 Wed Mar 15 16:47:59 2023
+++ loncom/xml/londefdef.pm Wed Mar 15 16:53:49 2023
@@ -1,8 +1,8 @@
# The LearningOnline Network with CAPA
-# Tags Default Definition Module
+# Tags Default Definition Module
+#
+# $Id: londefdef.pm,v 1.468 2023/03/15 16:53:49 raeburn Exp $
#
-# $Id: londefdef.pm,v 1.467 2023/03/15 16:47:59 raeburn Exp $
-#
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,19 +25,19 @@
# /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
+## 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
+# 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.
#
-package Apache::londefdef;
+package Apache::londefdef;
use Apache::lonnet;
use strict;
@@ -194,7 +194,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
- # start_body() takes care of emitting the <html>
+ # start_body() takes care of emitting the <html>
} elsif ($target eq 'tex') {
$currentstring .= &latex_header();
@@ -217,7 +217,7 @@
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
&Apache::lonxml::startredirection();
- }
+ }
return $currentstring;
}
@@ -230,7 +230,7 @@
if ($Apache::lonxml::redirection) {
$Apache::londefdef::head = &Apache::lonxml::endredirection();
}
- }
+ }
return $currentstring;
}
@@ -239,8 +239,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -248,8 +248,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -258,7 +258,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
$Apache::londefdef::select=0;
}
@@ -269,8 +269,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -279,7 +279,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
$Apache::londefdef::select++;
if ($Apache::londefdef::select == 1) {
@@ -295,7 +295,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
$currentstring='}';
}
@@ -307,8 +307,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -316,8 +316,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -326,8 +326,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -335,8 +335,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -345,8 +345,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -354,8 +354,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -364,7 +364,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $Apache::londefdef::title =
+ $Apache::londefdef::title =
&Apache::lonxml::get_all_text('/title',$parser,$style);
} elsif ($target eq 'tex') {
$currentstring .= '\keephidden{Title of the document: ';
@@ -383,11 +383,11 @@
# start_title takes care of swallowing the title
} elsif ($target eq 'tex') {
$currentstring .= '}';
- }
+ }
if ($target eq 'meta') {
&end_output($target);
$currentstring='</title>';
- }
+ }
return $currentstring;
}
@@ -555,7 +555,7 @@
if ($args ne '') {
$currentstring = $token->[4];
}
- }
+ }
return $currentstring;
}
@@ -564,7 +564,7 @@
my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
if ($css_href =~ /\S/) {
&Apache::lonxml::extlink($css_href);
- $links .=
+ $links .=
'<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
}
return $links;
@@ -599,7 +599,7 @@
'text' => 'HTML Editor',
'href' => '',
});
- # breadcrumbs (and tools) will be created
+ # breadcrumbs (and tools) will be created
# in start_page->bodytag->innerregister
} else {
# FIXME Where are we?
@@ -613,7 +613,7 @@
$args->{'use_absolute'} = $env{'request.use_absolute'};
}
}
- $currentstring =
+ $currentstring =
&Apache::loncommon::start_page($Apache::londefdef::title,
$Apache::londefdef::head
.$extra_head,$args);
@@ -712,16 +712,16 @@
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring .= &Apache::loncommon::end_page({'discussion' => 1});
} elsif ($target eq 'tex') {
- $currentstring .= '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';
- }
+ $currentstring .= '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';
+ }
return $currentstring;
}
-# \begin{center} causes a new paragprah spacing that looks odd inside
+# \begin{center} causes a new paragprah spacing that looks odd inside
# of a table cell. Same at the end of a \center but with a slightly
# larger space .. hence center_correction and center_end_correction.
#
-sub center_correction { return '\vspace*{-6 mm}'; }
+sub center_correction { return '\vspace*{-6 mm}'; }
sub center_end_correction { return '\vspace*{-7 mm}'; }
#-- <center> tag (end tag required)
@@ -729,12 +729,12 @@
my ($target,$token,$tagstack) = @_;
my $currentstring = &end_p(); # Close off any prior para.
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[4];
+ $currentstring .= $token->[4];
} elsif ($target eq 'tex') {
if (&is_inside_of($tagstack, "table")) {
$currentstring .= ¢er_correction();
}
- $currentstring .= '\begin{center}';
+ $currentstring .= '\begin{center}';
}
return $currentstring;
}
@@ -743,9 +743,9 @@
my ($target,$token,$tagstack) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = '\end{center}';
+ $currentstring = '\end{center}';
if (&is_inside_of($tagstack, "table")) {
$currentstring .= ¢er_end_correction();
}
@@ -759,11 +759,11 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
&disable_para();
- $currentstring .= '\textbf{';
- }
+ $currentstring .= '\textbf{';
+ }
return $currentstring;
}
@@ -771,11 +771,11 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
&enable_para();
$currentstring = '}';
- }
+ }
return $currentstring;
}
@@ -785,11 +785,11 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
&disable_para();
- $currentstring = '\textbf{';
- }
+ $currentstring = '\textbf{';
+ }
return $currentstring;
}
@@ -797,10 +797,10 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
&enable_para();
- $currentstring = '}';
+ $currentstring = '}';
}
return $currentstring;
}
@@ -823,7 +823,7 @@
}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}
- $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+ $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
} elsif ($target eq 'meta') {
$currentstring.='<subject>';
&start_output($target);
@@ -850,7 +850,7 @@
} elsif ($target eq 'meta') {
&end_output($target);
$currentstring='</subject>';
- }
+ }
return $currentstring;
}
@@ -872,8 +872,8 @@
}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}
- $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
- }
+ $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+ }
return $currentstring;
}
@@ -893,7 +893,7 @@
$post='}'.'\vskip 0 mm ';
}
$currentstring .= '}}'.$post;
- }
+ }
return $currentstring;
}
@@ -915,8 +915,8 @@
}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}
- $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
- }
+ $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+ }
return $currentstring;
}
@@ -936,7 +936,7 @@
$post='}'.'\vskip 0 mm ';
}
$currentstring .= '}}'.$post;
- }
+ }
return $currentstring;
}
@@ -958,8 +958,8 @@
}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}
- $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
- }
+ $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+ }
return $currentstring;
}
@@ -979,7 +979,7 @@
$post='}'.'\vskip 0 mm ';
}
$currentstring .= '}}'.$post;
- }
+ }
return $currentstring;
}
@@ -1001,8 +1001,8 @@
}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}
- $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
- }
+ $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+ }
return $currentstring;
}
@@ -1022,7 +1022,7 @@
$post='}'.'\vskip 0 mm ';
}
$currentstring .= '}}'.$post;
- }
+ }
return $currentstring;
}
@@ -1044,8 +1044,8 @@
}
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0);
if (not defined $TeXsize) {$TeXsize="large";}
- $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
- }
+ $currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{';
+ }
return $currentstring;
}
@@ -1065,7 +1065,7 @@
$post='}'.'\vskip 0 mm ';
}
$currentstring .= '}}'.$post;
- }
+ }
return $currentstring;
}
@@ -1111,7 +1111,7 @@
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
$currentstring .= '}';
- }
+ }
return $currentstring;
}
@@ -1146,7 +1146,7 @@
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
$currentstring .= '\textit{';
- }
+ }
return $currentstring;
}
@@ -1215,7 +1215,7 @@
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
$currentstring .= '\texttt{';
- }
+ }
return $currentstring;
}
@@ -1226,7 +1226,7 @@
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
$currentstring .= '}';
- }
+ }
return $currentstring;
}
@@ -1249,7 +1249,7 @@
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
$currentstring .= '}';
- }
+ }
return $currentstring;
}
@@ -1272,7 +1272,7 @@
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
$currentstring .= '}';
- }
+ }
return $currentstring;
}
@@ -1288,7 +1288,7 @@
my $closing_string = ''; # String required to close <p>
# Some tags are <p> fragile meaning that <p> inside of them
-# does not work within TeX mode. This is managed via the
+# does not work within TeX mode. This is managed via the
# counter below:
#
@@ -1388,7 +1388,7 @@
if ($signal != 1) {
$currentstring .= '\strut \\\\ \strut ';
}
-
+
}
return $currentstring;
}
@@ -1410,7 +1410,7 @@
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
$currentstring .= '{\large ';
- }
+ }
return $currentstring;
}
@@ -1453,7 +1453,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
if (defined $basesize) {
@@ -1467,7 +1467,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $basesize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
if (defined $basesize) {
@@ -1483,7 +1483,7 @@
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval);
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
if (defined $fontsize) {
@@ -1497,7 +1497,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
my $fontsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
if (defined $fontsize) {
@@ -1506,7 +1506,7 @@
}
return $currentstring;
}
-
+
#-- <strike> tag (end tag required)
sub start_strike {
my ($target,$token) = @_;
@@ -1515,7 +1515,7 @@
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
&Apache::lonxml::startredirection();
- }
+ }
return $currentstring;
}
@@ -1526,8 +1526,8 @@
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
$currentstring=&Apache::lonxml::endredirection();
- $currentstring=~s/(\S)(\s+)(\S)/$1\}$2\\underline\{$3/g;
- $currentstring=~s/^\s*(\S)/\\underline\{$1/;
+ $currentstring=~s/(\S)(\s+)(\S)/$1\}$2\\underline\{$3/g;
+ $currentstring=~s/^\s*(\S)/\\underline\{$1/;
$currentstring=~s/(\S)\s*$/$1\}/;
}
return $currentstring;
@@ -1541,7 +1541,7 @@
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
&Apache::lonxml::startredirection();
- }
+ }
return $currentstring;
}
@@ -1567,7 +1567,7 @@
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
$currentstring .= '\raisebox{-\smallskipamount}{\scriptsize{';
- }
+ }
return $currentstring;
}
@@ -1590,7 +1590,7 @@
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
$currentstring .= '\raisebox{\smallskipamount}{\scriptsize{';
- }
+ }
return $currentstring;
}
@@ -1614,7 +1614,7 @@
} elsif ($target eq 'tex') {
# <hr /> can't be inside of <sup><sub> thank you LaTeX.
- #
+ #
my $restart_sub = 0;
my $restart_sup = 0;
@@ -1624,7 +1624,7 @@
if (&is_inside_of($tagstack, "sub")) {
$restart_sub = 1;
- $currentstring .= &end_sub($target, $token, $tagstack,
+ $currentstring .= &end_sub($target, $token, $tagstack,
$parstack, $parser, $safeeval);
}
if (&is_inside_of($tagstack, "sup")) {
@@ -1663,7 +1663,7 @@
$currentstring .= &start_sup($target, $token, $tagstack,
$parstack, $parser, $safeeval);
}
- }
+ }
return $currentstring;
}
@@ -1690,12 +1690,12 @@
my $currentstring = &end_p(); # Close enclosing para.
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring .= $token->[4];
- }
+ }
if ($target eq 'tex') {
# 4 possible alignments: left, right, center, and -missing-.
# If inside a table row, we must let the table logic
# do the alignment, however.
- #
+ #
my $endstring = '';
@@ -1706,7 +1706,7 @@
$endstring = '\end{center}';
if (&is_inside_of($tagstack, "table")) {
$currentstring = ¢er_correction().$currentstring;
- $endstring .= ¢er_end_correction();
+ $endstring .= ¢er_end_correction();
}
}
elsif ($align eq 'right') {
@@ -1816,11 +1816,11 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0);
- #FIXME need to support types i and I
+ #FIXME need to support types i and I
if ($type=~/disc/) {
$currentstring .= ' \item[$\bullet$] ';
} elsif ($type=~/circle/) {
@@ -1837,7 +1837,7 @@
$currentstring .= ' \item['.$value.'] ';
} else {
$currentstring .= ' \item ';
- }
+ }
$Apache::londefdef::list_index++;
}
return $currentstring;
@@ -1847,8 +1847,8 @@
my ($target,$token) = @_;
my $currentstring = &end_p(); # In case there's a <p> in the <li>
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[2];
- }
+ $currentstring .= $token->[2];
+ }
return $currentstring;
}
@@ -1860,7 +1860,7 @@
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
&Apache::lonxml::startredirection();
- }
+ }
return $currentstring;
}
@@ -1883,28 +1883,28 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close off enclosing list.
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[4];
+ $currentstring .= $token->[4];
} elsif ($target eq 'tex') {
my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
$Apache::londefdef::list_index=0;
if ($TeXtype eq 'disc') {
$currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'.
- '\renewcommand{\labelitemii}{$\bullet$}'.
+ '\renewcommand{\labelitemii}{$\bullet$}'.
'\renewcommand{\labelitemiii}{$\bullet$}'.
'\renewcommand{\labelitemiv}{$\bullet$}';
} elsif ($TeXtype eq 'circle') {
$currentstring .= '\renewcommand{\labelitemi}{$\circ$}'.
- '\renewcommand{\labelitemii}{$\circ$}'.
+ '\renewcommand{\labelitemii}{$\circ$}'.
'\renewcommand{\labelitemiii}{$\circ$}'.
'\renewcommand{\labelitemiv}{$\circ$}';
} elsif ($TeXtype eq 'square') {
$currentstring .= '\renewcommand{\labelitemi}{$\diamond$}'.
- '\renewcommand{\labelitemii}{$\diamond$}'.
+ '\renewcommand{\labelitemii}{$\diamond$}'.
'\renewcommand{\labelitemiii}{$\diamond$}'.
'\renewcommand{\labelitemiv}{$\diamond$}';
}
- $currentstring .= '\strut \begin{itemize}';
- }
+ $currentstring .= '\strut \begin{itemize}';
+ }
return $currentstring;
}
@@ -1912,13 +1912,13 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
$currentstring = '\end{itemize} \renewcommand{\labelitemi}{$\bullet$}'.
- '\renewcommand{\labelitemii}{$\bullet$}'.
+ '\renewcommand{\labelitemii}{$\bullet$}'.
'\renewcommand{\labelitemiii}{$\bullet$}'.
- '\renewcommand{\labelitemiv}{$\bullet$}\strut ';
- }
+ '\renewcommand{\labelitemiv}{$\bullet$}\strut ';
+ }
return $currentstring;
}
@@ -1927,10 +1927,10 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = " \\begin{itemize} ";
- }
+ $currentstring = " \\begin{itemize} ";
+ }
return $currentstring;
}
@@ -1938,10 +1938,10 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{itemize}";
- }
+ $currentstring = " \\end{itemize}";
+ }
return $currentstring;
}
@@ -1950,10 +1950,10 @@
my ($target,$token) = @_;
my $currentstring = &end_p(); # In case there's a <p> prior to the list.
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[4];
+ $currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= " \\begin{itemize} ";
- }
+ $currentstring .= " \\begin{itemize} ";
+ }
return $currentstring;
}
@@ -1961,10 +1961,10 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = " \\end{itemize}";
- }
+ $currentstring = " \\end{itemize}";
+ }
return $currentstring;
}
@@ -1973,18 +1973,18 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # In case there's a <p> prior to the list.
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[4];
+ $currentstring .= $token->[4];
} elsif ($target eq 'tex') {
$Apache::londefdef::list_index=0;
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
if ($type eq '1') {
$currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'.
- '\renewcommand{\labelenumii}{\arabic{enumii}.}'.
+ '\renewcommand{\labelenumii}{\arabic{enumii}.}'.
'\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
'\renewcommand{\labelenumiv}{\arabic{enumiv}.}';
} elsif ($type eq 'A') {
$currentstring .= '\renewcommand{\labelenumi}{\Alph{enumi}.}'.
- '\renewcommand{\labelenumii}{\Alph{enumii}.}'.
+ '\renewcommand{\labelenumii}{\Alph{enumii}.}'.
'\renewcommand{\labelenumiii}{\Alph{enumiii}.}'.
'\renewcommand{\labelenumiv}{\Alph{enumiv}.}';
} elsif ($type eq 'a') {
@@ -2003,8 +2003,8 @@
'\renewcommand{\labelenumiii}{\Roman{enumiii}.}'.
'\renewcommand{\labelenumiv}{\Roman{enumiv}.}';
}
- $currentstring .= '\strut \begin{enumerate}';
- }
+ $currentstring .= '\strut \begin{enumerate}';
+ }
return $currentstring;
}
@@ -2012,13 +2012,13 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
$currentstring = '\end{enumerate}\renewcommand{\labelenumi}{\arabic{enumi}.}'.
'\renewcommand{\labelenumii}{\arabic{enumii}.}'.
'\renewcommand{\labelenumiii}{\arabic{enumiii}.}'.
- '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut ';
- }
+ '\renewcommand{\labelenumiv}{\arabic{enumiv}.}\strut ';
+ }
return $currentstring;
}
@@ -2027,7 +2027,7 @@
my ($target,$token) = @_;
my $currentstring = &end_p(); # In case there's a <p> unclosed prior to the list.
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[4];
+ $currentstring .= $token->[4];
} elsif ($target eq 'tex') {
$currentstring .= '\begin{description}';
$Apache::londefdef::DL++;
@@ -2035,7 +2035,7 @@
$Apache::londefdef::DD[$Apache::londefdef::DL]=0;
$Apache::londefdef::DT[$Apache::londefdef::DL]=0;
$Apache::londefdef::seenDT[$Apache::londefdef::DL]=0;
- }
+ }
return $currentstring;
}
@@ -2043,7 +2043,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
@@ -2051,12 +2051,12 @@
$currentstring.=' '.$element.' ';
}
pop(@Apache::londefdef::description);
- $currentstring.='\end{description}';
+ $currentstring.='\end{description}';
delete($Apache::londefdef::DD[$Apache::londefdef::DL]);
delete($Apache::londefdef::DT[$Apache::londefdef::DL]);
delete($Apache::londefdef::seenDT[$Apache::londefdef::DL]);
$Apache::londefdef::DL--;
- }
+ }
return $currentstring;
}
@@ -2065,14 +2065,14 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring='';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
if ($Apache::londefdef::DD[-1]) { &end_dd(@_); }
&Apache::lonxml::startredirection();
$Apache::londefdef::DT[-1]++;
$Apache::londefdef::seenDT[-1]=1;
- }
+ }
return $currentstring;
}
@@ -2080,14 +2080,14 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
if ($Apache::londefdef::DT[-1]) {
my $data=&item_cleanup();
push(@{$Apache::londefdef::description[-1]},'\item['.$data.'] \strut \vskip 0mm');
$Apache::londefdef::DT[-1]--;
}
- }
+ }
return $currentstring;
}
@@ -2103,7 +2103,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
if ($Apache::londefdef::DT[-1]) { &end_dt(@_); }
if ($Apache::londefdef::DD[-1]) { &end_dd(@_);}
@@ -2114,7 +2114,7 @@
$Apache::londefdef::description[-1]->[-1].=' \strut ';
$Apache::londefdef::DD[-1]++;
&Apache::lonxml::startredirection();
- }
+ }
return $currentstring;
}
@@ -2122,7 +2122,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
$Apache::londefdef::description[-1]->[-1].=
&Apache::lonxml::endredirection().' \vskip 0mm ';
@@ -2134,7 +2134,7 @@
#-- <table> tag (end tag required)
# <table> also ends any prior <p> that is not closed.
# but, unless I allow <p>'s to nest, that's the
-# only way I could think of to allow <p> in
+# only way I could think of to allow <p> in
# <tr> <th> bodies
#
#list of supported attributes: border,width,TeXwidth,TeXtheme
@@ -2144,7 +2144,7 @@
my $textwidth = '';
my $currentstring = &end_p();
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[4];
+ $currentstring .= $token->[4];
} elsif ($target eq 'tex') {
&disable_para(); # Can't have paras in a table.
@@ -2212,12 +2212,12 @@
}
return $currentstring;
}
-
+
sub end_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
@@ -2237,7 +2237,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $align = &Apache::lonxml::get_param('align', $parstack, $safeeval, undef, 1);
@@ -2271,21 +2271,21 @@
push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
push @ {$Apache::londefdef::table[-1]{'content'}}, [];
}
- }
+ }
return $currentstring;
}
-
+
sub end_tr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close any pending <p> in the row.
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[2];
+ $currentstring .= $token->[2];
} elsif ($target eq 'tex') {
# In case the user is missing a </td> or </th> tag:
if ($Apache::londefdef::TD_redirection) {
- &end_td_tex($parstack,$parser,$safeeval);
+ &end_td_tex($parstack,$parser,$safeeval);
}
$Apache::londefdef::table[-1]->end_row();
@@ -2295,7 +2295,7 @@
if (0) {
if ($Apache::londefdef::TD_redirection) {
- &end_td_tex($parstack,$parser,$safeeval);
+ &end_td_tex($parstack,$parser,$safeeval);
}
# Counter columns must be the maximum number of columns seen
# in the table so far so:
@@ -2314,17 +2314,17 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
$Apache::londefdef::TD_redirection = 1;
&tag_check('tr','td',$tagstack,$parstack,$parser,$safeeval);
- }
+ }
return $currentstring;
-}
-
+}
+
sub tag_check {
my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_;
- my @ar=@$parstack;
+ my @ar=@$parstack;
for (my $i=$#ar-1;$i>=0;$i--) {
if (lc($$tagstack[$i]) eq $good_tag) {
&start_td_tex($parstack,$parser,$safeeval);
@@ -2346,7 +2346,7 @@
sub cell_config_hash {
my ($align, $rowspan, $colspan, $width) = @_;
if ($rowspan ne '') {
- $rowspan =~ s/^\s+|\s+$//g;
+ $rowspan =~ s/^\s+|\s+$//g;
}
if ($colspan ne '') {
$colspan =~ s/^\s+|\s+$//g;
@@ -2366,7 +2366,7 @@
}
return \%config;
}
-
+
sub start_td_tex {
my ($parstack,$parser,$safeeval) = @_;
@@ -2383,7 +2383,7 @@
my $table = $Apache::londefdef::table[-1];
$table->add_cell('', $config);
-
+
#------------------------------------------------
# Old table code.
@@ -2421,7 +2421,7 @@
if (0) {
my ($parstack,$parser,$safeeval) = @_;
my $current_row = $Apache::londefdef::table[-1]{'row_number'};
- my $current_column = $Apache::londefdef::table[-1]{'counter_columns'};
+ my $current_column = $Apache::londefdef::table[-1]{'counter_columns'};
my $data = &Apache::lonxml::endredirection();
# The rowspan array of the table indicates which cells are part of a span.
@@ -2431,14 +2431,14 @@
# If this and subsequent cells are part of a rowspan, we must
# push along the row until we find one that is not.
- while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column])
+ while ((defined $Apache::londefdef::table[-1]{'rowspan'}[$current_row] [$current_column])
&& ($Apache::londefdef::table[-1]{'rowspan'}[$current_row][$current_column] =~ /[\^\_]/)) {
# Part of a span.
push @ {$Apache::londefdef::table[-1]{'content'}[-1]}, '';
$current_column++;
}
$Apache::londefdef::table[-1]{'counter_columns'} = $current_column;
-
+
# Get the column and row spans.
# Colspan can be done via \multicolumn if I can figure out the data structs.
@@ -2514,9 +2514,9 @@
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
}
- $data=~s/\\\\\s*$//;
- } else {
- $data=~s/^\s+(\S.*)/$1/;
+ $data=~s/\\\\\s*$//;
+ } else {
+ $data=~s/^\s+(\S.*)/$1/;
$data=~s/(.*\S)\s+$/$1/;
$data=~s/(\s)+/$1/;
my ($current_length,$min_length)=(0,0);
@@ -2547,13 +2547,13 @@
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
}
- }
+ }
}
# Substitute all of the tables nested in this cell in their appropriate places.
my $nested_count = $#{$Apache::londefdef::table[-1]{'include'}}; # This one is constant...
- for (my $in=0; $in<=$nested_count; $in++) {
+ for (my $in=0; $in<=$nested_count; $in++) {
my $nested = shift @{$Apache::londefdef::table[-1]{'include'}};
$nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/;
# $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
@@ -2592,7 +2592,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
$Apache::londefdef::TD_redirection =0;
&end_td_tex($parstack,$parser,$safeeval);
@@ -2605,17 +2605,17 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
$Apache::londefdef::TD_redirection = 1;
&tagg_check('tr','th',$tagstack,$parstack,$parser,$safeeval);
- }
+ }
return $currentstring;
-}
-
+}
+
sub tagg_check {
my ($good_tag,$bad_tag,$tagstack,$parstack,$parser,$safeeval) = @_;
- my @ar=@$parstack;
+ my @ar=@$parstack;
for (my $i=$#ar-1;$i>=0;$i--) {
if (lc($$tagstack[$i]) eq $good_tag) {
&start_th_tex($parstack,$parser,$safeeval);
@@ -2629,7 +2629,7 @@
}
return '';
}
-
+
sub start_th_tex {
my ($parstack,$parser,$safeeval) = @_;
@@ -2708,8 +2708,8 @@
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$fwidth;
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
- } else {
- $data=~s/^\s+(\S.*)/$1/;
+ } else {
+ $data=~s/^\s+(\S.*)/$1/;
$data=~s/(.*\S)\s+$/$1/;
$data=~s/(\s)+/$1/;
my ($current_length,$min_length)=(0,0);
@@ -2738,9 +2738,9 @@
push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
push @ {$Apache::londefdef::table[-1]{'maxlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$current_length;
push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
- }
+ }
}
- for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {
+ for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {
$data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
}
#make data bold
@@ -2754,32 +2754,32 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = &end_p(); # Close any open <p> in the row.
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[2];
+ $currentstring .= $token->[2];
} elsif ($target eq 'tex') {
$Apache::londefdef::TD_redirection =0;
&end_th_tex($parstack,$parser,$safeeval);
}
return $currentstring;
}
-
+
#-- <img> tag (end tag forbidden)
#
# Render the <IMG> tag.
-# <IMG> has the following attributes (in addition to the
+# <IMG> has the following attributes (in addition to the
# standard HTML ones:
# TeXwrap - Governs how the tex target will try to wrap text around
# horizontally aligned images.
# TeXwidth - The width of the image when rendered for print (mm).
# TeXheight - The height of the image when rendered for print (mm)
# (Note there seems to also be support for this as a % of page size)
-#
+#
sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
undef,1);
- if (! $src &&
+ if (! $src &&
($target eq 'web' || $target eq 'webgrade' || $target eq 'tex')
- ) {
+ ) {
my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);
return '';
}
@@ -2792,7 +2792,7 @@
# Render unto browsers that which are the browser's...
if ($target eq 'web' || $target eq 'webgrade') {
- my $enc = ('yes' eq
+ my $enc = ('yes' eq
lc(&Apache::lonxml::get_param('encrypturl',$parstack,
$safeeval)));
unless ($src =~ m{^data\:image/gif;base64,}) {
@@ -2808,7 +2808,7 @@
# simulate the alignments offered by html.
#
#
- my $align = lc(&Apache::lonxml::get_param('align',
+ my $align = lc(&Apache::lonxml::get_param('align',
$parstack,
$safeeval,
undef,1));
@@ -2818,7 +2818,7 @@
#
&Apache::lonxml::debug("Alignemnt = $align");
# LaTeX's image/text wrapping is really bad since it wants to
- # make figures float.
+ # make figures float.
# The user has the optional parameter (applicable only to l/r
# alignment to use the picins/parpic directive to get wrapped text
# this is also imperfect.. that's why we give them a choice...
@@ -2855,25 +2855,25 @@
if ($width_param) { $size.='width='.$width_param.' mm,'; }
if ($height_param) { $size.='height='.$height_param.' mm]'; }
# Default size if not able to extract that (e.g. eps image).
-
+
# &Apache::lonnet::logthis("Size = $size");
-
+
$size='['.$size;
- $size=~s/,$/]/;
+ $size=~s/,$/]/;
$currentstring .= '\graphicspath{{'.$path.'}}'
.'\includegraphics'.$size.'{'.$file.'} ';
my $closure;
- ($currentstring, $closure) = &align_latex_image($align,
- $latex_rendering,
- $currentstring,
- $width_param,
+ ($currentstring, $closure) = &align_latex_image($align,
+ $latex_rendering,
+ $currentstring,
+ $width_param,
$height_param);
$currentstring .= $closure;
} else {
&Apache::lonxml::debug("$src does not exist");
#original image file doesn't exist so check the alt attribute
- my $alt =
+ my $alt =
&Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
unless ($alt) {
$alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
@@ -2901,7 +2901,7 @@
['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2);
my $alt= &Apache::lonxml::get_param('alt',$parstack,$safeeval);
my $enc= &Apache::lonxml::get_param('encrypturl',$parstack,$safeeval);
-
+
$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl',
['no','yes'], $token, 2);
if (($alt=~/\S/) && (lc($enc) eq 'yes')) {
@@ -2911,7 +2911,7 @@
my $src= &Apache::lonxml::get_param('src',$parstack,$safeeval);
my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
- my $element = &Apache::edit::get_element('src');
+ my $element = &Apache::edit::get_element('src');
my $text;
if ($token->[2]{'src'}=~/\$/) {
$text = &mt('Variable image source');
@@ -2944,7 +2944,7 @@
}
if ($osrc ne $nsrc || (!$nwidth && !$nheight)) {
# changed image or no size specified,
- # if they didn't explicitly change the
+ # if they didn't explicitly change the
# width or height use the ones from the image
if ($iwidth && $iheight) {
if ($owidth == $nwidth || (!$nwidth && !$nheight)) {
@@ -2983,7 +2983,7 @@
#-- <applet> tag (end tag required)
sub start_applet {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-
+
my $code=&Apache::lonxml::get_param('code',$parstack,$safeeval,undef,1);
&Apache::lonxml::extlink($code);
my $archive=&Apache::lonxml::get_param('archive',$parstack,$safeeval,
@@ -3004,7 +3004,7 @@
if (&is_inside_of($tagstack, "sub")) {
$restart_sub = 1;
- $currentstring .= &end_sub($target, $token, $tagstack,
+ $currentstring .= &end_sub($target, $token, $tagstack,
$parstack, $parser, $safeeval);
}
if (&is_inside_of($tagstack, "sup")) {
@@ -3036,7 +3036,7 @@
$currentstring .= &start_sup($target, $token, $tagstack,
$parstack, $parser, $safeeval);
}
- }
+ }
return $currentstring;
}
@@ -3046,20 +3046,20 @@
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- }
+ }
return $currentstring;
}
#-- <embed> tag (end tag optional/required)
-sub start_embed {
+sub start_embed {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
&Apache::lonxml::extlink($src);
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
+ $currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src});
} elsif ($target eq 'tex') {
- }
+ }
return $currentstring;
}
@@ -3124,7 +3124,7 @@
}
$currentstring = &Apache::lonenc::encrypt_ref($token,\%toconvert);
} elsif ($target eq 'tex') {
- }
+ }
return $currentstring;
}
@@ -3132,9 +3132,9 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
- }
+ }
return $currentstring;
}
@@ -3169,8 +3169,8 @@
sub start_frameset {
my ($target,$token) = @_;
my $currentstring = ''; # Close any pending para.
- if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring =
+ if ($target eq 'web' || $target eq 'webgrade') {
+ $currentstring =
&Apache::loncommon::start_page($Apache::londefdef::title,
$Apache::londefdef::head,
{'add_entries' => $token->[2],
@@ -3199,7 +3199,7 @@
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
$currentstring .= '\begin{verbatim}';
- }
+ }
return $currentstring;
}
@@ -3223,7 +3223,7 @@
} elsif ($target eq 'tex') {
$currentstring .= '\begin{verbatim}';
&Apache::lonxml::disable_LaTeX_substitutions();
- }
+ }
return $currentstring;
}
@@ -3304,8 +3304,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3313,8 +3313,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3323,8 +3323,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3332,8 +3332,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3342,8 +3342,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3351,8 +3351,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3361,7 +3361,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
}
return $currentstring;
}
@@ -3370,8 +3370,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3380,8 +3380,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3389,8 +3389,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3399,8 +3399,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3408,8 +3408,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3418,8 +3418,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3427,8 +3427,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3437,8 +3437,8 @@
my ($target,$token) = @_;
my $currentstring = &end_p(); # Close any unclosed <p>
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[4];
- }
+ $currentstring .= $token->[4];
+ }
if ($target eq 'tex') {
$currentstring .= '\begin{quote}';
}
@@ -3449,8 +3449,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
if ($target eq 'tex') {
$currentstring = '\end{quote}';
}
@@ -3462,8 +3462,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3471,8 +3471,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3481,7 +3481,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
}
return $currentstring;
}
@@ -3491,7 +3491,7 @@
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring = $token->[2];
- }
+ }
return $currentstring;
}
@@ -3500,8 +3500,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3509,8 +3509,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3519,8 +3519,8 @@
my ($target,$token,$tagstack, $parstack, $parser, $safeeval, $style) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
if ($target eq 'tex') {
# TODO: Ensure this tag is in a table:
@@ -3549,8 +3549,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3560,11 +3560,11 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
&disable_para();
- $currentstring .= '\st{';
- }
+ $currentstring .= '\st{';
+ }
return $currentstring;
}
@@ -3572,11 +3572,11 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
&enable_para();
$currentstring = '}';
- }
+ }
return $currentstring;
}
@@ -3585,8 +3585,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3594,8 +3594,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3604,8 +3604,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3613,8 +3613,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3648,7 +3648,7 @@
$query.='&inhibitmenu=yes';
} else {
$query = 'inhibitmenu=yes';
- }
+ }
$currentstring .= 'src="'.$url.'?'.$query.'" ';
} else {
$currentstring .= lc($attrib).'="'.$token->[2]->{$attrib}.'" ';
@@ -3692,8 +3692,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3702,8 +3702,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3711,8 +3711,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3721,8 +3721,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3730,8 +3730,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3740,8 +3740,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3749,8 +3749,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3759,8 +3759,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3768,8 +3768,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3778,8 +3778,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3787,8 +3787,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3797,8 +3797,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3806,8 +3806,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3819,8 +3819,8 @@
my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval,
undef,1);
&Apache::lonxml::extlink($href);
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3828,8 +3828,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3838,8 +3838,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3847,8 +3847,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3857,8 +3857,8 @@
my ($target,$token) = @_;
my $currentstring = &end_p(); # Close any pending <p>
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[4];
- }
+ $currentstring .= $token->[4];
+ }
return $currentstring;
}
@@ -3866,8 +3866,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3876,7 +3876,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
$currentstring='\mbox{';
}
@@ -3887,7 +3887,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
$currentstring='}';
}
@@ -3899,8 +3899,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3908,8 +3908,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3918,8 +3918,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3927,8 +3927,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3937,8 +3937,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3946,8 +3946,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3956,8 +3956,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3965,8 +3965,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3975,8 +3975,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -3984,8 +3984,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -3994,8 +3994,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -4003,8 +4003,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -4013,7 +4013,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
$currentstring='\texttt{';
}
@@ -4024,7 +4024,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
$currentstring='}';
}
@@ -4036,8 +4036,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -4045,8 +4045,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -4055,8 +4055,8 @@
my ($target,$token) = @_;
my $currentstring = &end_p(); # Close off any open <p> tag.
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring .= $token->[4];
- }
+ $currentstring .= $token->[4];
+ }
return $currentstring;
}
@@ -4064,8 +4064,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -4076,7 +4076,7 @@
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $endstring = '';
my $family = &get_css_property('font-family',$parstack,$safeeval);
@@ -4103,7 +4103,7 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
my $endstring = pop @span_end_stack;
$currentstring .= $endstring;
@@ -4116,8 +4116,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
if ($target eq 'tex') {
# TODO: Ensure this tag is within a table:
@@ -4131,8 +4131,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
if($target eq 'tex') {
# TODO: Ensure this tag is within a table:
@@ -4147,8 +4147,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
if ($target eq 'tex') {
# TODO: ensure this is within a table tag.
my $table = $Apache::londefdef::table[-1];
@@ -4161,10 +4161,10 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
if ($target eq 'tex') {
- # TODO: Ensure this is in side a table
+ # TODO: Ensure this is in side a table
my $table = $Apache::londefdef::table[-1];
$table->end_foot();
}
@@ -4176,8 +4176,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
if ($target eq 'tex') {
# Assume we're in a table... TODO: Verify that and ignore tag if not.
my $table = $Apache::londefdef::table[-1];
@@ -4190,8 +4190,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
if ($target eq 'tex') {
# TODO: Verify we are in a table and ignore tag if not.
@@ -4206,9 +4206,9 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = '\textit{';
+ $currentstring = '\textit{';
}
return $currentstring;
}
@@ -4219,8 +4219,8 @@
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = '}';
- }
+ $currentstring = '}';
+ }
return $currentstring;
}
@@ -4229,8 +4229,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[4];
- }
+ $currentstring = $token->[4];
+ }
return $currentstring;
}
@@ -4238,8 +4238,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
- }
+ $currentstring = $token->[2];
+ }
return $currentstring;
}
@@ -4247,8 +4247,8 @@
sub start_hideweboutput {
my ($target,$token) = @_;
if ($target eq 'web' || $target eq 'webgrade') {
- &Apache::lonxml::startredirection();
- }
+ &Apache::lonxml::startredirection();
+ }
return '';
}
@@ -4256,8 +4256,8 @@
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = &Apache::lonxml::endredirection();
- }
+ $currentstring = &Apache::lonxml::endredirection();
+ }
return '';
}
@@ -4265,7 +4265,7 @@
sub image_replication {
my $src = shift;
if (not -e $src) { &Apache::lonnet::repcopy($src); }
- #replicates eps or ps
+ #replicates eps or ps
my $epssrc = my $pssrc = $src;
$epssrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
$pssrc =~ s/\.(gif|jpg|jpeg|png)$/.ps/i;
@@ -4288,9 +4288,9 @@
$width_param = $width_param * $scaling;
#do we have any specified LaTeX size of the picture?
- my $toget='TeXwidth';
- if ($cis) {
- $toget=lc($toget);
+ my $toget='TeXwidth';
+ if ($cis) {
+ $toget=lc($toget);
}
my $TeXwidth = &Apache::lonxml::get_param($toget,$parstack,
$safeeval,$depth,$cis);
@@ -4300,11 +4300,11 @@
#do we have any specified web size of the picture?
my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
$depth,1);
- if ($TeXwidth) {
+ if ($TeXwidth) {
my $old_width_param=$width_param;
if ($TeXwidth=~/(\d+)\s*\%/) {
$width_param = $1*$env{'form.textwidth'}/100;
- } else {
+ } else {
$width_param = $TeXwidth;
}
if ($TeXheight) {
@@ -4338,7 +4338,7 @@
sub image_size {
my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
- #size of image from gif/jpg/jpeg/png
+ #size of image from gif/jpg/jpeg/png
my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
if (-e $ressrc) {
$src = $ressrc;
@@ -4351,7 +4351,7 @@
undef($image);
($height_param, $width_param) = &resize_image($height_param, $width_param,
- $scaling, $parstack, $safeeval,
+ $scaling, $parstack, $safeeval,
$depth, $cis);
return ($height_param, $width_param);
@@ -4437,9 +4437,9 @@
}
sub eps_generation {
- my ($src,$file,$width_param) = @_;
+ my ($src,$file,$width_param) = @_;
my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
- if (open(my $tmpfile,">>$filename")) {
+ if (open(my $tmpfile,">>$filename")) {
print $tmpfile "$src\n";
close($tmpfile);
}
@@ -4460,13 +4460,13 @@
}
}
-sub file_path {
+sub file_path {
my $src=shift;
- my ($file,$path);
+ my ($file,$path);
if ($src =~ m!(.*)/([^/]*)$!) {
- $file = $2;
- $path = $1.'/';
- }
+ $file = $2;
+ $path = $1.'/';
+ }
return $file,$path;
}
@@ -4492,8 +4492,8 @@
sub LATEX_length {
my $garbage=shift;
$garbage=~s/^\s+$//;
- $garbage=~s/^\s+(\S.*)/$1/;#space before
- $garbage=~s/(.*\S)\s+$/$1/;#space after
+ $garbage=~s/^\s+(\S.*)/$1/;#space before
+ $garbage=~s/(.*\S)\s+$/$1/;#space after
$garbage=~s/(\s)+/$1/;#only one space
$garbage=~s/(\\begin\{([^\}]+)}|\\end\{([^\}]+)})//g;#remove LaTeX \begin{...} and \end{...}
$garbage=~s/(\$\_\{|\$\_|\$\^\{|\$\^|\}\$)//g;#remove $_{,$_,$^{,$^,}$
@@ -4507,8 +4507,8 @@
$garbage=~s/(\\aleph|\\hbar|\\imath|\\jmath|\\ell|\\wp|\\Re|\\Im|\\mho|\\prime|\\emptyset|\\nabla|\\surd|\\partial|\\top|\\bot|\\vdash|\\dashv|\\forall|\\exists|\\neg|\\flat|\\natural|\\sharp|\\\||\\angle|\\backslash|\\Box|\\Diamond|\\triangle|\\clubsuit|\\diamondsuit|\\heartsuit|\\spadesuit|\\Join|\\infty)/11/g;
$garbage=~s/(\\hat\{([^}]+)}|\\check\{([^}]+)}|\\dot\{([^}]+)}|\\breve\{([^}]+)}|\\acute\{([^}]+)}|\\ddot\{([^}]+)}|\\grave\{([^}]+)}|\\tilde\{([^}]+)}|\\mathring\{([^}]+)}|\\bar\{([^}]+)}|\\vec\{([^}]+)})/$1/g;
#remove some other LaTeX command
- $garbage=~s|\\(\w+)\\|\\|g;
- $garbage=~s|\\(\w+)(\s*)|$2|g;
+ $garbage=~s|\\(\w+)\\|\\|g;
+ $garbage=~s|\\(\w+)(\s*)|$2|g;
$garbage=~s|\+|11|g;
my $value=length($garbage);
return $value;
@@ -4528,8 +4528,8 @@
# If there's an alignment specification we need to honor it here.
# For the horizontal alignments, we will also honor the
# value of the latex specfication. The default is parbox,
- # and that's used for illegal values too.
- #
+ # and that's used for illegal values too.
+ #
# Even though we set a default alignment value, the user
# could have given us an illegal value. In that case we
# just use the default alignment of bottom..
@@ -4541,8 +4541,8 @@
my $offset = $height/2;
$currentstring .= '\raisebox{-'.$offset.'mm}{'.$image;
$closure = '}';
- } elsif ($align eq "left") {
- if ($latex_rendering eq "parpic") {
+ } elsif ($align eq "left") {
+ if ($latex_rendering eq "parpic") {
$currentstring .= '\parpic[l]{'.$image;
$closure = '}';
} elsif ($latex_rendering eq "parbox") {
@@ -4551,12 +4551,12 @@
$closure = '\end{minipage}';
} elsif ($latex_rendering eq "wrapfigure"
|| $latex_rendering ne 'none') { # wrapfig render
- $currentstring .=
+ $currentstring .=
'\begin{wrapfigure}{l}{'.$width.'mm}'
.'\scalebox{1.0}{'.$image;
$closure = '}\end{wrapfigure}';
}
- } elsif ($align eq "right") {
+ } elsif ($align eq "right") {
if ($latex_rendering eq "parpic") {
$currentstring .= '\parpic[r]{'.$image;
$closure = '}';
@@ -4566,7 +4566,7 @@
$closure = '\end{minipage}';
} elsif ($latex_rendering eq "wrapfigure"
|| $latex_rendering ne 'none') { # wrapfig render
- $currentstring .=
+ $currentstring .=
'\begin{wrapfigure}{r}{'.$width.'mm}'
.'\scalebox{1.0}{'.$image;
$closure = '}\end{wrapfigure}';
@@ -4599,12 +4599,12 @@
my ($mode) = @_;
my $currentstring = '';
- $currentstring .=
+ $currentstring .=
"\n% &Apache::lonxml::londefdef \n" .
'\documentclass[letterpaper,twoside]{article}\raggedbottom';
if (($env{'form.latex_type'}=~'batchmode') ||
- (!$env{'request.role.adv'}) ||
- ($mode eq 'batchmode')) {$currentstring .='\batchmode';}
+ (!$env{'request.role.adv'}) ||
+ ($mode eq 'batchmode')) {$currentstring .='\batchmode';}
$currentstring .= '\newcommand{\keephidden}[1]{}'.
'\renewcommand{\deg}{$^{\circ}$}'.
'\usepackage{multirow}'."\n".
@@ -4639,12 +4639,12 @@
$currentstring .= '\usepackage{hyperref}'.
'\usepackage{eforms}'.
'\usepackage{tabularx}';
- }
-
+ }
+
$currentstring .= '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
'\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
$currentstring .= '\begin{document}';
-
+
return $currentstring;
}
@@ -4673,7 +4673,7 @@
return $cleanhref;
}
} else {
- if ($href =~ m{/}) {
+ if ($href =~ m{/}) {
(my $path,$fname) = ($href =~ m{^(.*)/([^/]*)$});
$hrefpath = $relpath.$path;
if ($path eq '') {
@@ -4752,12 +4752,12 @@
it's initial ht. and wid. This allows sizing of
images that are generated on-the-fly (e.g. gnuplot)
as well as serving as a utility for image_size.
-
+
Parameter:
height_param
width_param - Initial picture dimensions.
scaling - A scale factor.
- parstack, - the current stack of tag attributes
+ parstack, - the current stack of tag attributes
from the xml parser
safeeval, - pointer to the safespace
depth, - from what level in the stack to look for attributes
@@ -4782,9 +4782,9 @@
=item recalc()
- Converts a measurement in to mm from any of
+ Converts a measurement in to mm from any of
the other valid LaTeX units of measure.
- If the units of measure are missing from the
+ If the units of measure are missing from the
parameter, it is assumed to be in and returned
with mm units of measure
@@ -4792,7 +4792,7 @@
=item align_latex_image()
- Wrap image 'stuff' inside of the LaTeX required to implement
+ Wrap image 'stuff' inside of the LaTeX required to implement
alignment:
align_tex_image(align, latex_rendering, image)
Where:
@@ -4807,7 +4807,7 @@
=item is_inside_of($tagstack, $tag)
- This sub returns true if the current state of Xml processing is inside of the tag.
+ This sub returns true if the current state of Xml processing is inside of the tag.
Parameters:
tagstack - The tagstack from the parser.
tag - The tag (without the <>'s.).
@@ -4822,7 +4822,7 @@
and PosterImageSrc) for which dependency is another file uploaded to the same
course.
- Required input:
+ Required input:
href - dependency (either a relative URL, or an absolute URL)
Optional inputs:
docuri - URL of HTML page containing the dependency
More information about the LON-CAPA-cvs
mailing list