--- loncom/xml/londefdef.pm 2005/11/28 21:58:24 1.296 +++ loncom/xml/londefdef.pm 2005/11/29 00:08:10 1.298 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.296 2005/11/28 21:58:24 albertel Exp $ +# $Id: londefdef.pm,v 1.298 2005/11/29 00:08:10 foxr Exp $ # # # Copyright Michigan State University Board of Trustees @@ -61,16 +61,16 @@ BEGIN { # Need this 'cause evidently when given an array, Data::Dumper only seems # to dump element 0. # -sub debug_dump_table { - my $lastrow = $#Apache::londefdef::table; - &Apache::lonnet::logthis("Dumping table: Last row index: $lastrow"); - my $row; - for ($row =0; $row <= $lastrow; $row++ ) { - my $text = Dumper($Apache::londefdef::table[$row]); - &Apache::lonnet::logthis("table [ $row ]".$text); - - } -} +#sub debug_dump_table { +# my $lastrow = $#Apache::londefdef::table; +# &Apache::lonnet::logthis("Dumping table: Last row index: $lastrow"); +# my $row; +# for ($row =0; $row <= $lastrow; $row++ ) { +# my $text = Dumper($Apache::londefdef::table[$row]); +# &Apache::lonnet::logthis("table [ $row ]".$text); +# +# } +#} sub initialize_londefdef { $Apache::londefdef::TD_redirection=0; @@ -2415,8 +2415,13 @@ 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++) { - $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'';