--- loncom/xml/londefdef.pm 2005/12/05 23:22:49 1.300 +++ loncom/xml/londefdef.pm 2005/12/06 22:55:31 1.302 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.300 2005/12/05 23:22:49 foxr Exp $ +# $Id: londefdef.pm,v 1.302 2005/12/06 22:55:31 foxr Exp $ # # # Copyright Michigan State University Board of Trustees @@ -48,7 +48,7 @@ use Apache::lonmenu(); use Apache::lonmeta(); use Apache::Constants qw(:common); use File::Basename; -#use Data::Dumper; +# use Data::Dumper; BEGIN { @@ -71,7 +71,6 @@ BEGIN { # # } #} - sub initialize_londefdef { $Apache::londefdef::TD_redirection=0; @Apache::londefdef::table = (); @@ -2425,14 +2424,20 @@ sub end_td_tex { 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++) { - my $nested = $Apache::londefdef::table[-1]{'include'}[$in]; - $nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/; - # $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; - $data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/; - } + # Substitute all of the tables nested in this cell in their appropriate places. + + + my $nested_count = $#{$Apache::londefdef::table[-1]{'include'}}; # This one is constant... + for (my $in=0; $in<=$nested_count; $in++) { + my $nested = shift @{$Apache::londefdef::table[-1]{'include'}}; + $nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/; + # $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/; + $data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/; + + } + # Should be be killing off the 'include' elements as they're used up? push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data; - return''; + return ''; } sub end_td {