texinfo-commits
[Top][All Lists]
Advanced

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

[6400] allow <key> in index entry


From: Gavin D. Smith
Subject: [6400] allow <key> in index entry
Date: Tue, 07 Jul 2015 12:42:59 +0000

Revision: 6400
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6400
Author:   gavin
Date:     2015-07-07 12:42:58 +0000 (Tue, 07 Jul 2015)
Log Message:
-----------
allow <key> in index entry

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-07 12:16:26 UTC (rev 6399)
+++ trunk/ChangeLog     2015-07-07 12:42:58 UTC (rev 6400)
@@ -1,5 +1,10 @@
 2015-07-07  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/Plaintext.pm (%index_style_commands): Add 'key'.
+       * NEWS: Mention reduced text styles.
+
+2015-07-07  Gavin Smith  <address@hidden>
+
        * util/Makefile.am (EXTRA_DIST): Distribute TESTS, but not
        all the contents of the test subdirectory, as this makes it 
        possible for *.trs files to be be distributed.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2015-07-07 12:16:26 UTC (rev 6399)
+++ trunk/NEWS  2015-07-07 12:42:58 UTC (rev 6400)
@@ -22,6 +22,11 @@
   
http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Document-Permissions.html
 
 -------------------------------------------------------------------------------
+* makeinfo
+  . quotation marks are left out for node names and index entries in
+    Info output where they would have been produced by commands such
+    as @file or @option.
+
 
 6.0 (26 June 2015)
 * Language:

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2015-07-07 12:16:26 UTC (rev 
6399)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2015-07-07 12:42:58 UTC (rev 
6400)
@@ -58,7 +58,7 @@
 @EXPORT = qw(
 );
 
-$VERSION = '6.0';
+$VERSION = '6.0dev';
 
 # misc commands that are of use for formatting.
 my %formatting_misc_commands = 
%Texinfo::Convert::Text::formatting_misc_commands;
@@ -300,7 +300,7 @@
 
 # Commands producing styles that are output in node names and index entries.
 my %index_style_commands;
