[FFmpeg-devel] [PATCH] doc/t2h: Support texinfo 7.0

[Stefano Sabatini]

On date Tuesday 2023-11-07 00:36:14 +0100, Stefano Sabatini wrote:
> On date Sunday 2023-11-05 13:53:38 +0000, post at frankplowman.com wrote:
> > From: Frank Plowman <post at frankplowman.com>
> > 
> > Texinfo 7.0, released in November 2022, changed the names of various
> > functions. Compiling docs with Texinfo 7.0 results in warnings and
> > improperly formatted documentation. More old names appear to have
> > been removed in Texinfo 7.1, released October 2023, which causes docs
> > compilation to fail.
> > 
> > This PR addresses the issue by adding logic to switch between the old
> > and new function names depending on the Texinfo version.
> > 
> > CC
> > https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1938238.html
> > https://bugs.gentoo.org/916104
> > 
> > Signed-off-by: Frank Plowman <post at frankplowman.com>
> > ---
> >  doc/t2h.pm | 97 +++++++++++++++++++++++++++++++++++++++++++-----------
> >  1 file changed, 78 insertions(+), 19 deletions(-)
> > 
> > diff --git a/doc/t2h.pm b/doc/t2h.pm
> > index d07d974286..1f23083703 100644
> > --- a/doc/t2h.pm
> > +++ b/doc/t2h.pm  
> [...]
> > @@ -112,8 +145,8 @@ sub ffmpeg_heading_command($$$$$)
> >                  $cmdname
> >                      = $Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level];
> >              }
> 
> > -            $result .= &{$self->{'format_heading_text'}}(
> > -                        $self, $cmdname, $heading,
> > +            $result .= &{get_formatting_function($self,'format_heading_text')}(
> 
> > +                        $self, $cmdname, [$heading],
> 
> Are the added [] intended? This is causing rendering of titles as

> ARRAYXNNNNN (as Perl is trying to render a dictionary with its address

Here I meant array in place of dictionary.

> in place of a string element).  Dropping the [] fixes the issue.

I tested with makeinfo 6.8.