--- loncom/xml/londefdef.pm 2002/02/26 22:27:22 1.46 +++ loncom/xml/londefdef.pm 2002/04/26 18:25:56 1.55 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.46 2002/02/26 22:27:22 sakharuk Exp $ +# $Id: londefdef.pm,v 1.55 2002/04/26 18:25:56 sakharuk Exp $ # # # Copyright Michigan State University Board of Trustees @@ -45,12 +45,14 @@ package Apache::londefdef; +use Apache::lonnet; use strict; use Apache::lonxml; + BEGIN { - &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow','frameset','pre','insert')); + &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','td')); } @@ -114,15 +116,8 @@ sub end_m { $currentstring = &Apache::lonxml::xmlbegin(). &Apache::lonxml::fontsettings(); } elsif ($target eq 'tex') { + @Apache::londefdef::table = (); $currentstring .= '\documentclass[letterpaper]{article} - \setlength{\oddsidemargin}{-40pt} - \setlength{\evensidemargin}{-60pt} - \setlength{\topmargin}{200pt} - \setlength{\textwidth}{4.4in} - \setlength{\textheight}{6.8in} - \setlength{\parindent}{20pt} - \setlength{\marginparwidth}{90pt} - \setlength{\textfloatsep}{8pt plus 2.0pt minus 4.0pt} \newcommand{\keephidden}[1]{} \usepackage[dvips]{graphicx} \usepackage{epsfig}'; @@ -150,7 +145,7 @@ sub end_m { my ($target,$token) = @_; my $currentstring = ''; if ($target eq 'web') { - $currentstring = &Apache::lonxml::registerurl(). + $currentstring = &Apache::lonxml::registerurl(undef,$target). $token->[2]; } return $currentstring; @@ -332,7 +327,8 @@ sub end_m { my $currentstring = ''; if ($target eq 'web') { if (!$Apache::lonxml::registered) { - $currentstring.='
'.&Apache::lonxml::registerurl().''; + $currentstring.=''. + &Apache::lonxml::registerurl(undef,$target).''; } my $onLoad=''; foreach my $key (keys(%{$token->[2]})) { @@ -360,7 +356,7 @@ sub end_m { if ($ENV{'request.state'} ne 'published') { $currentstring.=(< tag
sub start_td {
- my ($target,$token) = @_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
- $currentstring = $token->[4];
+ $currentstring = $token->[4];
} elsif ($target eq 'tex') {
- $currentstring = '';
+ my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ if ($what_to_push eq '') {
+ $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
+ }
+ push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
+ $Apache::londefdef::table[-1]{'counter_columns'}++;
+ &Apache::lonxml::startredirection();
+;
}
return $currentstring;
- }
+ }
sub end_td {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
} elsif ($target eq 'tex') {
- $currentstring = '';
+ my $current_row = $Apache::londefdef::table[-1]{'row_number'};
+ my $data=&Apache::lonxml::endredirection();
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'};
}
return $currentstring;
}
@@ -1338,28 +1388,21 @@ EDITBUTTON
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+ $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
my $file;
- my $path;
+ my $path;
if ($src =~ m!(.*)/([^/]*)$!) {
- $file = $2;
- $path = $1;
- if ($path=~m:^/:) {
- $path = '/home/httpd/html'.$path;
- } elsif ($path =~ /^\./) {
- $path = $Apache::lonxml::pwd[-1].'/'.$path;
- } else {
- #else it is a full url don't print
- $path = undef;
- }
+ $file = $2;
+ $path = $1;
} else {
- $path = $Apache::lonxml::pwd[-1];
- $file = $src;
+ $path = $Apache::lonxml::pwd[-1];
+ $file = $src;
}
$file=~s/(\.gif|\.jpg)$/\.eps/;
if ($path) {
- $currentstring = '\graphicspath{{'.$path.'}}\fbox{\includegraphics{'.$file.'}}';
+ $currentstring .= '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
} else {
- $currentstring = 'See the image at \tt{'.$src.'}';
+ $currentstring .= 'See the image at \tt{'.$src.'}';
}
}
return $currentstring;
@@ -1474,7 +1517,8 @@ sub start_embed {
my $currentstring = '';
if ($target eq 'web') {
if (!$Apache::lonxml::registered) {
- $currentstring.=''.&Apache::lonxml::registerurl().'';
+ $currentstring.=''.
+ &Apache::lonxml::registerurl(undef,$target).'';
}
$currentstring .= $token->[4];
}
@@ -1523,6 +1567,24 @@ sub start_embed {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web') {
+ $currentstring .= '';
+ }
+ return $currentstring;
+ }
+#-- |