Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Luca Barbato authored on 2013/01/23 19:43:37... | ... |
@@ -163,7 +163,7 @@ INF: while(<$inf>) { |
163 | 163 |
} elsif ($ended =~ /^(?:example|smallexample|display)$/) { |
164 | 164 |
$shift = ""; |
165 | 165 |
$_ = ""; # need a paragraph break |
166 |
- } elsif ($ended =~ /^(?:itemize|enumerate|[fv]?table)$/) { |
|
166 |
+ } elsif ($ended =~ /^(?:itemize|enumerate|(?:multi|[fv])?table)$/) { |
|
167 | 167 |
$_ = "\n=back\n"; |
168 | 168 |
$ic = pop @icstack; |
169 | 169 |
} else { |
... | ... |
@@ -263,7 +263,7 @@ INF: while(<$inf>) { |
263 | 263 |
$endw = "enumerate"; |
264 | 264 |
}; |
265 | 265 |
|
266 |
- /^\@([fv]?table)\s+(\@[a-z]+)/ and do { |
|
266 |
+ /^\@((?:multi|[fv])?table)\s+(\@[a-z]+)/ and do { |
|
267 | 267 |
push @endwstack, $endw; |
268 | 268 |
push @icstack, $ic; |
269 | 269 |
$endw = $1; |
... | ... |
@@ -272,6 +272,7 @@ INF: while(<$inf>) { |
272 | 272 |
$ic =~ s/\@(?:code|kbd)/C/; |
273 | 273 |
$ic =~ s/\@(?:dfn|var|emph|cite|i)/I/; |
274 | 274 |
$ic =~ s/\@(?:file)/F/; |
275 |
+ $ic =~ s/\@(?:columnfractions)//; |
|
275 | 276 |
$_ = "\n=over 4\n"; |
276 | 277 |
}; |
277 | 278 |
|
... | ... |
@@ -282,6 +283,21 @@ INF: while(<$inf>) { |
282 | 282 |
$_ = ""; # need a paragraph break |
283 | 283 |
}; |
284 | 284 |
|
285 |
+ /^\@item\s+(.*\S)\s*$/ and $endw eq "multitable" and do { |
|
286 |
+ my $columns = $1; |
|
287 |
+ $columns =~ s/\@tab/ : /; |
|
288 |
+ |
|
289 |
+ $_ = "\n=item B<". $columns .">\n"; |
|
290 |
+ }; |
|
291 |
+ |
|
292 |
+ /^\@tab\s+(.*\S)\s*$/ and $endw eq "multitable" and do { |
|
293 |
+ my $columns = $1; |
|
294 |
+ $columns =~ s/\@tab/ : /; |
|
295 |
+ |
|
296 |
+ $_ = " : ". $columns; |
|
297 |
+ $section =~ s/\n+\s+$//; |
|
298 |
+ }; |
|
299 |
+ |
|
285 | 300 |
/^\@itemx?\s*(.+)?$/ and do { |
286 | 301 |
if (defined $1) { |
287 | 302 |
# Entity escapes prevent munging by the <> processing below. |