--- loncom/xml/lontable.pm 2008/12/29 11:57:37 1.7 +++ loncom/xml/lontable.pm 2009/01/20 12:01:01 1.8 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Generating TeX tables. # -# $Id: lontable.pm,v 1.7 2008/12/29 11:57:37 foxr Exp $ +# $Id: lontable.pm,v 1.8 2009/01/20 12:01:01 foxr Exp $ # # # Copyright Michigan State University Board of Trustees @@ -56,7 +56,9 @@ package Apache::lontable; use strict; use LaTeX::Table; +use Apache::lonnet; # for trace logging. +my $tracing = 0; # Set to 1 to enable log tracing. 2 for local sub tracing. =pod @@ -135,9 +137,10 @@ when the table text is generated. =item width -The width of the table. This can be expressed as fractions of full width, or in any -TeX unit measure e.g. 0.75 for 75% of the width, or 10.8cm This forces the table to the -tabularx environment. +The width of the table. in any +TeX unit measure e.g. 10.8cm This forces the table to the +tabularx environment. It also forces the declarations for +cells to be paragraph mode which supports more internal formatting. =back @@ -252,6 +255,8 @@ The contents of the cell. sub new { my ($class, $configuration) = @_; + if($tracing) {&Apache::lonnet::logthis("new table object");} + # Initialize the object member data with the default values # then override with any stuff in $configuration. @@ -298,6 +303,8 @@ Regardless, the current alignment is use sub alignment { my ($self, $new_value) = @_; + if ($tracing) {&Apache::lonnet::logthis("alignment = $new_value");} + if (defined($new_value)) { $self->{'alignment'} = $new_value; } @@ -323,6 +330,8 @@ the final value of the outer_border requ sub table_border { my ($self, $new_value) = @_; + if ($tracing) {&Apache::lonnet::logthis("table_border $new_value");} + if (defined($new_value)) { $self->{'outer_border'} = $new_value; } @@ -348,7 +357,7 @@ value of that configuration parameter is sub cell_border { my ($self, $new_value) = @_; - + if($tracing) {&Apache::lonnet::logthis("cell_border: $new_value"); } if (defined($new_value)) { $self->{'inner_border'} = $new_value; } @@ -373,6 +382,7 @@ the table. If a parameter is supplied i sub caption { my ($self, $new_value) = @_; + if($tracing) {&Apache::lonnet::logthis("caption: $new_value"); } if (defined($new_value)) { $self->{'caption'} = $new_value; } @@ -397,7 +407,7 @@ will be the new theme selection. sub theme { my ($self, $new_value) = @_; - + if($tracing) {&Apache::lonnet::logthis("theme $new_value"); } if (defined($new_value)) { $self->{'theme'} = $new_value; } @@ -412,12 +422,13 @@ Gets and optionally sets the width of th =head 3 Examples: - $table->width("0.8"); # 80% of the column width. my $newwidth = $table->width("10cm"); # 10cm width returns "10cm". =cut sub width { my ($self, $new_value) = @_; + if($tracing) {&Apache::lonnet::logthis("width = $new_value"); } + if (defined($new_value)) { $self->{'width'} = $new_value; } @@ -454,7 +465,7 @@ The default vertical alignment of the ro sub start_row { my ($self, $config) = @_; - + if($tracing) {&Apache::lonnet::logthis("start_row"); } if ($self->{'row_open'}) { $self->end_row(); } @@ -495,7 +506,7 @@ Closes off a row. Once closed, cells ca sub end_row { my ($self) = @_; - + if($tracing) {&Apache::lonnet::logthis("end_row"); } if ($self->{'row_open'}) { # Mostly we need to determine if this row has the maximum @@ -543,7 +554,7 @@ The default vertical alignment for text sub configure_row { my ($self, $config) = @_; - + if($tracing) {&Apache::lonnet::logthis("configure_row");} if (!$self->{'row_open'}) { $self->start_row(); } @@ -601,6 +612,8 @@ Number of columns the cell spans. sub add_cell { my ($self, $text, $config) = @_; + if($tracing) {&Apache::lonnet::logthis("add_cell : $text"); } + # If a row is not open, we must open it: if (!$self->{'row_open'}) { @@ -627,6 +640,9 @@ sub add_cell { # end point of the pulled down cell. my $prior_cell = $last_row->{'cells'}->[$prior_cell_index]; + if (!defined($prior_cell)) { + last; + } if (($prior_cell->{'start_col'} == $last_coord) && ($prior_cell->{'rowspan'} > 1)) { @@ -666,8 +682,36 @@ sub add_cell { $current_row->{'cell_width'} += $cell->{'colspan'}; push(@$current_cells, $cell); + + if ($tracing) { &Apache::lonnet::logthis("add_cell done"); } } + +=pod + +=head2 append_cell_text + +Sometimes it's necessary to create/configure the cell and then later add text to it. +This sub allows text to be appended to the most recently created cell. + +=head3 Parameters + +The text to add to the cell. + +=cut +sub append_cell_text { + my ($this, $text) = @_; + + if($tracing) {&Apache::lonnet::logthis("append_cell_text: $text"); } + my $rows = $this->{'rows'}; + my $current_row = $rows->[-1]; + my $cells = $current_row->{'cells'}; + my $current_cell = $cells->[-1]; + $current_cell->{'contents'} .= $text; + +} + + =pod =head2 generate @@ -681,21 +725,31 @@ The caller can then ask the table object =cut sub generate { my ($this) = @_; + my $useP = 0; + my $colwidth; + my $colunits; + if($tracing) {&Apache::lonnet::logthis("generate"); } my $table = LaTeX::Table->new(); + $table->set_center(0); # loncapa tables don't float. + $table->set_environment(0); + # Add the caption if supplied. if ($this->{'caption'} ne "") { $table->set_caption($this->caption); } - # Set the width if defined: if (defined ($this->{'width'})) { - $table->set_width($this->{'width'}); - $table->set_width_environment('tabularx'); +# $table->set_width($this->{'width'}); +# $table->set_width_environment('tabularx'); + $useP = 1; + ($colwidth, $colunits) = split(/ /, $this->{'width'}); + $colwidth = $colwidth/$this->{'column_count'}; + } # Build up the data: @@ -715,6 +769,7 @@ sub generate { my $startcol = 1; my @underlines; # Array of \cline cells if cellborder on. + for (my $cell = 0; $cell < $cell_count; $cell++) { my $contents = $cells->[$cell]->{'contents'}; @@ -732,12 +787,29 @@ sub generate { # Create the horizontal alignment character: my $col_align = 'l'; + my $embeddedAlignStart = ""; + my $embeddedAlignEnd = ""; + if ($halign eq 'right') { $col_align = 'r'; + $embeddedAlignStart = '\begin{flushright} '; + $embeddedAlignEnd = ' \end{flushright}'; } if ($halign eq 'center') { $col_align = 'c'; + $embeddedAlignStart = '\begin{center}'; + $embeddedAlignEnd = '\end{center}'; } + + # If the width has been specified, turn these into + # para mode; and wrap the contents in the start/stop stuff: + + if ($useP) { + my $cw = $colwidth * $cells->[$cell]->{'colspan'}; + $col_align = "p{$cw $colunits}"; + $contents = $embeddedAlignStart . $contents . $embeddedAlignEnd; + } + if ($inner_border || ($outer_border && ($cell == 0))) { $col_align = '|'.$col_align; } @@ -749,7 +821,22 @@ sub generate { my $cspan = $cells->[$cell]->{'colspan'}; my $nextcol = $startcol + $cspan; - $contents = '\multicolumn{'.$cspan.'}{'.$col_align.'}{'.$contents.'}'; + + # If we can avoid the \multicolumn directive that's best as + # that makes some things like \parpic invalid in LaTeX which + # screws everything up. + + if (($cspan > 1) || !($col_align =~ /l/)) { + + $contents = '\multicolumn{'.$cspan.'}{'.$col_align.'}{'.$contents.'}'; + + # A nasty edge case. If there's only one cell, the software will assume + # we're in complete control of the row so we need to end the row ourselves. + + if ($cell_count == 1) { + $contents .= ' \\\\'; + } + } if ($inner_border && ($cells->[$cell]->{'rowspan'} == 1)) { my $lastcol = $nextcol -1; push(@underlines, "\\cline{$startcol-$lastcol}"); @@ -757,7 +844,6 @@ sub generate { $startcol = $nextcol; # Rowspans should take care of themselves. - push(@row, $contents); } @@ -776,7 +862,11 @@ sub generate { $coldef .= '|'; } for (my $i =0; $i < $column_count; $i++) { - $coldef .= 'l'; + if ($useP) { + $coldef .= "p{$colwidth $colunits}"; + } else { + $coldef .= 'l'; + } if ($inner_border || ($outer_border && ($i == $column_count-1))) { $coldef .= '|'; @@ -786,6 +876,8 @@ sub generate { # Return the table: + if ($tracing) { &Apache::lonnet::logthis("Leaving generate"); } + return $table; } @@ -795,11 +887,14 @@ sub generate { sub get_object_attribute { my ($self, $attribute) = @_; + if ($tracing > 1) { &Apache::lonnet::logthis("get_object_attribute: $attribute"); } return $self->{$attribute}; } sub get_row { my ($self, $row) = @_; + if ($tracing > 1) { &Apache::lonnet::logthis("get_row"); } + my $rows = $self->{'rows'}; # ref to an array.... return $rows->[$row]; # ref to the row hash for the selected row. }