branch master updated: Add omit_def_name_space to extra def_line too

[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 c1d2b3e172 Add omit_def_name_space to extra def_line too
c1d2b3e172 is described below

commit c1d2b3e1721f9960aa16ba6d57d5eb2a032f8a9e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Aug 2 00:10:34 2022 +0200

    Add omit_def_name_space to extra def_line too
    
    * tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command)
    (handle_block_command), tp/Texinfo/ParserNonXS.pm (_parse_texi):
    add omit_def_name_space to extra def_line based on txidefnamenospace
    value.
    
    * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type),
    tp/Texinfo/Convert/LaTeX.pm (_convert): use def_line
    omit_def_name_space.
---
 ChangeLog                                 | 13 +++++++++++++
 tp/Texinfo/Convert/HTML.pm                |  2 +-
 tp/Texinfo/Convert/LaTeX.pm               |  2 +-
 tp/Texinfo/ParserNonXS.pm                 |  8 ++++++++
 tp/Texinfo/XS/parsetexi/handle_commands.c |  8 ++++++++
 tp/t/results/def/omit_def_space.pl        |  2 ++
 6 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7395619849..19fed60a53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,19 @@
        * tp/Texinfo/Convert/LaTeX.pm (_convert): Implement @dmn with
        \thinspace, as in texinfo.tex.
 
+2022-07-31  Patrice Dumas  <pertusus@free.fr>
+
+       Add omit_def_name_space to extra def_line too
+
+       * tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command)
+       (handle_block_command), tp/Texinfo/ParserNonXS.pm (_parse_texi):
+       add omit_def_name_space to extra def_line based on txidefnamenospace
+       value.
+
+       * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type),
+       tp/Texinfo/Convert/LaTeX.pm (_convert): use def_line
+       omit_def_name_space.
+
 2022-07-31  Patrice Dumas  <pertusus@free.fr>
 
        Handle txidefnamenospace/omit_def_name_space in HTML
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 40d5eacd0d..2d47c4e49e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5893,7 +5893,7 @@ sub _convert_def_line_type($$$$)
   }
 
   my $def_space = ' ';
-  if ($element->{'parent'}->{'extra'}->{'omit_def_name_space'}) {
+  if ($element->{'extra'}->{'omit_def_name_space'}) {
     $def_space = '';
   }
 
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 5cd022ea40..e55c463bae 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3541,7 +3541,7 @@ sub _convert($$)
           $name = '';
         }
         my $def_space = ' ';
-        if ($element->{'parent'}->{'extra'}->{'omit_def_name_space'}) {
+        if ($element->{'extra'}->{'omit_def_name_space'}) {
           $def_space = '';
         }
 
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 134f93a233..124ef5aa70 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4829,6 +4829,10 @@ sub _parse_texi($$$)
                 $current->{'contents'}->[-1]->{'extra'}
                   = {'def_command' => $base_command,
                      'original_def_cmdname' => $command};
+                if (defined($self->{'values'}->{'txidefnamenospace'})) {
+                  $current->{'contents'}->[-1]{'extra'}
+                                      ->{'omit_def_name_space'} = 1;
+                }
                 if ($current->{'cmdname'}
                     and $current->{'cmdname'} eq $base_command) {
                   pop @{$current->{'contents'}};
@@ -5024,6 +5028,10 @@ sub _parse_texi($$$)
                                                  {'def_command' => $command,
                                                   'original_def_cmdname' => 
$command}
                                                 };
+              if (defined($self->{'values'}->{'txidefnamenospace'})) {
+                $current->{'contents'}->[-1]->{'extra'}
+                                            ->{'omit_def_name_space'} = 1;
+              }
             } else {
               $block = { 'cmdname' => $command,
                          'parent' => $current,
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c 
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index bc2350ac41..238f6d8fd3 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -612,6 +612,12 @@ handle_line_command (ELEMENT *current, char **line_inout,
               after_paragraph = check_no_text (current);
               push_context (ct_def, cmd);
               misc->type = ET_def_line;
+
+              /* Check txidefnamenospace flag */
+              char *val = fetch_value ("txidefnamenospace");
+              if (val)
+                add_extra_integer (misc, "omit_def_name_space", 1);
+
               if (current->cmd == base_command)
                 {
                   ELEMENT *e = pop_element_from_contents (current);
@@ -926,6 +932,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));
+          if (val)
+            add_extra_integer (current, "omit_def_name_space", 1);
         }
       else
         {
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index bba01cdac6..d5fdae84c6 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -240,6 +240,7 @@ $result_trees{'omit_def_space'} = {
                   'node' => {},
                   'number' => 1
                 },
+                'omit_def_name_space' => 1,
                 'original_def_cmdname' => 'defun'
               },
               'parent' => {},
@@ -350,6 +351,7 @@ $result_trees{'omit_def_space'} = {
                   'node' => {},
                   'number' => 2
                 },
+                'omit_def_name_space' => 1,
                 'original_def_cmdname' => 'defunx',
                 'spaces_before_argument' => ' '
               },