--- loncom/xml/londefdef.pm 2003/03/17 17:18:50 1.106.2.2
+++ loncom/xml/londefdef.pm 2003/02/19 14:30:10 1.118
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.106.2.2 2003/03/17 17:18:50 albertel Exp $
+# $Id: londefdef.pm,v 1.118 2003/02/19 14:30:10 www Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -44,11 +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();
BEGIN {
@@ -121,7 +123,6 @@ sub start_tthoption {
&tth::tthoptions($inside);
}
}
- return $result;
}
sub end_tthoption {
@@ -155,11 +156,12 @@ sub start_html {
} elsif ($target eq 'tex') {
@Apache::londefdef::table = ();
$currentstring .= '\documentclass[letterpaper]{article}
- \newcommand{\keephidden}[1]{}
- \renewcommand{\deg}{$^{\circ}$}
- \usepackage[dvips]{graphicx}
- \usepackage{epsfig}\usepackage{calc}
- \newenvironment{choicelist}{\begin{enumerate}}{\end{enumerate}}';
+ \newcommand{\keephidden}[1]{}
+ \renewcommand{\deg}{$^{\circ}$}
+ \usepackage{textcomp}
+ \usepackage[dvips]{graphicx}
+ \usepackage{epsfig}\usepackage{calc}
+\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}}';
}
return $currentstring;
}
@@ -184,7 +186,7 @@ sub start_html {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
- $currentstring = &Apache::lonxml::registerurl(undef,$target).
+ $currentstring = &Apache::lonmenu::registerurl(undef,$target).
$token->[2];
}
return $currentstring;
@@ -328,7 +330,7 @@ sub start_html {
my $args='';
if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
if ($args eq '') {
- &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]);
+ &Apache::lonxml::get_all_text("/meta",$parser);
} else {
$currentstring = $token->[4];
}
@@ -366,7 +368,7 @@ sub start_html {
if ($target eq 'web') {
if (!$Apache::lonxml::registered) {
$currentstring.='<head>'.
- &Apache::lonxml::registerurl(undef,$target).'</head>';
+ &Apache::lonmenu::registerurl(undef,$target).'</head>';
}
my $onLoad='';
foreach my $key (keys(%{$token->[2]})) {
@@ -375,7 +377,7 @@ sub start_html {
delete($token->[2]->{$key});
}
}
- $token->[2]->{'onLoad'}=&Apache::lonxml::loadevents().
+ $token->[2]->{'onload'}=&Apache::lonmenu::loadevents().
';'.$onLoad;
my $onUnload='';
foreach my $key (keys(%{$token->[2]})) {
@@ -384,7 +386,7 @@ sub start_html {
delete($token->[2]->{$key});
}
}
- $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().
+ $token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents().
';'.$onUnload;
$currentstring .= '<'.$token->[1];
@@ -398,7 +400,9 @@ sub start_html {
<input type="submit" name="editmode" value="Edit" />
</form>
EDITBUTTON
- }
+ } else {
+ $currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
+ }
} elsif ($target eq 'tex') {
$currentstring = '\begin{document}';
}
@@ -1456,6 +1460,9 @@ sub start_table {
my $shorthand = ($filled_columns+1)*4;
$output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
}
+ if ($how_many_columns==1) { #start of block with width correction for one column table
+ $output=~s/^\s*\\parbox{([^}]*)}/\\parbox{\\textwidth - 1 cm}/;
+ } #end of block with width correction for one column table
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
if ($#Apache::londefdef::table > 0) {
$inmemory = $Apache::londefdef::table[-1]{'output'};
@@ -1509,7 +1516,7 @@ sub start_table {
my $currentstring = '';
if ($target eq 'web') {
$currentstring = $token->[4];
- } elsif ($target eq 'tex') {
+ } elsif ($target eq 'tex') {
my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
if ($what_to_push eq '') {
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
@@ -1517,7 +1524,6 @@ sub start_table {
push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
$Apache::londefdef::table[-1]{'counter_columns'}++;
&Apache::lonxml::startredirection();
-;
}
return $currentstring;
}
@@ -1593,10 +1599,21 @@ sub start_table {
my $scaling = .3;
if ($target eq 'web') {
- $currentstring = $token->[4];
+ if ($ENV{'browser.imagesuppress'} ne 'on') {
+ $currentstring = $token->[4];
+ } else {
+ my $alttag= &Apache::lonxml::get_param
+ ('alt',$parstack,$safeeval,undef,1);
+ unless ($alttag) {
+ $alttag=&Apache::lonmeta::alttag
+ ($Apache::lonxml::pwd[-1],$src);
+ }
+ $currentstring='[IMAGE: '.$alttag.']';
+ }
} elsif ($target eq 'tex') {
- &image_replication($src);
- $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+ $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+ &image_replication($src);
+
#if original gif/jpg/png file exist do following:
if (-e $src) {
#defines the default size of image
@@ -1686,7 +1703,16 @@ sub start_table {
$token->[2]->{'archive'};
my $currentstring = '';
if ($target eq 'web') {
- $currentstring = $token->[4];
+ if ($ENV{'browser.appletsuppress'} ne 'on') {
+ $currentstring = $token->[4];
+ } else {
+ my $alttag=$token->[2]->{'alt'};
+ unless ($alttag) {
+ $alttag=&Apache::lonmeta::alttag($ENV{'REQUEST_URI'},
+ $token->[2]->{'code'});
+ }
+ $currentstring='[APPLET: '.$alttag.']';
+ }
} elsif ($target eq 'tex') {
$currentstring = " \\begin{figure} ";
}
@@ -1711,7 +1737,16 @@ sub start_embed {
$token->[2]->{'src'};
my $currentstring = '';
if ($target eq 'web') {
- $currentstring = $token->[4];
+ if ($ENV{'browser.embedsuppress'} ne 'on') {
+ $currentstring = $token->[4];
+ } else {
+ my $alttag=$token->[2]->{'alt'};
+ unless ($alttag) {
+ $alttag=&Apache::lonmeta::alttag($ENV{'REQUEST_URI'},
+ $token->[2]->{'src'});
+ }
+ $currentstring='[EMBED: '.$alttag.']';
+ }
} elsif ($target eq 'tex') {
$currentstring = " \\begin{figure} ";
}
@@ -1762,6 +1797,7 @@ sub start_allow {
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$token->[2]->{'src'};
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+ $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
&image_replication($src);
my $result;
if ($target eq 'edit') {
@@ -1788,7 +1824,7 @@ sub end_allow {
if ($target eq 'web') {
if (!$Apache::lonxml::registered) {
$currentstring.='<head>'.
- &Apache::lonxml::registerurl(undef,$target).'</head>';
+ &Apache::lonmenu::registerurl(undef,$target).'</head>';
}
$currentstring .= $token->[4];
}
@@ -2577,15 +2613,17 @@ sub end_allow {
sub image_replication {
my $src = shift;
- if (not -e '/home/httpd/html'.$src) {
+ if (not -e $src) {
#replicates image itself
- &Apache::lonnet::repcopy('/home/httpd/html'.$src);
+ &Apache::lonnet::repcopy($src);
#replicates eps or ps
my $newsrc = $src;
- $newsrc =~ s/\.(gif|jpg|png)$/.eps/;
- if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
- $newsrc =~ s/\.ps$/\.eps/;
- &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);
+ $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);
+ }
}
}
return '';