texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/HTML.pm (_external_node_href


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/HTML.pm (_external_node_href): do not call _normalized_to_id in $target, it is already done in _normalized_label_id_file.
Date: Mon, 04 Sep 2023 17:40:32 -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 2273cd7dda * tp/Texinfo/Convert/HTML.pm (_external_node_href): do not 
call _normalized_to_id in $target, it is already done in 
_normalized_label_id_file.
2273cd7dda is described below

commit 2273cd7dda7c9179e14722fe169fb47cc8d1793a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Sep 4 23:40:21 2023 +0200

    * tp/Texinfo/Convert/HTML.pm (_external_node_href): do not call
    _normalized_to_id in $target, it is already done in
    _normalized_label_id_file.
---
 ChangeLog                  | 6 ++++++
 tp/Texinfo/Convert/HTML.pm | 8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f4fe902b42..e6626259ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-09-04  Patrice Dumas <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_external_node_href): do not call
+       _normalized_to_id in $target, it is already done in
+       _normalized_label_id_file.
+
 2023-09-04  Patrice Dumas <pertusus@free.fr>
 
        Add last element argument to format_end_file
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 0c4d46f5f6..5510917f24 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -9502,8 +9502,6 @@ sub _external_node_href($$$;$)
       = $self->_normalized_label_id_file($external_node->{'normalized'},
                                          $external_node->{'node_content'});
 
-  my $xml_target = _normalized_to_id($target);
-
   my $default_target_split = $self->get_conf('EXTERNAL_CROSSREF_SPLIT');
 
   my $external_file_extension = '';
@@ -9520,7 +9518,7 @@ sub _external_node_href($$$;$)
        {'contents' => $external_node->{'manual_content'}},
        { 'code' => 1,
          Texinfo::Convert::Text::copy_options_for_convert_text($self)});
-    if ($self->get_conf('IGNORE_REF_TO_TOP_NODE_UP') and $xml_target eq '') {
+    if ($self->get_conf('IGNORE_REF_TO_TOP_NODE_UP') and $target eq '') {
       my $top_node_up = $self->get_conf('TOP_NODE_UP');
       if (defined($top_node_up) and "($manual_name)" eq $top_node_up) {
         return '';
@@ -9617,7 +9615,7 @@ sub _external_node_href($$$;$)
   }
 
   if (! $target_split) {
-    return $file . '#' . $xml_target;
+    return $file . '#' . $target;
   } else {
     my $file_name;
     if ($target eq 'Top' and defined($self->get_conf('TOP_NODE_FILE_TARGET'))) 
{
@@ -9625,7 +9623,7 @@ sub _external_node_href($$$;$)
     } else {
       $file_name = $target_filebase . $external_file_extension;
     }
-    return $file . $file_name . '#' . $xml_target;
+    return $file . $file_name . '#' . $target;
   }
 }
 



reply via email to

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