branch master updated: * tp/Texinfo/Convert/Plaintext.pm (_convert) <menu entries>: Correctly include any DEL quoting characters in the count context.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new f21f712929 * tp/Texinfo/Convert/Plaintext.pm (_convert) <menu 
entries>: Correctly include any DEL quoting characters in the count context.
f21f712929 is described below

commit f21f71292965eb43eac82da0b6553bb091009959
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Dec 31 22:11:24 2023 +0000

    * tp/Texinfo/Convert/Plaintext.pm (_convert) <menu entries>:
    Correctly include any DEL quoting characters in the count context.
---
 ChangeLog                                          |   5 ++
 tp/Texinfo/Convert/Plaintext.pm                    |   3 +-
 .../formats_encodings/at_commands_in_refs.pl       |  54 ++++++++++-----------
 .../res_info/at_commands_in_refs_latin1.info       | Bin 7999 -> 7999 bytes
 .../res_info/at_commands_in_refs_utf8.info         | Bin 8396 -> 8396 bytes
 .../res_info/colons_in_index_entries_and_node.info | Bin 1572 -> 1572 bytes
 .../info_tests/invalid_node_name_no_warning.pl     |   6 +--
 .../info_tests/invalid_node_name_warning.pl        |   6 +--
 .../quote_node_names_info/res_info/nodequote.info  |  10 ++--
 9 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 857e059e18..bf541c042c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-31  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/Convert/Plaintext.pm (_convert) <menu entries>:
+       Correctly include any DEL quoting characters in the count context.
+
 2023-12-31  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/Convert/Unicode.pm (string_width):
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index b747cc8ff0..b15163d877 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -3522,6 +3522,7 @@ sub _convert($$)
             }
           }
           $result .= $pre_quote . $node_text . $post_quote;
+          $self->{'count_context'}->[-1]->{'bytes'} += 2 if $pre_quote;
         } elsif ($content->{'type'} eq 'menu_entry_name') {
           # Flush output so not to include in name text
           $result .= _count_added($self, $formatter->{'container'},
@@ -3548,7 +3549,7 @@ sub _convert($$)
             }
           }
           $result .= $pre_quote . $entry_name . $post_quote;
-
+          $self->{'count_context'}->[-1]->{'bytes'} += 2 if $pre_quote;
         # empty description
         } elsif ($content->{'type'} eq 'menu_entry_description'
                  and (not $content->{'contents'}
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index c41eaef674..acdc828436 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -16972,33 +16972,33 @@ File: ,  Node: <http://somewhere_aaa> text (url) ls,  
Prev: _{g}H 3^{rd},  Up: T
 
 Tag Table:
 Node: Top27
-Node: { }783
-Node:     ! . . ? @862
-Node: @ { } \\ #961
-Node: LaTeX TeX • , © ... ...1080
-Node: ≡ error→ € ¡ ↦ −1230
-Node: ≥ ≤ →1362
-Node: ª º ⋆ £ ⊣ ¿ ®1460
-Node: ⇒ ° a b a sunny day å1579
-Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ1736
-Node: ä ẽ î â à é ç ē e̊ e̋ ę1915
-Node: ė ĕ e̲ ẹ ě ȷ e͡e2081
-Node: ı Ḕ Ḉ2211
-Node: “ ” ‘ ’ „ ‚2309
-Node: « » « » ‹ ›2414
-Node: `` \'\' --- -- ` \'2530
-Node: AAA (fff) AAA BBB2654
-Node: CCC (rrr) CCC DDD2794
-Node: the someone <someone@somewher> <no_explain@there>2967
-Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\\"\\"\\\\."]3267
-Node:  @ {} . 3617
-Node: cite asis in @w b in r SC *str* t VAR dfn i3820
-Node: env code option samp command file C-x <ESC>4064
-Node: 8.27in4326
-Node: sansserif slanted4460
-Node: indicateurl4584
-Node: _{g}H 3^{rd}4706
-Node: <http://somewhere_aaa> text (url) ls4845
+Node: { }785
+Node:     ! . . ? @864
+Node: @ { } \\ #963
+Node: LaTeX TeX • , © ... ...1082
+Node: ≡ error→ € ¡ ↦ −1232
+Node: ≥ ≤ →1364
+Node: ª º ⋆ £ ⊣ ¿ ®1462
+Node: ⇒ ° a b a sunny day å1581
+Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ1738
+Node: ä ẽ î â à é ç ē e̊ e̋ ę1917
+Node: ė ĕ e̲ ẹ ě ȷ e͡e2083
+Node: ı Ḕ Ḉ2213
+Node: “ ” ‘ ’ „ ‚2311
+Node: « » « » ‹ ›2416
+Node: `` \'\' --- -- ` \'2532
+Node: AAA (fff) AAA BBB2656
+Node: CCC (rrr) CCC DDD2796
+Node: the someone <someone@somewher> <no_explain@there>2969
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\\"\\"\\\\."]3269
+Node:  @ {} . 3619
+Node: cite asis in @w b in r SC *str* t VAR dfn i3822
+Node: env code option samp command file C-x <ESC>4066
+Node: 8.27in4328
+Node: sansserif slanted4462
+Node: indicateurl4586
+Node: _{g}H 3^{rd}4708
+Node: <http://somewhere_aaa> text (url) ls4847
 
 End Tag Table
 
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
index e0a4dcd3fe..ab111f92d0 100644
Binary files 
a/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
 and 
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
 differ
diff --git 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
index ca68180970..bfcdbfd1f6 100644
Binary files 
a/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 and 
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 differ
diff --git 
a/tp/t/results/info_tests/colons_in_index_entries_and_node/res_info/colons_in_index_entries_and_node.info
 
b/tp/t/results/info_tests/colons_in_index_entries_and_node/res_info/colons_in_index_entries_and_node.info
index 63059f67ed..140a32b736 100644
Binary files 
a/tp/t/results/info_tests/colons_in_index_entries_and_node/res_info/colons_in_index_entries_and_node.info
 and 
b/tp/t/results/info_tests/colons_in_index_entries_and_node/res_info/colons_in_index_entries_and_node.info
 differ
diff --git a/tp/t/results/info_tests/invalid_node_name_no_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
index e6584d409c..dced3206a9 100644
--- a/tp/t/results/info_tests/invalid_node_name_no_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_no_warning.pl
@@ -817,9 +817,9 @@ File: ,  Node: bidule:,  Prev: node,comma,  Up: Top
 
 Tag Table:
 Node: Top27
-Node: nodename. a151
-Node: node,comma224
-Node: bidule:301
+Node: nodename. a159
+Node: node,comma232
+Node: bidule:309
 
 End Tag Table
 
diff --git a/tp/t/results/info_tests/invalid_node_name_warning.pl 
b/tp/t/results/info_tests/invalid_node_name_warning.pl
index 9ba47a799c..f920f1e125 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -817,9 +817,9 @@ File: ,  Node: bidule:,  Prev: node,comma,  Up: Top
 
 Tag Table:
 Node: Top27
-Node: nodename. a151
-Node: node,comma224
-Node: bidule:301
+Node: nodename. a159
+Node: node,comma232
+Node: bidule:309
 
 End Tag Table
 
diff --git 
a/tp/t/results/info_tests/quote_node_names_info/res_info/nodequote.info 
b/tp/t/results/info_tests/quote_node_names_info/res_info/nodequote.info
index 461d6d96fb..7112b6a66e 100644
--- a/tp/t/results/info_tests/quote_node_names_info/res_info/nodequote.info
+++ b/tp/t/results/info_tests/quote_node_names_info/res_info/nodequote.info
@@ -75,11 +75,11 @@ stuff here.
 
 Tag Table:
 Node: Top55
-Node: blah:blah863
-Node: blumpty.fump986
-Node: normal node1110
-Node: secret,node1270
-Node: top secret node1375
+Node: blah:blah869
+Node: blumpty.fump992
+Node: normal node1116
+Node: secret,node1276
+Node: top secret node1381
 
 End Tag Table