-for my $index_style_command ('strong', 'emph', 'sub', 'sup') {
+for my $index_style_command ('strong', 'emph', 'sub', 'sup', 'key') {
   $index_style_commands{$index_style_command} = 1;
 }
 

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-07 
12:16:26 UTC (rev 6399)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs.pl  2015-07-07 
12:42:58 UTC (rev 6400)
@@ -22714,8 +22714,8 @@
 AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <address@hidden>
 <address@hidden>:: *note [f--ile1] Image description""\\.:: *note  @ {} . :: 
*note cite asis in @w b
 in r SC *str* t VAR dfn i:: *note env code option samp command file C-x
-ESC:: *note 8.27in:: *note sansserif slanted:: *note indicateurl:: *note
-_{g}H 3^{rd}:: *note <http://somewhere_aaa> text (url) ls::
+<ESC>:: *note 8.27in:: *note sansserif slanted:: *note indicateurl::
+*note _{g}H 3^{rd}:: *note <http://somewhere_aaa> text (url) ls::
 
 ';
 
@@ -23564,7 +23564,7 @@
 * [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::
+* env code option samp command file C-x <ESC>::
 * 8.27in::
 * sansserif slanted::
 * indicateurl::
@@ -23697,19 +23697,19 @@
 ***********
 
 
-File: ,  Node: cite asis in @w b in r SC *str* t VAR dfn i,  Next: env code 
option samp command file C-x ESC,  Prev:  @ {} . ,  Up: Top
+File: ,  Node: cite asis in @w b in r SC *str* t VAR dfn i,  Next: env code 
option samp command file C-x <ESC>,  Prev:  @ {} . ,  Up: Top
 
 21 \'cite asis\' in @w b in r SC *str* t VAR "dfn" i
 **************************************************
 
 
-File: ,  Node: env code option samp command file C-x ESC,  Next: 8.27in,  
Prev: cite asis in @w b in r SC *str* t VAR dfn i,  Up: Top
+File: ,  Node: env code option samp command file C-x <ESC>,  Next: 8.27in,  
Prev: cite asis in @w b in r SC *str* t VAR dfn i,  Up: Top
 
 22 \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\'
 ************************************************************
 
 
-File: ,  Node: 8.27in,  Next: sansserif slanted,  Prev: env code option samp 
command file C-x ESC,  Up: Top
+File: ,  Node: 8.27in,  Next: sansserif slanted,  Prev: env code option samp 
command file C-x <ESC>,  Up: Top
 
 23 8.27in
 *********
@@ -23753,41 +23753,41 @@
 AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <address@hidden>
 <address@hidden>:: *note [f--ile1] [image src="f--ile.png" alt="alt" 
text="Image description\\"\\"\\\\."]:: *note  @ {} . :: *note cite asis in @w 
b
 in r SC *str* t VAR dfn i:: *note env code option samp command file C-x
-ESC:: *note 8.27in:: *note sansserif slanted:: *note indicateurl:: *note
-_{g}H 3^{rd}:: *note <http://somewhere_aaa> text (url) ls::
+<ESC>:: *note 8.27in:: *note sansserif slanted:: *note indicateurl::
+*note _{g}H 3^{rd}:: *note <http://somewhere_aaa> text (url) ls::
 
 
 
 Tag Table:
 Node: Top27
-Node: { }837
+Node: { }839
 Node:     !
-. . ? @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
+. . ? @918
+Node: @ { } \\ #1023
+Node: LaTeX TeX * , (C) ... ...1142
+Node: == error-> Euro ! ==> -1303
+Node: >= <= ->1459
+Node: a o -!- # -| ? (R)1578
+Node: => o a b a sunny day aa1717
+Node: AA ae oe AE OE /o /O ss /l /L D d TH th1897
+Node: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;2124
+Node: e. e( e_ .e e< j ee[2338
+Node: i E=` C\',2496
+Node: `` \'\' ` \' ,, ,2613
+Node: << >> << >> < >2735
+Node: `` \'\' --- -- ` \'2866
+Node: AAA (fff) AAA BBB2994
+Node: CCC (rrr) CCC DDD3134
+Node: the someone <address@hidden> <address@hidden>3307
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\\"\\"\\\\."]3607
+Node:  @ {} . 3957
+Node: cite asis in @w b in r SC *str* t VAR dfn i4160
+Node: env code option samp command file C-x <ESC>4404
+Node: 8.27in4666
+Node: sansserif slanted4800
+Node: indicateurl4924
+Node: _{g}H 3^{rd}5046
+Node: <http://somewhere_aaa> text (url) ls5185
 
 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-07 12:16:26 UTC (rev 6399)
+++ 
trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
     2015-07-07 12:42:58 UTC (rev 6400)
@@ -30,7 +30,7 @@
 * [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::
+* env code option samp command file C-x <ESC>::
 * 8.27in::
 * sansserif slanted::
 * indicateurl::
@@ -163,19 +163,19 @@
 ***********
 
 
-File: at_commands_in_refs_latin1.info,  Node: cite asis in @w b in r SC *str* 
t VAR dfn i,  Next: env code option samp command file C-x ESC,  Prev:  @ {} . , 
 Up: Top
+File: at_commands_in_refs_latin1.info,  Node: cite asis in @w b in r SC *str* 
t VAR dfn i,  Next: env code option samp command file C-x <ESC>,  Prev:  @ {} . 
,  Up: Top
 
 21 'cite asis' in @w b in r SC *str* t VAR "dfn" i
 **************************************************
 
 
-File: at_commands_in_refs_latin1.info,  Node: env code option samp command 
file C-x ESC,  Next: 8.27in,  Prev: cite asis in @w b in r SC *str* t VAR dfn 
i,  Up: Top
+File: at_commands_in_refs_latin1.info,  Node: env code option samp command 
file C-x <ESC>,  Next: 8.27in,  Prev: cite asis in @w b in r SC *str* t VAR dfn 
i,  Up: Top
 
 22 'env' 'code' 'option' 'samp' 'command' 'file' 'C-x <ESC>'
 ************************************************************
 
 
-File: at_commands_in_refs_latin1.info,  Node: 8.27in,  Next: sansserif 
slanted,  Prev: env code option samp command file C-x ESC,  Up: Top
+File: at_commands_in_refs_latin1.info,  Node: 8.27in,  Next: sansserif 
slanted,  Prev: env code option samp command file C-x <ESC>,  Up: Top
 
 23 8.27in
 *********
@@ -218,42 +218,42 @@
 < >:: *note `` '' --- -- ` ':: *note AAA (fff) AAA BBB:: *note CCC (rrr)
 CCC DDD:: *note the someone <address@hidden> <address@hidden>::
 *note [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]:: *note  @ {} . :: *note cite asis in @w b in r SC *str* 
t VAR
-dfn i:: *note env code option samp command file C-x ESC:: *note 8.27in::
-*note sansserif slanted:: *note indicateurl:: *note _{g}H 3^{rd}:: *note
-<http://somewhere_aaa> text (url) ls::
+dfn i:: *note env code option samp command file C-x <ESC>:: *note
+8.27in:: *note sansserif slanted:: *note indicateurl:: *note _{g}H
+3^{rd}:: *note <http://somewhere_aaa> text (url) ls::
 
 
 
 Tag Table:
 Node: Top58
-Node: { }871
+Node: { }873
 Node:     !
-. . ? @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
+. . ? @983
+Node: @ { } \ #1119
+Node: LaTeX TeX * , \xA9 ... ...1267
+Node: == error-> \xA4 \xA1 ==> -1450
+Node: >= <= ->1626
+Node: \xAA \xBA -!- \xA3 -| \xBF \xAE1771
+Node: => \xB0 a b a sunny day \xE51934
+Node: \xC5 \xE6 \xBD \xC6 \xBC \xF8 \xD8 \xDF /l /L \xD0 \xF0 \xDE \xFE2130
+Node: \xE4 e~ \xEE \xE2 \xE0 \xE9 \xE7 e= e* e'' e;2351
+Node: e. e( e_ .e e< j ee[2568
+Node: i E=` C',2751
+Node: `` '' ` ' ,, ,2899
+Node: \xAB \xBB \xAB \xBB < >3048
+Node: `` '' --- -- ` '3198
+Node: AAA (fff) AAA BBB3353
+Node: CCC (rrr) CCC DDD3524
+Node: the someone <address@hidden> <address@hidden>3728
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]4059
+Node:  @ {} . 4440
+Node: cite asis in @w b in r SC *str* t VAR dfn i4674
+Node: env code option samp command file C-x <ESC>4949
+Node: 8.27in5242
+Node: sansserif slanted5407
+Node: indicateurl5562
+Node: _{g}H 3^{rd}5715
+Node: <http://somewhere_aaa> text (url) ls5885
 
 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-07 12:16:26 UTC (rev 6399)
+++ 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 2015-07-07 12:42:58 UTC (rev 6400)
@@ -30,7 +30,7 @@
 * [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::
+* env code option samp command file C-x <ESC>::
 * 8.27in::
 * sansserif slanted::
 * indicateurl::
@@ -163,19 +163,19 @@
 ***********
 
 
-File: at_commands_in_refs_utf8.info,  Node: cite asis in @w b in r SC *str* t 
VAR dfn i,  Next: env code option samp command file C-x ESC,  Prev:  @ {} . ,  
Up: Top
+File: at_commands_in_refs_utf8.info,  Node: cite asis in @w b in r SC *str* t 
VAR dfn i,  Next: env code option samp command file C-x <ESC>,  Prev:  @ {} . , 
 Up: Top
 
 21 ‘cite asis’ in @w b in r SC *str* t VAR “dfn” i
 **************************************************
 
 
-File: at_commands_in_refs_utf8.info,  Node: env code option samp command file 
C-x ESC,  Next: 8.27in,  Prev: cite asis in @w b in r SC *str* t VAR dfn i,  
Up: Top
+File: at_commands_in_refs_utf8.info,  Node: env code option samp command file 
C-x <ESC>,  Next: 8.27in,  Prev: cite asis in @w b in r SC *str* t VAR dfn i,  
Up: Top
 
 22 ‘env’ ‘code’ ‘option’ ‘samp’ ‘command’ ‘file’ ‘C-x <ESC>’
 ************************************************************
 
 
-File: at_commands_in_refs_utf8.info,  Node: 8.27in,  Next: sansserif slanted,  
Prev: env code option samp command file C-x ESC,  Up: Top
+File: at_commands_in_refs_utf8.info,  Node: 8.27in,  Next: sansserif slanted,  
Prev: env code option samp command file C-x <ESC>,  Up: Top
 
 23 8.27in
 *********
@@ -218,7 +218,7 @@
 --- -- ` ':: *note AAA (fff) AAA BBB:: *note CCC (rrr) CCC DDD:: *note
 the someone <address@hidden> <address@hidden>:: *note [f--ile1] [image 
src="f--ile.png" alt="alt" text="Image description\"\"\\."]:: *note
  @ {} . :: *note cite asis in @w b in r SC *str* t VAR dfn i:: *note env
-code option samp command file C-x ESC:: *note 8.27in:: *note sansserif
+code option samp command file C-x <ESC>:: *note 8.27in:: *note sansserif
 slanted:: *note indicateurl:: *note _{g}H 3^{rd}:: *note
 <http://somewhere_aaa> text (url) ls::
 
@@ -226,34 +226,34 @@
 
 Tag Table:
 Node: Top56
-Node: { }930
+Node: { }932
 Node:     !
-. . ? @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
+. . ? @1040
+Node: @ { } \ #1174
+Node: LaTeX TeX • , © ... ...1323
+Node: ≡ error→ € ¡ ↦ −1517
+Node: ≥ ≤ →1707
+Node: ª º ★ £ ⊣ ¿ ®1866
+Node: ⇒ ° a b a sunny day å2042
+Node: Å æ œ Æ Œ ø Ø ß ł Ł Ð ð Þ þ2259
+Node: ä ẽ î â à é ç ē e̊ e̋ ę2511
+Node: ė ĕ e̲ ẹ ě j ee͡2751
+Node: ı Ḕ Ḉ2941
+Node: “ ” ‘ ’ „ ‚3097
+Node: « » « » ‹ ›3268
+Node: `` '' --- -- ` '3441
+Node: AAA (fff) AAA BBB3612
+Node: CCC (rrr) CCC DDD3781
+Node: the someone <address@hidden> <address@hidden>3983
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image 
description\"\"\\."]4312
+Node:  @ {} . 4691
+Node: cite asis in @w b in r SC *str* t VAR dfn i4923
+Node: env code option samp command file C-x <ESC>5204
+Node: 8.27in5523
+Node: sansserif slanted5686
+Node: indicateurl5839
+Node: _{g}H 3^{rd}5994
+Node: <http://somewhere_aaa> text (url) ls6162
 
 End Tag Table
 




reply via email to

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