texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/XS/convert/format_html.c (html_conve


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/convert/format_html.c (html_convert_heading_command): remove code related to in_skipped_node_top that was readded during rebasing, but should have stayed out since 2024-09-05 "set in_skipped_node_top when opening a @node (or associated @part), not after processing the contents.".
Date: Sat, 05 Oct 2024 05:09:20 -0400

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 3e54116e06 * tp/Texinfo/XS/convert/format_html.c 
(html_convert_heading_command): remove code related to in_skipped_node_top that 
was readded during rebasing, but should have stayed out since 2024-09-05 "set 
in_skipped_node_top when opening a @node (or associated @part), not after 
processing the contents.".
3e54116e06 is described below

commit 3e54116e0651c319be2b42f4dddb8f6de82b8572
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 5 11:09:28 2024 +0200

    * tp/Texinfo/XS/convert/format_html.c (html_convert_heading_command):
    remove code related to in_skipped_node_top that was readded during
    rebasing, but should have stayed out since 2024-09-05 "set
    in_skipped_node_top when opening a @node (or associated @part), not
    after processing the contents.".
---
 ChangeLog                            |  8 ++++++++
 tp/Texinfo/XS/convert/convert_html.c |  2 --
 tp/Texinfo/XS/convert/format_html.c  | 32 --------------------------------
 3 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bdfdc83436..f2ead0fef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-10-05  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/format_html.c (html_convert_heading_command):
+       remove code related to in_skipped_node_top that was readded during
+       rebasing, but should have stayed out since 2024-09-05 "set
+       in_skipped_node_top when opening a @node (or associated @part), not
+       after processing the contents.".
+
 2024-10-05  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/html_converter_finish.c
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index d1293afaaf..82f85b61d0 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -294,8 +294,6 @@ html_convert_tree_new_formatting_context (CONVERTER *self, 
const ELEMENT *tree,
   return result;
 }
 
-
-
 /* NOTE these switches are not done in perl, so the only perl functions
    that can be called are perl functions that do not call formatting/conversion
    functions or the formatting/conversion functions for HTML will be used. */
diff --git a/tp/Texinfo/XS/convert/format_html.c 
b/tp/Texinfo/XS/convert/format_html.c
index bb0fd35b1e..997f9bab65 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -7121,41 +7121,9 @@ html_convert_heading_command (CONVERTER *self, const 
enum command_id cmd,
   if (self->conf->NO_TOP_NODE_OUTPUT.o.integer > 0
       && builtin_command_data[cmd].flags & CF_root)
     {
-      const ELEMENT *node_element = 0;
       int in_skipped_node_top
         = self->shared_conversion_state.in_skipped_node_top;
 
-      if (cmd == CM_node)
-        node_element = element;
-      else if (cmd == CM_part)
-        {
-          const ELEMENT *part_following_node
-            = lookup_extra_element (element, AI_key_part_following_node);
-          if (part_following_node)
-            node_element = part_following_node;
-        }
-      if (node_element || cmd == CM_part)
-        {
-          int node_is_top = 0;
-          if (node_element)
-            {
-              const char *normalized = lookup_extra_string (node_element,
-                                                            AI_key_normalized);
-              if (normalized && !strcmp (normalized, "Top"))
-                {
-                  node_is_top = 1;
-                  in_skipped_node_top = 1;
-                  self->shared_conversion_state.in_skipped_node_top
-                    = in_skipped_node_top;
-                }
-            }
-          if (!node_is_top && in_skipped_node_top == 1)
-            {
-              in_skipped_node_top = -1;
-              self->shared_conversion_state.in_skipped_node_top
-                = in_skipped_node_top;
-            }
-        }
       if (in_skipped_node_top == 1)
         {
           format_separate_anchor (self, element_id,



reply via email to

[Prev in Thread] Current Thread [Next in Thread]