Commit 8f23045b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'be59675a'

* commit 'be59675a':
  doc: Change the multitable rendering in texi2pod

Conflicts:
	doc/texi2pod.pl
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e40d92b1 be59675a
...@@ -282,6 +282,14 @@ INF: while(<$inf>) { ...@@ -282,6 +282,14 @@ INF: while(<$inf>) {
$_ = "\n=over 4\n"; $_ = "\n=over 4\n";
}; };
/^\@(multitable)\s+{.*/ and do {
push @endwstack, $endw;
push @icstack, $ic;
$endw = $1;
$ic = "";
$_ = "\n=over 4\n";
};
/^\@((?:small)?example|display)/ and do { /^\@((?:small)?example|display)/ and do {
push @endwstack, $endw; push @endwstack, $endw;
$endw = $1; $endw = $1;
...@@ -298,10 +306,10 @@ INF: while(<$inf>) { ...@@ -298,10 +306,10 @@ INF: while(<$inf>) {
/^\@tab\s+(.*\S)\s*$/ and $endw eq "multitable" and do { /^\@tab\s+(.*\S)\s*$/ and $endw eq "multitable" and do {
my $columns = $1; my $columns = $1;
$columns =~ s/\@tab/ : /; $columns =~ s/\@tab//;
$_ = " : ". $columns; $_ = $columns;
$chapter =~ s/\n+\s+$//; $chapter =~ s/$//;
}; };
/^\@itemx?\s*(.+)?$/ and do { /^\@itemx?\s*(.+)?$/ and do {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment