--- loncom/xml/londefdef.pm 2003/10/01 21:13:50 1.178
+++ loncom/xml/londefdef.pm 2003/10/24 21:25:50 1.187
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.178 2003/10/01 21:13:50 albertel Exp $
+# $Id: londefdef.pm,v 1.187 2003/10/24 21:25:50 albertel Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -50,6 +50,7 @@ use Apache::File();
use Image::Magick;
use Apache::lonmenu();
use Apache::lonmeta();
+use Apache::Constants qw(:common);
$Apache::londefdef::TD_redirection=0;
@@ -140,7 +141,7 @@ sub end_tthoption {
return $result;
}
-#-- <html> tag
+#-- <html> tag (end tag optional)
sub start_html {
my ($target,$token) = @_;
my $currentstring = '';
@@ -159,7 +160,7 @@ sub start_html {
&tth::tthoptions('-L -u0');
}
}
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'edit') {
$currentstring = &Apache::lonxml::xmlbegin().
&Apache::lonxml::fontsettings();
} elsif ($target eq 'tex') {
@@ -188,7 +189,7 @@ sub end_html {
return $currentstring;
}
-#-- <head> tag
+#-- <head> tag (end tag optional)
sub start_head {
my ($target,$token) = @_;
my $currentstring = '';
@@ -201,14 +202,14 @@ sub start_head {
sub end_head {
my ($target,$token) = @_;
my $currentstring = '';
- if ($target eq 'web') {
+ if ($target eq 'web' && $ENV{'request.state'} eq 'published') {
$currentstring = &Apache::lonmenu::registerurl(undef,$target).
$token->[2];
}
return $currentstring;
}
-#-- <map> tag
+#-- <map> tag (end tag required)
sub start_map {
my ($target,$token) = @_;
my $currentstring = '';
@@ -227,13 +228,15 @@ sub end_map {
return $currentstring;
}
-#-- <select> tag
+#-- <select> tag (end tag required)
sub start_select {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
- }
+ } elsif ($target eq 'tex') {
+ $Apache::londefdef::select=0;
+ }
return $currentstring;
}
@@ -246,13 +249,20 @@ sub end_select {
return $currentstring;
}
-#-- <option> tag
+#-- <option> tag (end tag optional)
sub start_option {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
- }
+ } elsif ($target eq 'tex') {
+ $Apache::londefdef::select++;
+ if ($Apache::londefdef::select == 1) {
+ $currentstring='\noindent\fbox{'.&Apache::lonxml::get_param('value',$parstack,$safeeval).'}\keephidden{';
+ } else {
+ $currentstring='\keephidden{';
+ }
+ }
return $currentstring;
}
@@ -261,11 +271,13 @@ sub end_option {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='}';
+ }
return $currentstring;
}
-#-- <input> tag
+#-- <input> tag (end tag forbidden)
sub start_input {
my ($target,$token) = @_;
my $currentstring = '';
@@ -284,7 +296,7 @@ sub end_input {
return $currentstring;
}
-#-- <textarea> tag
+#-- <textarea> tag (end tag required)
sub start_textarea {
my ($target,$token) = @_;
my $currentstring = '';
@@ -303,7 +315,7 @@ sub end_textarea {
return $currentstring;
}
-#-- <form> tag
+#-- <form> tag (end tag required)
sub start_form {
my ($target,$token) = @_;
my $currentstring = '';
@@ -322,7 +334,7 @@ sub end_form {
return $currentstring;
}
-#-- <title> tag
+#-- <title> tag (end tag required)
sub start_title {
my ($target,$token) = @_;
my $currentstring = '';
@@ -333,7 +345,7 @@ sub start_title {
}
if ($target eq 'meta') {
$currentstring='<title>';
- &start_output();
+ &start_output($target);
}
return $currentstring;
}
@@ -347,13 +359,13 @@ sub end_title {
$currentstring .= '}';
}
if ($target eq 'meta') {
- &end_output();
+ &end_output($target);
$currentstring='</title>';
}
return $currentstring;
}
-#-- <meta> tag
+#-- <meta> tag (end tag forbidden)
sub start_meta {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -467,7 +479,7 @@ sub end_accessrule {
return $currentstring;
}
-#-- <body> tag
+#-- <body> tag (end tag required)
sub start_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -476,7 +488,8 @@ sub start_body {
&Apache::lonxml::warning("<body> tag found inside of <problem> tag this can cause problems.");
return '';
}
- if (!$Apache::lonxml::registered) {
+ if (!$Apache::lonxml::registered &&
+ $ENV{'request.state'} eq 'published') {
$currentstring.='<head>'.
&Apache::lonmenu::registerurl(undef,$target).'</head>';
}
@@ -552,7 +565,7 @@ sub end_body {
return $currentstring;
}
-#-- <center> tag
+#-- <center> tag (end tag required)
sub start_center {
my ($target,$token) = @_;
my $currentstring = '';
@@ -575,7 +588,7 @@ sub end_center {
return $currentstring;
}
-#-- <b> tag
+#-- <b> tag (end tag required)
sub start_b {
my ($target,$token) = @_;
my $currentstring = '';
@@ -598,7 +611,7 @@ sub end_b {
return $currentstring;
}
-#-- <strong> tag
+#-- <strong> tag (end tag required)
sub start_strong {
my ($target,$token) = @_;
my $currentstring = '';
@@ -613,8 +626,7 @@ sub start_strong {
sub end_strong {
my ($target,$token) = @_;
my $currentstring = '';
- if ($target eq 'web') {
-
+ if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
$currentstring = '}';
@@ -622,7 +634,7 @@ sub end_strong {
return $currentstring;
}
-#-- <h1> tag
+#-- <h1> tag (end tag required)
sub start_h1 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -643,7 +655,7 @@ sub start_h1 {
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{';
} elsif ($target eq 'meta') {
$currentstring='<subject>';
- &start_output();
+ &start_output($target);
}
return $currentstring;
}
@@ -665,7 +677,7 @@ sub end_h1 {
}
$currentstring .= '}}'.$post;
} elsif ($target eq 'meta') {
- &end_output();
+ &end_output($target);
$currentstring='</subject>';
}
return $currentstring;
@@ -886,14 +898,14 @@ sub end_h6 {
return $currentstring;
}
-#--- <cite> tag
+#--- <cite> tag (end tag required)
sub start_cite {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\textit{";
+ $currentstring .= '\textit{';
}
return $currentstring;
}
@@ -904,12 +916,12 @@ sub end_cite {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <i> tag
+#-- <i> tag (end tag required)
sub start_i {
my ($target,$token) = @_;
my $currentstring = '';
@@ -932,14 +944,14 @@ sub end_i {
return $currentstring;
}
-#-- <address> tag
+#-- <address> tag (end tag required)
sub start_address {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\textit{";
+ $currentstring .= '\textit{';
}
return $currentstring;
}
@@ -950,19 +962,19 @@ sub end_address {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <dfn> tag
+#-- <dfn> tag (end tag required)
sub start_dfn {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\textit{";
+ $currentstring .= '\textit{';
}
return $currentstring;
}
@@ -973,12 +985,12 @@ sub end_dfn {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <tt> tag
+#-- <tt> tag (end tag required)
sub start_tt {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1001,14 +1013,14 @@ sub end_tt {
return $currentstring;
}
-#-- <kbd> tag
+#-- <kbd> tag (end tag required)
sub start_kbd {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\texttt";
+ $currentstring .= '\texttt{';
}
return $currentstring;
}
@@ -1019,12 +1031,12 @@ sub end_kbd {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <code> tag
+#-- <code> tag (end tag required)
sub start_code {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1047,7 +1059,7 @@ sub end_code {
return $currentstring;
}
-#-- <em> tag
+#-- <em> tag (end tag required)
sub start_em {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1070,14 +1082,14 @@ sub end_em {
return $currentstring;
}
-#-- <q> tag
+#-- <q> tag (end tag required)
sub start_q {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\\emph{";
+ $currentstring .= '\emph{';
}
return $currentstring;
}
@@ -1088,12 +1100,12 @@ sub end_q {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= "}";
+ $currentstring .= '}';
}
return $currentstring;
}
-#-- <p> tag
+#-- <p> tag (end tag optional)
sub start_p {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1116,7 +1128,7 @@ sub end_p {
return $currentstring;
}
-#-- <br> tag
+#-- <br> tag (end tag forbidden)
sub start_br {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
@@ -1139,7 +1151,7 @@ sub end_br {
return $currentstring;
}
-#-- <big> tag
+#-- <big> tag (end tag required)
sub start_big {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1162,7 +1174,7 @@ sub end_big {
return $currentstring;
}
-#-- <small> tag
+#-- <small> tag (end tag required)
sub start_small {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1185,7 +1197,7 @@ sub end_small {
return $currentstring;
}
-#-- <basefont> tag
+#-- <basefont> tag (end tag forbidden)
sub start_basefont {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
@@ -1214,7 +1226,7 @@ sub end_basefont {
return $currentstring;
}
-#-- <font> tag
+#-- <font> tag (end tag required)
sub start_font {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $currentstring = '';
@@ -1252,7 +1264,7 @@ sub end_font {
return $currentstring;
}
-#-- <strike> tag
+#-- <strike> tag (end tag required)
sub start_strike {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1278,7 +1290,7 @@ sub end_strike {
return $currentstring;
}
-#-- <s> tag
+#-- <s> tag (end tag required)
sub start_s {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1304,14 +1316,14 @@ sub end_s {
return $currentstring;
}
-#-- <sub> tag
+#-- <sub> tag (end tag required)
sub start_sub {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\$_{ ";
+ $currentstring .= "\$_{";
}
return $currentstring;
}
@@ -1322,19 +1334,19 @@ sub end_sub {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }\$";
+ $currentstring .= "}\$";
}
return $currentstring;
}
-#-- <sup> tag
+#-- <sup> tag (end tag required)
sub start_sup {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
- $currentstring .= "\$^{ ";
+ $currentstring .= "\$^{";
}
return $currentstring;
}
@@ -1345,12 +1357,12 @@ sub end_sup {
if ($target eq 'web') {
$currentstring .= $token->[2];
} elsif ($target eq 'tex') {
- $currentstring .= " }\$";
+ $currentstring .= "}\$";
}
return $currentstring;
}
-#-- <hr> tag
+#-- <hr> tag (end tag forbidden)
sub start_hr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1390,7 +1402,7 @@ sub end_hr {
return $currentstring;
}
-#-- <div> tag
+#-- <div> tag (end tag required)
sub start_div {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1409,7 +1421,7 @@ sub end_div {
return $currentstring;
}
-#-- <a> tag
+#-- <a> tag (end tag required)
sub start_a {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1439,7 +1451,7 @@ sub end_a {
return $currentstring;
}
-#-- <li> tag
+#-- <li> tag (end tag optional)
sub start_li {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1469,7 +1481,7 @@ sub end_li {
return $currentstring;
}
-#-- <u> tag
+#-- <u> tag (end tag required)
sub start_u {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1495,7 +1507,7 @@ sub end_u {
return $currentstring;
}
-#-- <ul> tag
+#-- <ul> tag (end tag required)
sub start_ul {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1538,7 +1550,7 @@ sub end_ul {
return $currentstring;
}
-#-- <menu> tag
+#-- <menu> tag (end tag required)
sub start_menu {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1561,7 +1573,7 @@ sub end_menu {
return $currentstring;
}
-#-- <dir> tag
+#-- <dir> tag (end tag required)
sub start_dir {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1584,7 +1596,7 @@ sub end_dir {
return $currentstring;
}
-#-- <ol> tag
+#-- <ol> tag (end tag required)
sub start_ol {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1637,7 +1649,7 @@ sub end_ol {
return $currentstring;
}
-#-- <dl> tag
+#-- <dl> tag (end tag required)
sub start_dl {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1715,7 +1727,7 @@ sub item_cleanup {
return $item;
}
-#-- <dd> tag
+#-- <dd> tag (end tag optional)
sub start_dd {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -1745,7 +1757,7 @@ sub end_dd {
return $currentstring;
}
-#-- <table> tag
+#-- <table> tag (end tag required)
sub start_table {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $textwidth='';
@@ -1983,14 +1995,11 @@ sub end_td_tex {
$newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;
my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);
foreach my $elementdata (@newdata) {
- $elementdata=~s/^\s+(\S.*)/$1/;
- $elementdata=~s/(.*\S)\s+$/$1/;
- $elementdata=~s/(\s)+/$1/;
- my $lengthnewdata=1.8*length($elementdata);
+ my $lengthnewdata=1.8*LATEX_length($elementdata);
if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}
}
} else {
- $current_length=1.8*length($data);
+ $current_length=1.8*LATEX_length($data);
}
$Apache::londefdef::table[-1]{'length'} .= $current_length.',';
$Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
@@ -2071,7 +2080,7 @@ sub end_th {
}
return $currentstring;
}
-#-- <img> tag
+#-- <img> tag (end tag forbidden)
sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
@@ -2151,7 +2160,9 @@ sub start_img {
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
$temp_file = Apache::File->new('>>'.$filename);
print $temp_file "$src\n";
- $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
+ $newsrc=~s/\/home\/httpd\/html\/res//;
+ $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
+ $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
}
}
} else {
@@ -2168,6 +2179,44 @@ sub start_img {
#<allow> tag will care about replication
}
}
+ } elsif ($target eq 'edit') {
+ $currentstring .=&Apache::edit::tag_start($target,$token);
+ $currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
+ &Apache::edit::browse('src',undef,'alt').' '.
+ &Apache::edit::search('src',undef,'alt').'<br />';
+ $currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
+ $currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);
+ $currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'<br />';
+ $currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5);
+ $currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5);
+ $currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval);
+ my $alt=&Apache::lonxml::get_param('alt',$parstack,$safeeval);
+ my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
+ my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
+ $currentstring .= '<img src="'.$src.'" alt="'.$alt.'" ';
+ if ($width) { $currentstring.=' width="'.$width.'" '; }
+ if ($height) { $currentstring.=' height="'.$height.'" '; }
+ $currentstring .= ' />';
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'src','alt',
+ 'TeXwidth','TeXheight',
+ 'width','height');
+ if (!$token->[2]{'width'} && !$token->[2]{'height'}) {
+ $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+ &image_replication($src);
+ if (-e $src) {
+ my $image = Image::Magick->new;
+ my ($width, $height, $size, $format) = $image->Ping($src);
+ if ($width && $height) {
+ $token->[2]{'width'} =$width;
+ $token->[2]{'height'}=$height;
+ $constructtag=1;
+ }
+ }
+ }
+ if ($constructtag) {$currentstring=&Apache::edit::rebuild_tag($token);}
}
return $currentstring;
}
@@ -2183,7 +2232,7 @@ sub end_img {
return $currentstring;
}
-#-- <applet> tag
+#-- <applet> tag (end tag required)
sub start_applet {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
@@ -2232,7 +2281,7 @@ sub end_applet {
return $currentstring;
}
-#-- <embed> tag
+#-- <embed> tag (end tag optional/required)
sub start_embed {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
@@ -2264,7 +2313,7 @@ sub end_embed {
return $currentstring;
}
-#-- <param> tag
+#-- <param> tag (end tag forbidden)
sub start_param {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
if (&Apache::lonxml::get_param
@@ -2319,12 +2368,14 @@ sub end_allow {
return '';
}
-#-- Frames
+#-- Frames (end tag required)
+#-- <frameset>
sub start_frameset {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
- if (!$Apache::lonxml::registered) {
+ if (!$Apache::lonxml::registered &&
+ $ENV{'request.state'} eq 'published') {
$currentstring.='<head>'.
&Apache::lonmenu::registerurl(undef,$target).'</head>';
}
@@ -2364,7 +2415,7 @@ sub end_frameset {
return $currentstring;
}
-#-- <xmp>
+#-- <xmp> (end tag required)
sub start_xmp {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -2387,7 +2438,7 @@ sub end_xmp {
return $currentstring;
}
-#-- <pre>
+#-- <pre> (end tag required)
sub start_pre {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
@@ -2470,7 +2521,7 @@ sub end_blankspace {
return $currentstring;
}
-#-- <abbr> tag
+#-- <abbr> tag (end tag required)
sub start_abbr {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2489,7 +2540,7 @@ sub end_abbr {
return $currentstring;
}
-#-- <acronym> tag
+#-- <acronym> tag (end tag required)
sub start_acronym {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2508,7 +2559,7 @@ sub end_acronym {
return $currentstring;
}
-#-- <area> tag
+#-- <area> tag (end tag forbidden)
sub start_area {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2527,7 +2578,7 @@ sub end_area {
return $currentstring;
}
-#-- <base> tag
+#-- <base> tag (end tag forbidden)
sub start_base {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2546,7 +2597,7 @@ sub end_base {
return $currentstring;
}
-#-- <bdo> tag
+#-- <bdo> tag (end tag required)
sub start_bdo {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2565,7 +2616,7 @@ sub end_bdo {
return $currentstring;
}
-#-- <bgsound> tag
+#-- <bgsound> tag (end tag optional)
sub start_bgsound {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2584,7 +2635,7 @@ sub end_bgsound {
return $currentstring;
}
-#-- <blink> tag
+#-- <blink> tag (end tag required)
sub start_blink {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2603,7 +2654,7 @@ sub end_blink {
return $currentstring;
}
-#-- <blockquote> tag
+#-- <blockquote> tag (end tag required)
sub start_blockquote {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2622,7 +2673,7 @@ sub end_blockquote {
return $currentstring;
}
-#-- <button> tag
+#-- <button> tag (end tag required)
sub start_button {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2641,7 +2692,7 @@ sub end_button {
return $currentstring;
}
-#-- <caption> tag
+#-- <caption> tag (end tag required)
sub start_caption {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2660,7 +2711,7 @@ sub end_caption {
return $currentstring;
}
-#-- <col> tag
+#-- <col> tag (end tag forbdden)
sub start_col {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2679,7 +2730,7 @@ sub end_col {
return $currentstring;
}
-#-- <colgroup> tag
+#-- <colgroup> tag (end tag optional)
sub start_colgroup {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2698,7 +2749,7 @@ sub end_colgroup {
return $currentstring;
}
-#-- <del> tag
+#-- <del> tag (end tag required)
sub start_del {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2717,7 +2768,7 @@ sub end_del {
return $currentstring;
}
-#-- <fieldset> tag
+#-- <fieldset> tag (end tag required)
sub start_fieldset {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2736,7 +2787,7 @@ sub end_fieldset {
return $currentstring;
}
-#-- <frame> tag
+#-- <frame> tag (end tag forbidden)
sub start_frame {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2755,7 +2806,7 @@ sub end_frame {
return $currentstring;
}
-#-- <iframe> tag
+#-- <iframe> tag (end tag required)
sub start_iframe {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2774,7 +2825,7 @@ sub end_iframe {
return $currentstring;
}
-#-- <ins> tag
+#-- <ins> tag (end tag required)
sub start_ins {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2793,7 +2844,7 @@ sub end_ins {
return $currentstring;
}
-#-- <isindex> tag
+#-- <isindex> tag (end tag forbidden)
sub start_isindex {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2812,7 +2863,7 @@ sub end_isindex {
return $currentstring;
}
-#-- <keygen> tag
+#-- <keygen> tag (end tag forbidden)
sub start_keygen {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2850,7 +2901,7 @@ sub end_label {
return $currentstring;
}
-#-- <layer> tag
+#-- <layer> tag (end tag required)
sub start_layer {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2869,7 +2920,7 @@ sub end_layer {
return $currentstring;
}
-#-- <legend> tag
+#-- <legend> tag (end tag required)
sub start_legend {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2888,7 +2939,7 @@ sub end_legend {
return $currentstring;
}
-#-- <link> tag
+#-- <link> tag (end tag forbidden)
sub start_link {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2907,7 +2958,7 @@ sub end_link {
return $currentstring;
}
-#-- <marquee> tag
+#-- <marquee> tag (end tag optional)
sub start_marquee {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2926,8 +2977,8 @@ sub end_marquee {
return $currentstring;
}
-#-- <malticol> tag
-sub start_malticol {
+#-- <multicol> tag (end tag required)
+sub start_multicol {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
@@ -2936,7 +2987,7 @@ sub start_malticol {
return $currentstring;
}
-sub end_malticol {
+sub end_multicol {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
@@ -2945,13 +2996,15 @@ sub end_malticol {
return $currentstring;
}
-#-- <nobr> tag
+#-- <nobr> tag (end tag required)
sub start_nobr {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='\mbox{';
+ }
return $currentstring;
}
@@ -2960,11 +3013,13 @@ sub end_nobr {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='}';
+ }
return $currentstring;
}
-#-- <noembed> tag
+#-- <noembed> tag (end tag required)
sub start_noembed {
my ($target,$token) = @_;
my $currentstring = '';
@@ -2983,7 +3038,7 @@ sub end_noembed {
return $currentstring;
}
-#-- <noframes> tag
+#-- <noframes> tag (end tag required)
sub start_noframes {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3002,7 +3057,7 @@ sub end_noframes {
return $currentstring;
}
-#-- <nolayer> tag
+#-- <nolayer> tag (end tag required)
sub start_nolayer {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3021,7 +3076,7 @@ sub end_nolayer {
return $currentstring;
}
-#-- <noscript> tag
+#-- <noscript> tag (end tag required)
sub start_noscript {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3040,7 +3095,7 @@ sub end_noscript {
return $currentstring;
}
-#-- <object> tag
+#-- <object> tag (end tag required)
sub start_object {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3059,7 +3114,7 @@ sub end_object {
return $currentstring;
}
-#-- <optgroup> tag
+#-- <optgroup> tag (end tag required)
sub start_optgroup {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3078,13 +3133,15 @@ sub end_optgroup {
return $currentstring;
}
-#-- <samp> tag
+#-- <samp> tag (end tag required)
sub start_samp {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='\texttt{';
+ }
return $currentstring;
}
@@ -3093,7 +3150,9 @@ sub end_samp {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[2];
- }
+ } elsif ($target eq 'tex') {
+ $currentstring='}';
+ }
return $currentstring;
}
@@ -3116,7 +3175,7 @@ sub end_server {
return $currentstring;
}
-#-- <spacer> tag
+#-- <spacer> tag (end tag forbidden)
sub start_spacer {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3135,7 +3194,7 @@ sub end_spacer {
return $currentstring;
}
-#-- <span> tag
+#-- <span> tag (end tag required)
sub start_span {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3154,7 +3213,7 @@ sub end_span {
return $currentstring;
}
-#-- <tbody> tag
+#-- <tbody> tag (end tag optional)
sub start_tbody {
my ($target,$token) = @_;
my $currentstring = '';
@@ -3274,18 +3333,14 @@ sub end_hideweboutput {
sub image_replication {
my $src = shift;
- if (not -e $src) {
- #replicates image itself
- &Apache::lonnet::repcopy($src);
- #replicates eps or ps
- my $newsrc = $src;
- $newsrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
- if (not -e $newsrc) {
- if (&Apache::lonnet::repcopy($newsrc) ne 'OK') {
- $newsrc =~ s/\.eps$/\.ps/;
- &Apache::lonnet::repcopy($newsrc);
- }
- }
+ if (not -e $src) { &Apache::lonnet::repcopy($src); }
+ #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;
+ if (not -e $epssrc && not -e $pssrc) {
+ my $result=&Apache::lonnet::repcopy($epssrc);
+ if ($result ne OK) { &Apache::lonnet::repcopy($pssrc); }
}
return '';
}
@@ -3308,5 +3363,26 @@ sub recalc {
return $value.' mm';
}
+sub LATEX_length {
+ my $garbage=shift;
+ $garbage=~s/^\s+(\S.*)/$1/;
+ $garbage=~s/(.*\S)\s+$/$1/;
+ $garbage=~s/(\s)+/$1/;
+ $garbage=~s/(\\begin{([^\}]+)}|\\end{([^\}]+)})//g;
+ $garbage=~s/(\$\_\{|\$\_|\$\^{|\$\^|\}\$|\$)//g;
+ $garbage=~s/(\\alpha|\\beta|\\gamma|\\delta|\\epsilon|\\verepsilon|\\zeta|\\eta|\\theta|\\vartheta|\\iota|\\kappa|\\lambda|\\mu|\\nu|\\xi|\\pi|\\varpi|\\rho|\\varrho|\\sigma|\\varsigma|\\tau|\\upsilon|\\phi|\\varphi|\\chi|\\psi|\\omega|\\Gamma|\\Delta|\\Theta|\\Lambda|\\Xi|\\Pi|\\Sigma|\\Upsilon|\\Phi|\\Psi|\\Omega)/1/g;
+ $garbage=~s/(\\pm|\\mp|\\times|\\div|\\cdot|\\ast|\\star|\\dagger|\\ddagger|\\amalg|\\cap|\\cup|\\uplus|\\sqcap|\\sqcup|\\vee|\\wedge|\\oplus|\\ominus|\\otimes|\\circ|\\bullet|\\diamond|\\lhd|\\rhd|\\unlhd|\\unrhd|\\oslash|\\odot|\\bigcirc|\\Box|\\Diamond|\\bigtriangleup|\\bigtriangledown|\\triangleleft|\\triangleright|\\setminus|\\wr)/1/g;
+ $garbage=~s/(\\le|\\ll|\\leq|\\ge|\\geq|\\gg|\\neq|\\doreq|\\sim|\\simeq|\\subset|\\subseteq|\\sqsubset|\\sqsubseteq|\\in|\\vdash|\\models|\\supset|\\supseteq|\\sqsupset|\\sqsupseteq|\\ni|\\dash|\\perp|\\approx|\\cong|\\equiv|\\propto|\\prec|\\preceq|\\parallel|\\asymp|\\smile|\\frown|\\bowtie|\\succ|\\succeq|\\mid)/1/g;
+ $garbage=~s/(\\not<|\\\\not\\le|\\not\\prec|\\not\\preceq|\\not\\subset|\\not\\subseteq|\\not\\sqsubseteq|\\not\\in|\\not>|\\not\\ge|\\not\\succ|\\notsucceq|\\not\\supset|\\notsupseteq|\\not\\sqsupseteq|\\notin|\\not=|\\not\\equiv|\\not\\sim|\\not\\simeq|\\not\\approx|\\not\\cong|\\not\\asymp)/1/g;
+ $garbage=~s/(\\leftarrow|\\gets|\\Leftarrow|\\rightarrow|\\to|\\Rightarrow|\\leftrightarrow|\\Leftrightarrow|\\mapsto|\\hookleftarrow|\\leftharpoonup|\\leftkarpoondown|\\rightleftharpoons|\\longleftarrow|\\Longleftarrow|\\longrightarrow|\\Longrightarrow|\\longleftrightarrow|\\Longleftrightarrow|\\longmapsto|\\hookrightarrow|\\rightharpoonup|\\rightharpoondown|\\uparrow|\\Uparrow|\\downarrow|\\Downarrow|\\updownarrow|\\Updownarrow|\\nearrow|\\searrow|\\swarrow|\\nwarrow)/1/g;
+ $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)/ /g;
+ $garbage=~s/(\\hat{([^}]+)}|\\check{([^}]+)}|\\dot{([^}]+)}|\\breve{([^}]+)}|\\acute{([^}]+)}|\\ddot{([^}]+)}|\\grave{([^}]+)}|\\tilde{([^}]+)}|\\mathring{([^}]+)}|\\bar{([^}]+)}|\\vec{([^}]+)})/$1/g;
+ my $value=length($garbage);
+ return $value;
+}
+
+
+
+
1;
__END__