texinfo-commits
[Top][All Lists]
Advanced

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

[8003] fix misleading warning about node names


From: gavinsmith0123
Subject: [8003] fix misleading warning about node names
Date: Mon, 4 Jun 2018 05:46:19 -0400 (EDT)

Revision: 8003
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8003
Author:   gavin
Date:     2018-06-04 05:46:18 -0400 (Mon, 04 Jun 2018)
Log Message:
-----------
fix misleading warning about node names

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Plaintext.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-06-02 09:50:08 UTC (rev 8002)
+++ trunk/ChangeLog     2018-06-04 09:46:18 UTC (rev 8003)
@@ -1,3 +1,14 @@
+2018-06-04  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Convert/Plaintext.pm (_convert):
+       When checking if a node name in a cross-reference includes a
+       `.', do not include in the check any manual name that may have 
+       already been stored inside the paragraph formatter.  Rical Jasan 
+       reported that an error message mentioning the "node name" would 
+       be given for output like "(gcc.info)Debugging Options" which is 
+       confusing as the `.' is not in the node name "Debugging 
+       Options".  (bug-texinfo 2018-02-09)
+
 2018-06-02  Gavin Smith  <address@hidden>
 
        * info/nodes.c (info_node_of_tag_ext): Always call 

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2018-06-02 09:50:08 UTC (rev 
8002)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2018-06-04 09:46:18 UTC (rev 
8003)
@@ -2064,6 +2064,9 @@
           }
           # node name
           $self->{'formatters'}->[-1]->{'suppress_styles'} = 1;
+
+          my $maybe_file
+            = get_pending($self->{'formatters'}->[-1]->{'container'});
           my $node_text = _convert($self, {'type' => '_code',
                                            'contents' => $node_content});
           delete $self->{'formatters'}->[-1]->{'suppress_styles'};
@@ -2070,6 +2073,9 @@
 
           my $node_text_checked = $node_text 
              .get_pending($self->{'formatters'}->[-1]->{'container'});
+          $maybe_file =~ s/^\s*//;
+          $maybe_file = quotemeta $maybe_file;
+          $node_text_checked =~ s/^\s*$maybe_file//;
           $quoting_required = 0;
           if ($node_text_checked =~ /([,\t\.])/m ) {
               if ($self->get_conf('INFO_SPECIAL_CHARS_WARNING')) {




reply via email to

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