Merge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd'

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

Conflicts:
	doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 11 insertions, 3 deletions

diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
index b825fdc242..94e011e42b 100644
--- a/doc/texi2pod.pl
+++ b/doc/texi2pod.pl
@@ -282,6 +282,14 @@ INF: while(<$inf>) {
         $_ = "\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 {
         push @endwstack, $endw;
         $endw = $1;
@@ -298,10 +306,10 @@ INF: while(<$inf>) {
 
     /^\@tab\s+(.*\S)\s*$/ and $endw eq "multitable" and do {
         my $columns = $1;
-        $columns =~ s/\@tab/ : /;
+        $columns =~ s/\@tab//;
 
-        $_ = " : ". $columns;
-        $chapter =~ s/\n+\s+$//;
+        $_ = $columns;
+        $chapter =~ s/$//;
     };
 
     /^\@itemx?\s*(.+)?$/ and do {