[6391] plain style in node names in menu entries as well

[Gavin D. Smith]

Revision: 6391
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6391
Author:   gavin
Date:     2015-07-05 22:06:35 +0000 (Sun, 05 Jul 2015)
Log Message:
-----------
plain style in node names in menu entries as well

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Plaintext.pm
    trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
    
trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
    
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
    trunk/tp/t/results/sectioning/equivalent_labels.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-05 21:34:39 UTC (rev 6390)
+++ trunk/ChangeLog     2015-07-05 22:06:35 UTC (rev 6391)
@@ -18,6 +18,7 @@
        or it was defined with @definfoenclose.
        <cross-reference command>: Suppress styles for converting node 
        name.
+       <menu entry>: Suppress styles for node names.
 
 2015-07-04  Gavin Smith  <address@hidden>
 

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2015-07-05 21:34:39 UTC (rev 
6390)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2015-07-05 22:06:35 UTC (rev 
6391)
@@ -3050,8 +3050,11 @@
       my $entry_name_seen = 0;
       foreach my $arg (@{$root->{'args'}}) {
         if ($arg->{'type'} eq 'menu_entry_node') {
+          $self->{'formatters'}->[-1]->{'suppress_styles'} = 1;
           my $node_text = $self->_convert({'type' => '_code',
                                       'contents' => $arg->{'contents'}});
+
+          delete $self->{'formatters'}->[-1]->{'suppress_styles'};
           if ($entry_name_seen) {
             if ($node_text =~ /([,\t]|\.\s)/
                 and $self->get_conf('INFO_SPECIAL_CHARS_WARNING')) {

Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs.pl  2015-07-05 
21:34:39 UTC (rev 6390)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs.pl  2015-07-05 
22:06:35 UTC (rev 6391)
@@ -23563,11 +23563,11 @@
 * the someone <address@hidden> <address@hidden>::
 * [f--ile1]  [image src="f--ile.png" alt="alt" text="Image 
description\\"\\"\\\\."]::
 *  @ {} . ::
-* \'cite asis\' in @w b in r SC *str* t VAR "dfn" i::
-* \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\'::
+* cite asis in @w b in r SC *str* t VAR dfn i::
+* env code option samp command file C-x ESC::
 * 8.27in::
 * sansserif slanted::
-* \'indicateurl\'::
+* indicateurl::
 * _{g}H 3^{rd}::
 * <http://somewhere_aaa> text (url) ls::
 
@@ -23760,34 +23760,34 @@
 
 Tag Table:
 Node: Top27
-Node: { }859
+Node: { }837
 Node:     !
-. . ? @938
-Node: @ { } \\ #1043
-Node: LaTeX TeX * , (C) ... ...1162
-Node: == error-> Euro ! ==> -1323
-Node: >= <= ->1479
-Node: a o -!- # -| ? (R)1598
-Node: => o a b a sunny day aa1737
-Node: AA ae oe AE OE /o /O ss /l /L D d TH th1917
-Node: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;2144
-Node: e. e( e_ .e e< j ee[2358
-Node: i E=` C\',2516
-Node: `` \'\' ` \' ,, ,2633
-Node: << >> << >> < >2755
-Node: `` \'\' --- -- ` \'2886
-Node: AAA (fff) AAA BBB3014
-Node: CCC (rrr) CCC DDD3154
-Node: the someone <address@hidden> <address@hidden>3327
-Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\\"\\"\\\\."]3627
-Node:  @ {} . 3977
-Node: cite asis in @w b in r SC *str* t VAR dfn i4180
-Node: env code option samp command file C-x ESC4422
-Node: 8.27in4682
-Node: sansserif slanted4814
-Node: indicateurl4938
-Node: _{g}H 3^{rd}5060
-Node: <http://somewhere_aaa> text (url) ls5199
+. . ? @916
+Node: @ { } \\ #1021
+Node: LaTeX TeX * , (C) ... ...1140
+Node: == error-> Euro ! ==> -1301
+Node: >= <= ->1457
+Node: a o -!- # -| ? (R)1576
+Node: => o a b a sunny day aa1715
+Node: AA ae oe AE OE /o /O ss /l /L D d TH th1895
+Node: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;2122
+Node: e. e( e_ .e e< j ee[2336
+Node: i E=` C\',2494
+Node: `` \'\' ` \' ,, ,2611
+Node: << >> << >> < >2733
+Node: `` \'\' --- -- ` \'2864
+Node: AAA (fff) AAA BBB2992
+Node: CCC (rrr) CCC DDD3132
+Node: the someone <address@hidden> <address@hidden>3305
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\\"\\"\\\\."]3605
+Node:  @ {} . 3955
+Node: cite asis in @w b in r SC *str* t VAR dfn i4158
+Node: env code option samp command file C-x ESC4400
+Node: 8.27in4660
+Node: sansserif slanted4792
+Node: indicateurl4916
+Node: _{g}H 3^{rd}5038
+Node: <http://somewhere_aaa> text (url) ls5177
 
 End Tag Table
 ';

Modified: 
trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
===================================================================
--- 
trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
     2015-07-05 21:34:39 UTC (rev 6390)
+++ 
trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
     2015-07-05 22:06:35 UTC (rev 6391)
@@ -29,11 +29,11 @@
 * the someone <address@hidden> <address@hidden>::
 * [f--ile1]  [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]::
 *  @ {} . ::
-* 'cite asis' in @w b in r SC *str* t VAR "dfn" i::
-* 'env' 'code' 'option' 'samp' 'command' 'file' 'C-x <ESC>'::
+* cite asis in @w b in r SC *str* t VAR dfn i::
+* env code option samp command file C-x ESC::
 * 8.27in::
 * sansserif slanted::
-* 'indicateurl'::
+* indicateurl::
 * _{g}H 3^{rd}::
 * <http://somewhere_aaa> text (url) ls::
 
@@ -226,34 +226,34 @@
 
 Tag Table:
 Node: Top58
-Node: { }893
+Node: { }871
 Node:     !
-. . ? @1003
-Node: @ { } \ #1139
-Node: LaTeX TeX * , \xA9 ... ...1287
-Node: == error-> \xA4 \xA1 ==> -1470
-Node: >= <= ->1646
-Node: \xAA \xBA -!- \xA3 -| \xBF \xAE1791
-Node: => \xB0 a b a sunny day \xE51954
-Node: \xC5 \xE6 \xBD \xC6 \xBC \xF8 \xD8 \xDF /l /L \xD0 \xF0 \xDE \xFE2150
-Node: \xE4 e~ \xEE \xE2 \xE0 \xE9 \xE7 e= e* e'' e;2371
-Node: e. e( e_ .e e< j ee[2588
-Node: i E=` C',2771
-Node: `` '' ` ' ,, ,2919
-Node: \xAB \xBB \xAB \xBB < >3068
-Node: `` '' --- -- ` '3218
-Node: AAA (fff) AAA BBB3373
-Node: CCC (rrr) CCC DDD3544
-Node: the someone <address@hidden> <address@hidden>3748
-Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]4079
-Node:  @ {} . 4460
-Node: cite asis in @w b in r SC *str* t VAR dfn i4694
-Node: env code option samp command file C-x ESC4967
-Node: 8.27in5258
-Node: sansserif slanted5421
-Node: indicateurl5576
-Node: _{g}H 3^{rd}5729
-Node: <http://somewhere_aaa> text (url) ls5899
+. . ? @981
+Node: @ { } \ #1117
+Node: LaTeX TeX * , \xA9 ... ...1265
+Node: == error-> \xA4 \xA1 ==> -1448
+Node: >= <= ->1624
+Node: \xAA \xBA -!- \xA3 -| \xBF \xAE1769
+Node: => \xB0 a b a sunny day \xE51932
+Node: \xC5 \xE6 \xBD \xC6 \xBC \xF8 \xD8 \xDF /l /L \xD0 \xF0 \xDE \xFE2128
+Node: \xE4 e~ \xEE \xE2 \xE0 \xE9 \xE7 e= e* e'' e;2349
+Node: e. e( e_ .e e< j ee[2566
+Node: i E=` C',2749
+Node: `` '' ` ' ,, ,2897
+Node: \xAB \xBB \xAB \xBB < >3046
+Node: `` '' --- -- ` '3196
+Node: AAA (fff) AAA BBB3351
+Node: CCC (rrr) CCC DDD3522
+Node: the someone <address@hidden> <address@hidden>3726
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]4057
+Node:  @ {} . 4438
+Node: cite asis in @w b in r SC *str* t VAR dfn i4672
+Node: env code option samp command file C-x ESC4945
+Node: 8.27in5236
+Node: sansserif slanted5399
+Node: indicateurl5554
+Node: _{g}H 3^{rd}5707
+Node: <http://somewhere_aaa> text (url) ls5877
 
 End Tag Table
 

Modified: 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
===================================================================
--- 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 2015-07-05 21:34:39 UTC (rev 6390)
+++ 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 2015-07-05 22:06:35 UTC (rev 6391)
@@ -29,11 +29,11 @@
 * the someone <address@hidden> <address@hidden>::
 * [f--ile1]  [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]::
 *  @ {} . ::
-* ‘cite asis’ in @w b in r SC *str* t VAR “dfn” i::
-* ‘env’ ‘code’ ‘option’ ‘samp’ ‘command’ ‘file’ ‘C-x <ESC>’::
+* cite asis in @w b in r SC *str* t VAR dfn i::
+* env code option samp command file C-x ESC::
 * 8.27in::
 * sansserif slanted::
-* ‘indicateurl’::
+* indicateurl::
 * _{g}H 3^{rd}::
 * <http://somewhere_aaa> text (url) ls::
 
@@ -226,34 +226,34 @@
 
 Tag Table:
 Node: Top56
-Node: { }992
+Node: { }930
 Node:     !
-. . ? @1100
-Node: @ { } \ #1234
-Node: LaTeX TeX • , © ... ...1383
-Node: ≡ error→ € ¡ ↦ −1577
-Node: ≥ ≤ →1767
-Node: ª º ★ £ ⊣ ¿ ®1926
-Node: ⇒ ° a b a sunny day å2102
-Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ2319
-Node: ä ẽ î â à é ç ē e̊ e̋ ę2571
-Node: ė ĕ e̲ ẹ ě j ee͡2811
-Node: ı Ḕ Ḉ3001
-Node: “ ” ‘ ’ „ ‚3157
-Node: « » « » ‹ ›3328
-Node: `` '' --- -- ` '3501
-Node: AAA (fff) AAA BBB3672
-Node: CCC (rrr) CCC DDD3841
-Node: the someone <address@hidden> <address@hidden>4043
-Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]4372
-Node:  @ {} . 4751
-Node: cite asis in @w b in r SC *str* t VAR dfn i4983
-Node: env code option samp command file C-x ESC5262
-Node: 8.27in5579
-Node: sansserif slanted5740
-Node: indicateurl5893
-Node: _{g}H 3^{rd}6048
-Node: <http://somewhere_aaa> text (url) ls6216
+. . ? @1038
+Node: @ { } \ #1172
+Node: LaTeX TeX • , © ... ...1321
+Node: ≡ error→ € ¡ ↦ −1515
+Node: ≥ ≤ →1705
+Node: ª º ★ £ ⊣ ¿ ®1864
+Node: ⇒ ° a b a sunny day å2040
+Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ2257
+Node: ä ẽ î â à é ç ē e̊ e̋ ę2509
+Node: ė ĕ e̲ ẹ ě j ee͡2749
+Node: ı Ḕ Ḉ2939
+Node: “ ” ‘ ’ „ ‚3095
+Node: « » « » ‹ ›3266
+Node: `` '' --- -- ` '3439
+Node: AAA (fff) AAA BBB3610
+Node: CCC (rrr) CCC DDD3779
+Node: the someone <address@hidden> <address@hidden>3981
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]4310
+Node:  @ {} . 4689
+Node: cite asis in @w b in r SC *str* t VAR dfn i4921
+Node: env code option samp command file C-x ESC5200
+Node: 8.27in5517
+Node: sansserif slanted5678
+Node: indicateurl5831
+Node: _{g}H 3^{rd}5986
+Node: <http://somewhere_aaa> text (url) ls6154
 
 End Tag Table
 

Modified: trunk/tp/t/results/sectioning/equivalent_labels.pl
===================================================================
--- trunk/tp/t/results/sectioning/equivalent_labels.pl  2015-07-05 21:34:39 UTC 
(rev 6390)
+++ trunk/tp/t/results/sectioning/equivalent_labels.pl  2015-07-05 22:06:35 UTC 
(rev 6391)
@@ -758,7 +758,7 @@
 * Menu:
 
 * anch::
-* \'floa\'::
+* floa::
 
 
 Tag Table: