branch master updated: * doc/texinfo.texi (Other Formats Customization Variables), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/options_data.txt, tp/t/xml_tests.t: add a new customization variable, TXI_MARKUP_NO_SECTION_EXTENT, to be used in TexinfoMarkup.pm instead of USE_NODES to avoid multiple significations for USE_NODES.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 7a71d6db90 * doc/texinfo.texi (Other Formats Customization Variables), 
tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/options_data.txt, 
tp/t/xml_tests.t: add a new customization variable, 
TXI_MARKUP_NO_SECTION_EXTENT, to be used in TexinfoMarkup.pm instead of 
USE_NODES to avoid multiple significations for USE_NODES.
7a71d6db90 is described below

commit 7a71d6db90103020bec36af0d45e7e753f1538f5
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Apr 6 12:49:05 2024 +0200

    * doc/texinfo.texi (Other Formats Customization Variables),
    tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
    tp/Texinfo/options_data.txt, tp/t/xml_tests.t: add a new customization
    variable, TXI_MARKUP_NO_SECTION_EXTENT, to be used in TexinfoMarkup.pm
    instead of USE_NODES to avoid multiple significations for USE_NODES.
---
 ChangeLog                           | 8 ++++++++
 doc/texinfo.texi                    | 4 ++++
 tp/Texinfo/Convert/TexinfoMarkup.pm | 8 ++++----
 tp/Texinfo/options_data.txt         | 2 ++
 tp/t/xml_tests.t                    | 2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49eafee7b6..ac43b46f8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-04-06  Patrice Dumas  <pertusus@free.fr>
+
+       * doc/texinfo.texi (Other Formats Customization Variables),
+       tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+       tp/Texinfo/options_data.txt, tp/t/xml_tests.t: add a new customization
+       variable, TXI_MARKUP_NO_SECTION_EXTENT, to be used in TexinfoMarkup.pm
+       instead of USE_NODES to avoid multiple significations for USE_NODES.
+
 2024-04-06  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.tres, tp/t/xml_tests.t ($sectioning_test)
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 12ac0e2c17..cc32377418 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -15981,6 +15981,10 @@ This table gives the customization which apply to 
specific formats only,
 for formats without separate customization variables description section.
 
 @vtable @code
+@item TXI_MARKUP_NO_SECTION_EXTENT
+For XML@.  Do not include lower level sectioning commands inside upper-level
+sectioning command markup.
+
 @item TEXI2DVI
 Name of the command used to produce PostScript, PDF, and DVI; default
 @samp{texi2dvi}.  @xref{@command{texi2any} Printed Output}.
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 42c9c0e816..d6bd26adef 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -858,7 +858,7 @@ sub _convert($$;$)
             }
             $direction_index++;
           }
-          if (! $self->get_conf('USE_NODES')) {
+          if (! $self->get_conf('TXI_MARKUP_NO_SECTION_EXTENT')) {
             $result .= $self->txi_markup_close_element('node');
           }
           $result .= $self->format_comment_or_return_end_line($element);
@@ -873,7 +873,7 @@ sub _convert($$;$)
           $result .= $self->txi_markup_open_element($level_adjusted_cmdname,
                                                     $attribute);
           my $closed_section_element;
-          if ($self->get_conf('USE_NODES')) {
+          if ($self->get_conf('TXI_MARKUP_NO_SECTION_EXTENT')) {
             $closed_section_element
                = $self->txi_markup_close_element($level_adjusted_cmdname);
           } else {
@@ -1613,7 +1613,7 @@ sub _convert($$;$)
   } elsif ($element->{'cmdname'}
            and $Texinfo::Commands::root_commands{$element->{'cmdname'}}
            and $element->{'cmdname'} ne 'node'
-           and !$self->get_conf('USE_NODES')) {
+           and !$self->get_conf('TXI_MARKUP_NO_SECTION_EXTENT')) {
     my $level_adjusted_cmdname
        = Texinfo::Structuring::section_level_adjusted_command_name($element);
     if (!($element->{'extra'}->{'section_childs'}
@@ -1639,7 +1639,7 @@ sub _convert($$;$)
     }
   } elsif ($element->{'cmdname'}
            and $element->{'cmdname'} eq 'node'
-           and $self->get_conf('USE_NODES')) {
+           and $self->get_conf('TXI_MARKUP_NO_SECTION_EXTENT')) {
     $result .= $self->txi_markup_close_element('node');
 
   }
diff --git a/tp/Texinfo/options_data.txt b/tp/Texinfo/options_data.txt
index 986b83ff3f..10f8476fab 100644
--- a/tp/Texinfo/options_data.txt
+++ b/tp/Texinfo/options_data.txt
@@ -300,6 +300,8 @@ T4H_MATH_CONVERSION                converter_customization 
undef   char
 T4H_TEX_CONVERSION                 converter_customization undef   char
 TEXI2HTML                          converter_customization undef   integer
 TEXINFO_OUTPUT_FORMAT              converter_customization undef   char
+# for Texinfo Markup/XML
+TXI_MARKUP_NO_SECTION_EXTENT       converter_customization undef   integer
 TOC_LINKS                          converter_customization undef   integer
 TOP_FILE                           converter_customization undef   char
 TOP_NODE_FILE_TARGET               converter_customization undef   char
diff --git a/tp/t/xml_tests.t b/tp/t/xml_tests.t
index b3fdfd5257..f5827ee28b 100644
--- a/tp/t/xml_tests.t
+++ b/tp/t/xml_tests.t
@@ -373,7 +373,7 @@ Again with space @inlineifset{flag, }. After.
 $sectioning_test,
 ],
 ['sectioning_test_no_use_nodes',
-$sectioning_test, {}, {'USE_NODES' => 1,},
+$sectioning_test, {}, {'TXI_MARKUP_NO_SECTION_EXTENT' => 1,},
 ],
 );