Unified · Split
| @@ -161,7 +161,7 @@ INF: while(<$inf>) { · 160 unmodified lines | |||
| 161 | } elsif ($ended =~ /^(?:example|smallexample|display)$/) { | 161 | } elsif ($ended =~ /^(?:example|smallexample|display)$/) { |
| 162 | $shift = ""; | 162 | $shift = ""; |
| 163 | $_ = ""; # need a paragraph break | 163 | $_ = ""; # need a paragraph break |
| 164 | } elsif ($ended =~ /^(?:itemize|enumerate|[fv]?table)$/) { | 164 | } elsif ($ended =~ /^(?:itemize|enumerate|(?:multi|[fv])?table)$/) { |
| 165 | $_ = "\n=back\n"; | 165 | $_ = "\n=back\n"; |
| 166 | $ic = pop @icstack; | 166 | $ic = pop @icstack; |
| 167 | } else { | 167 | } else { |
| @@ -262,7 +262,7 @@ INF: while(<$inf>) { · 94 unmodified lines | |||
| 262 | $endw = "enumerate"; | 262 | $endw = "enumerate"; |
| 263 | }; | 263 | }; |
| 264 | 264 | ||
| 265 | /^\@([fv]?table)\s+(\@[a-z]+)/ and do { | 265 | /^\@((?:multi|[fv])?table)\s+(\@[a-z]+)/ and do { |
| 266 | push @endwstack, $endw; | 266 | push @endwstack, $endw; |
| 267 | push @icstack, $ic; | 267 | push @icstack, $ic; |
| 268 | $endw = $1; | 268 | $endw = $1; |
| @@ -271,6 +271,7 @@ INF: while(<$inf>) { · 2 unmodified lines | |||
| 271 | $ic =~ s/\@(?:code|kbd)/C/; | 271 | $ic =~ s/\@(?:code|kbd)/C/; |
| 272 | $ic =~ s/\@(?:dfn|var|emph|cite|i)/I/; | 272 | $ic =~ s/\@(?:dfn|var|emph|cite|i)/I/; |
| 273 | $ic =~ s/\@(?:file)/F/; | 273 | $ic =~ s/\@(?:file)/F/; |
| 274 | $ic =~ s/\@(?:columnfractions)//; | ||
| 274 | $_ = "\n=over 4\n"; | 275 | $_ = "\n=over 4\n"; |
| 275 | }; | 276 | }; |
| 276 | 277 | ||
| @@ -281,6 +282,21 @@ INF: while(<$inf>) { · 4 unmodified lines | |||
| 281 | $_ = ""; # need a paragraph break | 282 | $_ = ""; # need a paragraph break |
| 282 | }; | 283 | }; |
| 283 | 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 | |||
| 284 | /^\@itemx?\s*(.+)?$/ and do { | 300 | /^\@itemx?\s*(.+)?$/ and do { |
| 285 | if (defined $1) { | 301 | if (defined $1) { |
| 286 | # Entity escapes prevent munging by the <> processing below. | 302 | # Entity escapes prevent munging by the <> processing below. |