[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm
sakharuk
lon-capa-cvs@mail.lon-capa.org
Tue, 16 Apr 2002 14:37:24 -0000
sakharuk Tue Apr 16 10:37:24 2002 EDT
Modified files:
/loncom/xml londefdef.pm
Log:
now works for nested tables
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.52 loncom/xml/londefdef.pm:1.53
--- loncom/xml/londefdef.pm:1.52 Mon Apr 8 11:17:01 2002
+++ loncom/xml/londefdef.pm Tue Apr 16 10:37:24 2002
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.52 2002/04/08 15:17:01 sakharuk Exp $
+# $Id: londefdef.pm,v 1.53 2002/04/16 14:37:24 sakharuk Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -114,6 +114,7 @@
$currentstring = &Apache::lonxml::xmlbegin().
&Apache::lonxml::fontsettings();
} elsif ($target eq 'tex') {
+ @Apache::londefdef::table = ();
$currentstring .= '\documentclass[letterpaper]{article}
\newcommand{\keephidden}[1]{}
\usepackage[dvips]{graphicx}
@@ -1264,16 +1265,20 @@
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
+ my $aa = {};
+ push @Apache::londefdef::table, $aa;
+ $Apache::londefdef::table[-1]{'row_number'} = -1;
+ $Apache::londefdef::table[-1]{'output'} = '\begin{tabular} ';
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
unless (defined $border) { $border = 0; }
if ($border) {
- $Apache::londefdef::table{'hinc'} = '\hline ';
- $Apache::londefdef::table{'vinc'} = '&';
- $Apache::londefdef::table{'vvinc'} = '|';
+ $Apache::londefdef::table[-1]{'hinc'} = '\hline ';
+ $Apache::londefdef::table[-1]{'vinc'} = '&';
+ $Apache::londefdef::table[-1]{'vvinc'} = '|';
} else {
- $Apache::londefdef::table{'hinc'} = '';
- $Apache::londefdef::table{'vinc'} = '';
- $Apache::londefdef::table{'vvinc'} = '';
+ $Apache::londefdef::table[-1]{'hinc'} = '';
+ $Apache::londefdef::table[-1]{'vinc'} = '';
+ $Apache::londefdef::table[-1]{'vvinc'} = '';
}
}
return $currentstring;
@@ -1284,17 +1289,29 @@
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
+ my $inmemory = '';
my $output = '';
- my $header_of_table = '{'.$Apache::londefdef::table{'vvinc'};
+ my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
my $in;
- for ($in=0;$in<$Apache::londefdef::table{'counter_columns'};$in++) {
- $header_of_table .= @{ $Apache::londefdef::table{'columns'} }[$in].$Apache::londefdef::table{'vvinc'};
- $output .= $Apache::londefdef::table{'rowdata'}[$in];
+ for ($in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
+ $header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
+ }
+ $header_of_table .= '}';
+ for ($in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
+ $output .= $Apache::londefdef::table[-1]{'rowdata'}[$in];
chop $output;
$output .= ' \\\\ ';
}
- $header_of_table .= '}';
- $currentstring .= '\begin{tabular}'.$header_of_table.$output.$Apache::londefdef::table{'hinc'}.'\end{tabular}';
+ $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}';
+ if ($#Apache::londefdef::table > 0) {
+ $inmemory = $Apache::londefdef::table[-1]{'output'};
+ pop @Apache::londefdef::table;
+ $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory;
+ } else {
+ $currentstring = $Apache::londefdef::table[-1]{'output'};
+ $currentstring =~ s/\\\\\s+\\\\/\\\\/g;
+ pop @Apache::londefdef::table;
+ }
}
return $currentstring;
}
@@ -1305,13 +1322,15 @@
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- if (substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1) ne '') {
- push @ {$Apache::londefdef::table{'rows'} }, substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ $Apache::londefdef::table[-1]{'row_number'}++;
+ my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ if ($alignchar ne '') {
+ push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
} else {
- push @ {$Apache::londefdef::table{'rows'} }, 'c';
+ push @ {$Apache::londefdef::table[-1]{'rows'} }, 'c';
}
- push ( @{ $Apache::londefdef::table{'rowdata'} }, $Apache::londefdef::table{'hinc'});
- $Apache::londefdef::table{'counter_columns'} = 0;
+ push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
+ $Apache::londefdef::table[-1]{'counter_columns'} = -1;
}
return $currentstring;
@@ -1322,6 +1341,7 @@
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
+# $currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
}
return $currentstring;
}
@@ -1334,10 +1354,10 @@
} elsif ($target eq 'tex') {
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{'rows'}[0],0,1);;
+ $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
}
- push @{ $Apache::londefdef::table{'columns'} }, $what_to_push;
- $Apache::londefdef::table{'counter_columns'}++;
+ push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
+ $Apache::londefdef::table[-1]{'counter_columns'}++;
&Apache::lonxml::startredirection();
;
}
@@ -1349,9 +1369,9 @@
if ($target eq 'web') {
$currentstring = $token->[2];
} elsif ($target eq 'tex') {
- my $current_row = $#{ $Apache::londedef::table{'rows'} };
+ my $current_row = $Apache::londefdef::table[-1]{'row_number'};
my $data=&Apache::lonxml::endredirection();
- @{ $Apache::londefdef::table{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table{'vinc'};
+ @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'};
}
return $currentstring;
}