[no subject]

[Patrice Dumas]

branch: master
commit b8cfcb425d0e7a6499e0b39f41494fcfb8894b0a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Jun 14 11:28:00 2025 +0200

    * tta/perl/Texinfo/Common.pm (index_entry_referred_entry)
    (element_index_entry_referred_entry): return the brace command
    argument.  Update callers.
---
 ChangeLog                                          | 6 ++++++
 tta/perl/Texinfo/Common.pm                         | 4 ++--
 tta/perl/Texinfo/Convert/DocBook.pm                | 4 ++--
 tta/perl/Texinfo/Convert/HTML.pm                   | 6 ++----
 tta/perl/Texinfo/Convert/LaTeX.pm                  | 2 +-
 tta/perl/Texinfo/Convert/Plaintext.pm              | 5 ++---
 tta/perl/Texinfo/Convert/ReadDocBook.pm            | 4 ++--
 tta/perl/Texinfo/Convert/TreeElementReadDocBook.pm | 4 ++--
 tta/perl/Texinfo/Convert/TreeReadDocBook.pm        | 4 ++--
 9 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 816e8ab969..04192b5bde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,12 @@
        * tta/perl/t/test_utils.pl (convert_to_docbook): Switch off
        ReadDocBook as it is broken for tests, at least with XS.
 
+2025-06-14  Patrice Dumas  <pertusus@free.fr>
+
+       * tta/perl/Texinfo/Common.pm (index_entry_referred_entry)
+       (element_index_entry_referred_entry): return the brace command
+       argument.  Update callers.
+
 2025-06-14  Patrice Dumas  <pertusus@free.fr>
 
        * tta/perl/Texinfo/Common.pm (tree_element_multitable_columnfractions)
