while (@group) {
$tok = shift(@group);
- # Each $tok will consist of /^[clr|]*[p*@]?$/
+ # Each $tok will consist of /^[clr|]*[mp*@]?$/
# (Except first may have | and/or @ expressions before it)
# p*@ will end the $tok since after it comes a group in braces
# @ will be a TT::Token, everything else will be in TT::Text
@new_cols = ($description =~ /[clr]\|*/g);
push @cols, @new_cols;
- # parse a p or * or @ if necessary
+ # parse a 'p', an 'm', a '*' or a '@' as necessary
# use exact_print in case there's weird stuff in the @ descriptions
$description = substr($description,-1);
- if ($description eq 'p') {
+ # The m and p descriptors have identical form.
+ if ($description eq 'p' || $description eq 'm') {
$tok = shift(@group);
- my $pdes = $description . $tok->exact_print; # "p{foo}"
- push @cols, $pdes;
+ my $des = $description . $tok->exact_print; # 'p{foo}' or 'm{foo}'
+ push @cols, $des;
} elsif ($description eq '@') {
$tok = shift(@group);
push @RelyxTable::table_array, $thistable;
- # Now that it's blessed, put the 0th row into the table
+ # Now that it's blessed, put the 0th row into the table
$thistable->addrow;
return $thistable;
foreach $col (@{$thistable->{"columns"}}) {
$to_print .= $col->print_info;
}
-
+
# Print cell info
my $cell;
foreach $row (@{$thistable->{"rows"}}) {
my $description = shift;
my $col;
- # Initially zero everything, since we set different
+ # Initially zero everything, since we set different
# fields for @ and non-@ columns
$col->{"alignment"} = "c"; # default
$col->{"left_line"} = 0;
$col->{"pwidth"} = "";
$col->{"special"} = "";
- # Any special (@) column should be handled differently
- if ($description =~ /\@/) {
- # Just put the whole description in "special" field --- this
- # corresponds the the "extra" field in LyX table popup
- # Note that LyX ignores alignment, r/l lines for a special column
- $col->{"special"} = $description;
- print "\n'$description' column won't display WYSIWYG in LyX\n"
- if $debug_on;
-
- # It's not a special @ column
- } else {
+ # LyX does not know about '@' or 'm' column descriptors so, to
+ # ensure that the LaTeX -> LyX -> LaTeX cycle is invariant,
+ # these descriptors are placed in the 'special' field.
+ if ($description =~ /\@/ || $description =~ /^m/ ) {
+ $col->{"special"} = $description;
+ print "\n'$description' column won't display WYSIWYG in LyX\n"
+ if $debug_on;
+ }
+ # '@' columns really can't be displayed WYSIWYG in LyX,
+ # but we can get visual feedback on 'm' columns.
+ if (!($description =~ /\@/)) {
# left line?
$description =~ s/^\|*//;
$col->{"left_line"} = length($&);
# main column description
- $description =~ s/^[clrp]//;
- if ($& eq "p") {
+ $description =~ s/^[clrpm]//;
+ if ($& eq 'p' || $& eq 'm') {
$description =~ s/^\{(.+)\}//; # eat the width
$col->{"pwidth"} = $1; # width without braces
# note: alignment is not applicable for 'p' columns
);
$to_print .= join(" ",@arr);
$to_print .= "\n";
-
+
return $to_print;
}
} # end package RelyxTable::Column
$i++;
# What if it was a multicolumn?
- $i++ while ${$row->{"cells"}}[$i]->{"multicolumn"} eq "part";
+ # $rcells holds a reference to the array of cells
+ my $rcells = \@{$row->{"cells"}};
+ # Paranoia check that we're not attempting to access beyond the
+ # end of the array in case reLyX failed to parse the number of
+ # columns correctly.
+ $i++ while ($i < @{$rcells} &&
+ ${$rcells}[$i]->{"multicolumn"} eq "part");
$row->{"curr_col"} = $i;
} # end of sub nextcol
);
$to_print .= join(" ",@arr);
$to_print .= "\n";
-
+
return $to_print;
} # end sub print_info
# alignment - alignment of this cell
# top_line - does the cell have a line on the top?
# bottom_line - does the cell have a line on the bottom?
-# has_cont_row-
+# has_cont_row-
# rotate - rotate cell?
# line_breaks - cell has line breaks in it (???)
# special - does this multicol have a special description (@ commands?)
);
$to_print .= join(" ",@arr);
$to_print .= "\n";
-
+
return $to_print;
}
} # end package RelyxTable::Cell