mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit 'be59675add2a05a7400b1abf86201ab069d7b1dd'
* commit 'be59675add2a05a7400b1abf86201ab069d7b1dd': doc: Change the multitable rendering in texi2pod Conflicts: doc/texi2pod.pl Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8f23045b16
@ -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>) {
|
|||||||
|
|
||||||
/^\@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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user