diff --git a/tta/perl/Texinfo/Common.pm b/tta/perl/Texinfo/Common.pm
index 6d028ce9a9..86743f3ceb 100644
--- a/tta/perl/Texinfo/Common.pm
+++ b/tta/perl/Texinfo/Common.pm
@@ -1120,7 +1120,7 @@ sub index_entry_referred_entry($$)
     foreach my $content (@{$line_arg->{'contents'}}) {
       if ($content->{'cmdname'}) {
         if ($content->{'cmdname'} eq $referred_cmdname) {
-          return $content if ($content->{'contents'});
+          return $content->{'contents'}->[0] if ($content->{'contents'});
         } elsif ($content->{'cmdname'} eq 'subentry') {
           return index_entry_referred_entry($content, $referred_cmdname);
         }
@@ -1146,7 +1146,7 @@ sub element_index_entry_referred_entry($$)
       my $cmdname = $content->{'cmdname'};
       if ($cmdname) {
         if ($cmdname eq $referred_cmdname) {
-          return $content if ($content->children_number());
+          return $content->get_child(0) if ($content->children_number());
         } elsif ($cmdname eq 'subentry') {
           return element_index_entry_referred_entry($content,
                                                     $referred_cmdname);
diff --git a/tta/perl/Texinfo/Convert/DocBook.pm 
b/tta/perl/Texinfo/Convert/DocBook.pm
index 815898228b..1c668134b4 100644
--- a/tta/perl/Texinfo/Convert/DocBook.pm
+++ b/tta/perl/Texinfo/Convert/DocBook.pm
@@ -679,7 +679,7 @@ sub _index_entry($$)
                                                     'seeentry');
     if ($seeentry) {
       $result .= "<see>";
-      $result .= _convert($self, $seeentry->{'contents'}->[0]);
+      $result .= _convert($self, $seeentry);
       $result .= "</see>";
     }
     my $seealso
@@ -687,7 +687,7 @@ sub _index_entry($$)
                                                     'seealso');
     if ($seealso) {
       $result .= "<seealso>";
-      $result .= _convert($self, $seealso->{'contents'}->[0]);
+      $result .= _convert($self, $seealso);
       $result .= "</seealso>";
     }
 
diff --git a/tta/perl/Texinfo/Convert/HTML.pm b/tta/perl/Texinfo/Convert/HTML.pm
index b185204db7..e4489e39d4 100644
--- a/tta/perl/Texinfo/Convert/HTML.pm
+++ b/tta/perl/Texinfo/Convert/HTML.pm
@@ -6656,10 +6656,8 @@ sub _convert_printindex_command($$$$)
       if ($referred_entry) {
         my $referred_tree = Texinfo::TreeElement::new({});
         $referred_tree->{'type'} = '_code' if ($in_code);
-        if ($referred_entry->{'contents'}
-            and $referred_entry->{'contents'}->[0]
-            and $referred_entry->{'contents'}->[0]->{'contents'}) {
-          $referred_tree->{'contents'} = [$referred_entry->{'contents'}->[0]];
+        if ($referred_entry->{'contents'}) {
+          $referred_tree->{'contents'} = [$referred_entry];
         }
         my $entry;
         # for @seealso, to appear where chapter/node ususally appear
diff --git a/tta/perl/Texinfo/Convert/LaTeX.pm 
b/tta/perl/Texinfo/Convert/LaTeX.pm
index c27486102d..114f8b7b7b 100644
--- a/tta/perl/Texinfo/Convert/LaTeX.pm
+++ b/tta/perl/Texinfo/Convert/LaTeX.pm
@@ -2619,7 +2619,7 @@ sub _index_entry($$)
                                                       $seecommand);
       if ($referred_element) {
         my $seeconverted
-          = _convert($self, $referred_element->{'contents'}->[0]);
+          = _convert($self, $referred_element);
         $seeresult = '|'.$LaTeX_see_index_commands_text{$seecommand}.'{'
                         .$seeconverted.'}';
         last;
diff --git a/tta/perl/Texinfo/Convert/Plaintext.pm 
b/tta/perl/Texinfo/Convert/Plaintext.pm
index 0192b3c5c3..a782f0f632 100644
--- a/tta/perl/Texinfo/Convert/Plaintext.pm
+++ b/tta/perl/Texinfo/Convert/Plaintext.pm
@@ -1995,9 +1995,8 @@ sub process_printindex($$;$)
       my $referred_tree = Texinfo::TreeElement::new({});
       $referred_tree->{'type'} = '_code'
         if ($indices_information->{$entry_index_name}->{'in_code'});
-      if ($referred_entry->{'contents'} and $referred_entry->{'contents'}->[0]
-          and $referred_entry->{'contents'}->[0]->{'contents'}) {
-        $referred_tree->{'contents'} = [$referred_entry->{'contents'}->[0]];
+      if ($referred_entry->{'contents'}) {
+        $referred_tree->{'contents'} = [$referred_entry];
       }
 
       # indent with the same width as '* ', but do not use * such that the
diff --git a/tta/perl/Texinfo/Convert/ReadDocBook.pm 
b/tta/perl/Texinfo/Convert/ReadDocBook.pm
index c384d7a65b..d9bd617c47 100644
--- a/tta/perl/Texinfo/Convert/ReadDocBook.pm
+++ b/tta/perl/Texinfo/Convert/ReadDocBook.pm
@@ -719,7 +719,7 @@ sub _index_entry($$)
                                                             'seeentry');
     if ($seeentry) {
       $result .= "<see>";
-      $result .= $self->convert_tree($seeentry->{'contents'}->[0]);
+      $result .= $self->convert_tree($seeentry);
       $result .= "</see>";
     }
     my $seealso
@@ -727,7 +727,7 @@ sub _index_entry($$)
                                                             'seealso');
     if ($seealso) {
       $result .= "<seealso>";
-      $result .= $self->convert_tree($seealso->{'contents'}->[0]);
+      $result .= $self->convert_tree($seealso);
       $result .= "</seealso>";
     }
 
diff --git a/tta/perl/Texinfo/Convert/TreeElementReadDocBook.pm 
b/tta/perl/Texinfo/Convert/TreeElementReadDocBook.pm
index 0264d03c72..e1559bbd18 100644
--- a/tta/perl/Texinfo/Convert/TreeElementReadDocBook.pm
+++ b/tta/perl/Texinfo/Convert/TreeElementReadDocBook.pm
@@ -762,7 +762,7 @@ sub _index_entry($$)
                                                             'seeentry');
     if ($seeentry) {
       $result .= "<see>";
-      $result .= $self->convert_tree($seeentry->get_child(0));
+      $result .= $self->convert_tree($seeentry);
       $result .= "</see>";
     }
     my $seealso
@@ -770,7 +770,7 @@ sub _index_entry($$)
                                                             'seealso');
     if ($seealso) {
       $result .= "<seealso>";
-      $result .= $self->convert_tree($seealso->get_child(0));
+      $result .= $self->convert_tree($seealso);
       $result .= "</seealso>";
     }
 
diff --git a/tta/perl/Texinfo/Convert/TreeReadDocBook.pm 
b/tta/perl/Texinfo/Convert/TreeReadDocBook.pm
index 8147febc6a..3bb64d37ec 100644
--- a/tta/perl/Texinfo/Convert/TreeReadDocBook.pm
+++ b/tta/perl/Texinfo/Convert/TreeReadDocBook.pm
@@ -764,7 +764,7 @@ sub _index_entry($$)
                                                             'seeentry');
     if ($seeentry) {
       $result .= "<see>";
-      $result .= $self->convert_tree($seeentry->{'contents'}->[0]);
+      $result .= $self->convert_tree($seeentry);
       $result .= "</see>";
     }
     my $seealso
@@ -772,7 +772,7 @@ sub _index_entry($$)
                                                             'seealso');
     if ($seealso) {
       $result .= "<seealso>";
-      $result .= $self->convert_tree($seealso->{'contents'}->[0]);
+      $result .= $self->convert_tree($seealso);
       $result .= "</seealso>";
     }