--- loncom/xml/londefdef.pm 2011/04/05 10:33:15 1.429 +++ loncom/xml/londefdef.pm 2011/04/13 10:08:06 1.430 @@ -1,7 +1,8 @@ + # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.429 2011/04/05 10:33:15 foxr Exp $ +# $Id: londefdef.pm,v 1.430 2011/04/13 10:08:06 foxr Exp $ # # # Copyright Michigan State University Board of Trustees @@ -2076,6 +2077,8 @@ sub start_table { $table->cell_border(2); } elsif ($cell_border eq 'cols') { $table->cell_border(3); + } elsif($cell_border eq 'groups') { + $table->cell_border(4); } else { $table->cell_border(0); } @@ -3384,13 +3387,34 @@ sub end_col { return $currentstring; } -#-- tag (end tag optional) +#-- [4]; } + if ($target eq 'tex') { + # TODO: Ensure this tag is in a table: + + # Fetch the attributes and build the hash for the + # call to define_colgroup. + + my $span = &Apache::lonxml::get_param('span', $parstack, $safeeval); + my $halign = &Apache::lonxml::get_param('halign', $parstack, $safeeval); + + my %colgroup_params; + if ($span ne '') { + $colgroup_params{'span'} = $span; + } + if ($halign ne '') { + $colgroup_params{'halign'} = $halign; + } + + my $table = $Apache::londefdef::table[-1]; + $table->define_colgroup(\%colgroup_params); + + } return $currentstring; } @@ -3884,6 +3908,12 @@ sub start_tbody { if ($target eq 'web' || $target eq 'webgrade') { $currentstring = $token->[4]; } + if ($target eq 'tex') { + # TODO: Ensure this tag is within a table: + + my $table = $Apache::londefdef::table[-1]; + $table->start_body(); + } return $currentstring; } @@ -3893,6 +3923,12 @@ sub end_tbody { if ($target eq 'web' || $target eq 'webgrade') { $currentstring = $token->[2]; } + if($target eq 'tex') { + # TODO: Ensure this tag is within a table: + + my $table = $Apache::londefdef::table[-1]; + $table->end_body(); + } return $currentstring; } @@ -3903,6 +3939,11 @@ sub start_tfoot { if ($target eq 'web' || $target eq 'webgrade') { $currentstring = $token->[4]; } + if ($target eq 'tex') { + # TODO: ensure this is within a table tag. + my $table = $Apache::londefdef::table[-1]; + $table->start_foot(); + } return $currentstring; } @@ -3912,6 +3953,11 @@ sub end_tfoot { if ($target eq 'web' || $target eq 'webgrade') { $currentstring = $token->[2]; } + if ($target eq 'tex') { + # TODO: Ensure this is in side a table + my $table = $Apache::londefdef::table[-1]; + $table->end_foot(); + } return $currentstring; } @@ -3922,6 +3968,11 @@ sub start_thead { if ($target eq 'web' || $target eq 'webgrade') { $currentstring = $token->[4]; } + if ($target eq 'tex') { + # Assume we're in a table... TODO: Verify that and ignore tag if not. + my $table = $Apache::londefdef::table[-1]; + $table->start_head(); + } return $currentstring; } @@ -3931,6 +3982,12 @@ sub end_thead { if ($target eq 'web' || $target eq 'webgrade') { $currentstring = $token->[2]; } + if ($target eq 'tex') { + # TODO: Verify we are in a table and ignore tag if not. + + my $table = $Apache::londefdef::table[-1]; + $table->end_head(); + } return $currentstring; }