--- loncom/xml/londefdef.pm 2003/02/18 22:19:30 1.117
+++ loncom/xml/londefdef.pm 2003/02/28 21:06:42 1.120
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.117 2003/02/18 22:19:30 www Exp $
+# $Id: londefdef.pm,v 1.120 2003/02/28 21:06:42 albertel Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -44,13 +44,13 @@
package Apache::londefdef;
-use Apache::lonnet;
+use Apache::lonnet();
use strict;
-use Apache::lonxml;
+use Apache::lonxml();
use Apache::File();
use Image::Magick;
-use Apache::lonmenu;
-#use Apache::lonmeta;
+use Apache::lonmenu();
+use Apache::lonmeta();
BEGIN {
@@ -123,6 +123,7 @@ sub start_tthoption {
&tth::tthoptions($inside);
}
}
+ return $result;
}
sub end_tthoption {
@@ -324,7 +325,7 @@ sub start_html {
}
#-- tag
sub start_meta {
- my ($target,$token,$tagstack,$parstack,$parser) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
my $args='';
@@ -336,13 +337,16 @@ sub start_html {
}
}
if ($target eq 'meta') {
- unless ($token->[2]->{'http-equiv'}) {
+ unless (&Apache::lonxml::get_param
+ ('http-equiv',$parstack,$safeeval,undef,1)) {
my $name=$token->[2]->{'name'};
$name=~tr/A-Z/a-z/;
- $name=~s/\s/\_/g;
+ $name=~s/\s/\_/gs;
+ $name=~s/\W//gs;
if ($name) {
$currentstring='<'.$name.'>'.
- $token->[2]->{'content'}.
+ &Apache::lonxml::get_param
+ ('content',$parstack,$safeeval,undef,1).
''.$name.'>';
}
}
@@ -1673,7 +1677,13 @@ sub start_table {
}
} else {
#original image file doesn't exist so check the alt attribute
- my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
+ my $alt =
+ &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
+ unless ($alt) {
+ $alt=&Apache::lonmeta::alttag
+ ($Apache::lonxml::pwd[-1],$src);
+ }
+
if ($alt) {
$currentstring .= ' '.$alt.' ';
} else {
@@ -1683,6 +1693,7 @@ sub start_table {
}
return $currentstring;
}
+
sub end_img {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1696,20 +1707,26 @@ sub start_table {
#--