From 4e7b5f370b010440b2ebbe232e5effeaae1115c0 Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Sun, 27 Oct 2024 23:08:29 +0300
Subject: [PATCH 1/2] Texinfo: add some missing command definitions

Bug: https://github.com/mquinson/po4a/issues/497
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
---
 lib/Locale/Po4a/Texinfo.pm | 48 ++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/lib/Locale/Po4a/Texinfo.pm b/lib/Locale/Po4a/Texinfo.pm
index 6d0e9614a..679171013 100644
--- a/lib/Locale/Po4a/Texinfo.pm
+++ b/lib/Locale/Po4a/Texinfo.pm
@@ -396,15 +396,12 @@ sub translate_buffer_ignore {
 $translate_buffer_env{"ignore"} = \&translate_buffer_ignore;
 
 foreach (
-    qw(appendix section cindex findex kindex opindex pindex tindex vindex subsection
-    dircategory subtitle include
-    exdent center unnumberedsec
-    heading unnumbered unnumberedsubsec
-    unnumberedsubsubsec appendixsec appendixsubsec
-    appendixsubsubsec majorheading chapheading subheading
-    subsubheading shorttitlepage
-    subsubsection top item itemx chapter settitle
-    title author)
+    qw(appendix appendixsec appendixsubsec appendixsubsubsec author center
+    chapheading chapter cindex defline deftypeline dircategory exdent findex
+    heading include item itemx kindex majorheading opindex pindex section
+    settitle shorttitlepage subheading subsection subsubheading subsubsection
+    subtitle tindex title top unnumbered unnumberedsec unnumberedsubsec
+    unnumberedsubsubsec vindex)
   )
 {
     $commands{$_}               = \&line_command;
@@ -412,9 +409,9 @@ foreach (
     $translate_line_command{$_} = 1;
 }
 foreach (
-    qw(c comment clear set setfilename setchapternewpage vskip synindex
-    syncodeindex need fonttextsize printindex headings finalout sp
-    definfoenclose)
+    qw(c clear comment definfoenclose finalout fonttextsize frenchspacing
+    headings need printindex set setchapternewpage setfilename sp syncodeindex
+    synindex vskip)
   )
 {
     $commands{$_}   = \&line_command;
@@ -555,18 +552,17 @@ sub environment_line_command {
 #}
 #
 foreach (
-    qw(detailmenu menu titlepage group copying
-    documentdescription cartouche
-    direntry
-    ifdocbook ifhtml ifinfo ifplaintext iftex ifxml
-    ifnotdocbook ifnothtml ifnotinfo ifnotplaintext ifnottex ifnotxml)
-  )
+    qw(cartouche copying copyingg defblock detailmenu direntry displaymath
+    documentdescription group ifdocbook ifhtml ifinfo iflatex ifnotdocbook
+    ifnothtml ifnotinfo ifnotplaintextg ifnottex ifnotxml ifplaintext iftex
+    ifxml menu nodedescriptionblock titlepage)
+)
 {
     $commands{$_}               = \&environment_line_command;
     $translate_line_command{$_} = 0;
     $break_line{$_}             = 1;
 }
-foreach (qw(enumerate multitable ifclear ifset)) {
+foreach (qw(enumerate multitable ifclear ifset float linemacro)) {
     $commands{$_}   = \&environment_line_command;
     $break_line{$_} = 1;
 }
@@ -589,15 +585,11 @@ register_generic_command("*end,  ");
 $commands{'end'}   = $end_command;
 $break_line{'end'} = 1;
 
-register_generic_command("*macro,  ");
-$commands{'macro'}   = \&environment_command;
-$break_line{'macro'} = 1;
-register_generic_command("*itemize,  ");
-$commands{'itemize'}   = \&environment_command;
-$break_line{'itemize'} = 1;
-register_generic_command("*table,  ");
-$commands{'table'}   = \&environment_command;
-$break_line{'table'} = 1;
+foreach (qw(itemize macro ftable table vtable)) {
+    register_generic_command("*$_,  ");
+    $commands{$_}   = \&environment_command;
+    $break_line{$_} = 1;
+}
 
 # TODO: is_closed, use a regexp: \ does not escape the closing brace.
 # TBC on LaTeX.

From a8902f2d64ea5ed8de14dfb5a8f865517d4bc709 Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Sun, 27 Oct 2024 23:12:52 +0300
Subject: [PATCH 2/2] Texinfo: allow spaces before line-breaking commands

Bug: https://github.com/mquinson/po4a/issues/497
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
---
 lib/Locale/Po4a/Texinfo.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Locale/Po4a/Texinfo.pm b/lib/Locale/Po4a/Texinfo.pm
index 679171013..da0a3ffe6 100644
--- a/lib/Locale/Po4a/Texinfo.pm
+++ b/lib/Locale/Po4a/Texinfo.pm
@@ -234,16 +234,16 @@ sub parse {
             $self->push_docheader();
             $self->pushline( $line . "\n" );
         } elsif ( $closed
-            and ( $line =~ /^@([^ ]*?)(?: +(.*))?$/ )
-            and ( defined $commands{$1} )
-            and ( $break_line{$1} ) )
+            and ( $line =~ /(^\s*)@([^ ]*?)(?: +(.*))?$/ )
+            and ( defined $commands{$2} )
+            and ( $break_line{$2} ) )
         {
+            my ($spaces, $cmd, $arg) = ($1, $2, $3);
             if ( length($paragraph) ) {
                 ( $t, @env ) = translate_buffer( $self, $paragraph, undef, @env );
                 $self->pushline($t);
                 $paragraph = "";
             }
-            my $arg  = $2;
             my @args = ();
             if ( defined $arg and length $arg ) {
 
@@ -251,8 +251,8 @@ sub parse {
                 $arg =~ s/\s*$//s;
                 @args = ( " ", $arg );
             }
-            ( $t, @env ) = &{ $commands{$1} }( $self, $1, "", \@args, \@env, 1 );
-            $self->pushline( $t . "\n" );
+            ( $t, @env ) = &{ $commands{$cmd} }( $self, $cmd, "", \@args, \@env, 1 );
+            $self->pushline( $spaces . $t . "\n" );
         } else {
 
             # continue the same paragraph