branch master updated: No omit_def_name_space in main def element

[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 a7f94df7dd No omit_def_name_space in main def element
a7f94df7dd is described below

commit a7f94df7ddbb485ff9685994088273068ea06b52
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Aug 2 10:20:08 2022 +0200

    No omit_def_name_space in main def element
    
    * tp/Texinfo/ParserNonXS.pm (_parse_texi),
    tp/Texinfo/XS/parsetexi/handle_commands.c (handle_block_command):
    do not add omit_def_name_space to @def* main command.
---
 ChangeLog                                 | 8 ++++++++
 tp/Texinfo/ParserNonXS.pm                 | 3 ---
 tp/Texinfo/XS/parsetexi/handle_commands.c | 7 ++-----
 tp/t/results/def/omit_def_space.pl        | 1 -
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5190d354d4..8a768c42ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-08-01  Patrice Dumas  <pertusus@free.fr>
+
+       No omit_def_name_space in main def element
+
+       * tp/Texinfo/ParserNonXS.pm (_parse_texi),
+       tp/Texinfo/XS/parsetexi/handle_commands.c (handle_block_command):
+       do not add omit_def_name_space to @def* main command.
+
 2022-08-01  Gavin Smith  <gavinsmith0123@gmail.com>
 
        @firstparagraphindent in LaTeX
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 124ef5aa70..abb6e06a46 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -5017,9 +5017,6 @@ sub _parse_texi($$$)
                          'contents' => [] };
               push @{$current->{'contents'}}, $block;
               $current = $current->{'contents'}->[-1];
-              if (defined($self->{'values'}->{'txidefnamenospace'})) {
-                $current->{'extra'}->{'omit_def_name_space'} = 1;
-              }
               push @{$current->{'contents'}}, {
                                                 'type' => 'def_line',
                                                 'parent' => $current,
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c 
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 238f6d8fd3..e92c0883de 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -920,11 +920,6 @@ handle_block_command (ELEMENT *current, char **line_inout,
           add_to_element_contents (current, block);
           current = block;
 
-          /* Check txidefnamenospace flag */
-          char *val = fetch_value ("txidefnamenospace");
-          if (val)
-            add_extra_integer (current, "omit_def_name_space", 1);
-
           def_line = new_element (ET_def_line);
           def_line->source_info = current_source_info;
           add_to_element_contents (current, def_line);
@@ -932,6 +927,8 @@ handle_block_command (ELEMENT *current, char **line_inout,
           add_extra_string_dup (current, "def_command", command_name(cmd));
           add_extra_string_dup (current, "original_def_cmdname", 
                                 command_name(cmd));
+          /* Check txidefnamenospace flag */
+          char *val = fetch_value ("txidefnamenospace");
           if (val)
             add_extra_integer (current, "omit_def_name_space", 1);
         }
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index d5fdae84c6..f4c9b54b44 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -413,7 +413,6 @@ $result_trees{'omit_def_space'} = {
           ],
           'extra' => {
             'end_command' => {},
-            'omit_def_name_space' => 1,
             'spaces_before_argument' => ' '
           },
           'parent' => {},