[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

foxr lon-capa-cvs@mail.lon-capa.org
Tue, 29 Nov 2005 00:08:10 -0000


foxr		Mon Nov 28 19:08:10 2005 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Progress on nested table... needed to remove some of the post table
  scaffolding to get multiple nested tables to look reasonable..still
  need to remove some vertical spaceing.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.297 loncom/xml/londefdef.pm:1.298
--- loncom/xml/londefdef.pm:1.297	Mon Nov 28 17:37:41 2005
+++ loncom/xml/londefdef.pm	Mon Nov 28 19:08:10 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.297 2005/11/28 22:37:41 foxr Exp $
+# $Id: londefdef.pm,v 1.298 2005/11/29 00:08:10 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -2415,8 +2415,13 @@
 	    push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
 	}        
     }
-	for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {         
-	    $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in] \&/;
+	for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {    
+	    my $nested = $Apache::londefdef::table[-1]{'include'}[$in];
+	    &Apache::lonnet::logthis("Nested: $nested");
+	    $nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/;
+	    &Apache::lonnet::logthis("After sub: $nested");
+	   # $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
+	    $data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/;
 	}
     push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
     return'';