[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6389] suppress most styles in indices and nodenames
|
From: |
Gavin D. Smith |
|
Subject: |
[6389] suppress most styles in indices and nodenames |
|
Date: |
Sun, 05 Jul 2015 19:37:54 +0000 |
Revision: 6389
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6389
Author: gavin
Date: 2015-07-05 19:37:52 +0000 (Sun, 05 Jul 2015)
Log Message:
-----------
suppress most styles in indices and nodenames
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/converters_tests/ref_in_sectioning.pl
trunk/tp/t/results/coverage_braces/nested_args.pl
trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
trunk/tp/t/results/sectioning/equivalent_labels.pl
trunk/tp/t/results/sectioning/equivalent_nodes.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2015-07-04 15:52:50 UTC (rev 6388)
+++ trunk/ChangeLog 2015-07-05 19:37:52 UTC (rev 6389)
@@ -1,3 +1,16 @@
+2015-07-05 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Convert/Plaintext.pm
+ (new_formatter): Set 'suppress_styles' on formatter object.
+ (_node_line, _printindex_formatted): Pass 'suppress_styles'
+ option to line formatter.
+ (%index_style_commands): New hash.
+ (_convert) <command has styles>: If styles are suppressed,
+ suppress styles unless the command is in %index_style_commands,
+ or it was defined with @definfoenclose.
+ <cross-reference command>: Suppress styles for converting node
+ name.
+
2015-07-04 Gavin Smith <address@hidden>
* tp/Texinfo/Convert/Plaintext.pm (_convert) <brace commands
Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm 2015-07-04 15:52:50 UTC (rev
6388)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm 2015-07-05 19:37:52 UTC (rev
6389)
@@ -298,6 +298,13 @@
$style_map{'sub'} = ['_{', '}'];
$style_map{'sup'} = ['^{', '}'];
+# 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') {
+ $index_style_commands{$index_style_command} = 1;
+}
+
+
# in those commands, there is no addition of double space after a dot.
# math is special
my %no_punctation_munging_commands;
@@ -672,7 +679,8 @@
#'code' => 0, 'code_command'=> 0,
'font_type_stack' => [{}],
'w' => 0, 'type' => $type,
- 'frenchspacing_stack' => [$self->{'conf'}->{'frenchspacing'}]};
+ 'frenchspacing_stack' => [$self->{'conf'}->{'frenchspacing'}],
+ 'suppress_styles' => $conf->{'suppress_styles'}};
if ($type eq 'unfilled') {
foreach my $context (reverse(@{$self->{'context'}})) {
@@ -1199,7 +1207,7 @@
return Texinfo::Common::normalize_top_node_name($node);
}
-# cache formatted node line and returns it
+# convert and cache a node name. $NODE is a node element.
sub _node_line($$)
{
my $self = shift;
@@ -1209,7 +1217,8 @@
'contents' => $node->{'extra'}->{'node_content'}};
push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
$self->{'node_lines_text'}->{$node}->{'text'}
- = _normalize_top_node($self->convert_line($node_text));
+ = _normalize_top_node($self->convert_line($node_text,
+ {'suppress_styles' => 1}));
_update_count_context($self);
my $end_context = pop @{$self->{'count_context'}};
$self->{'node_lines_text'}->{$node}->{'count'}
@@ -1321,7 +1330,8 @@
$entry_tree->{'type'} = 'frenchspacing';
}
my $entry_text = '';
- $entry_text .= $self->convert_line($entry_tree, {'indent' => 0});
+ $entry_text .= $self->convert_line($entry_tree, {'indent' => 0,
+ 'suppress_styles' => 1});
next if ($entry_text !~ /\S/);
# FIXME protect instead
if ($entry_text =~ /:/ and $self->get_conf('INDEX_SPECIAL_CHARS_WARNING'))
{
@@ -1891,15 +1901,17 @@
if ($root->{'type'} and $root->{'type'} eq 'definfoenclose_command') {
$text_before = $root->{'extra'}->{'begin'};
$text_after = $root->{'extra'}->{'end'};
+ } elsif ($non_quoted_commands_when_nested{$command}
+ and $formatter->{'font_type_stack'}->[-1]->{'code_command'}) {
+ $text_before = '';
+ $text_after = '';
+ } elsif ($formatter->{'suppress_styles'}
+ and !$index_style_commands{$command}) {
+ $text_before = '';
+ $text_after = '';
} else {
- if ($non_quoted_commands_when_nested{$command}
- and $formatter->{'font_type_stack'}->[-1]->{'code_command'}) {
- $text_before = '';
- $text_after = '';
- } else {
- $text_before = $self->{'style_map'}->{$command}->[0];
- $text_after = $self->{'style_map'}->{$command}->[1];
- }
+ $text_before = $self->{'style_map'}->{$command}->[0];
+ $text_after = $self->{'style_map'}->{$command}->[1];
}
# do this after determining $text_before/$text_after such that it
# doesn't impact the current command, but only commands nested within
@@ -2154,8 +2166,11 @@
$result .= $self->_convert({'contents' => $file});
}
# node name
+ $self->{'formatters'}->[-1]->{'suppress_styles'} = 1;
my $node_text = $self->_convert({'type' => '_code',
'contents' => $node_content});
+ delete $self->{'formatters'}->[-1]->{'suppress_styles'};
+
my $node_text_checked = $node_text
.$self->{'formatters'}->[-1]->{'container'}->get_pending();
if ($node_text_checked =~ /([,\t]|\.\s)/m
@@ -2169,8 +2184,11 @@
if ($file) {
$result .= $self->_convert({'contents' => $file});
}
+ $self->{'formatters'}->[-1]->{'suppress_styles'} = 1;
my $node_text = $self->_convert({'type' => '_code',
'contents' => $node_content});
+ delete $self->{'formatters'}->[-1]->{'suppress_styles'};
+
my $node_text_checked = $node_text
.$self->{'formatters'}->[-1]->{'container'}->get_pending();
if ($node_text_checked =~ /:/m
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-04
15:52:50 UTC (rev 6388)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs.pl 2015-07-05
19:37:52 UTC (rev 6389)
@@ -22712,11 +22712,10 @@
e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
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::
+<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::
';
@@ -23692,43 +23691,43 @@
*******************************************************************************
-File: , Node: @ {} . , Next: \'cite asis\' in @w b in r SC *str* t VAR
"dfn" i, Prev: [f--ile1] [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\." ], Up: Top
+File: , Node: @ {} . , Next: cite asis in @w b in r SC *str* t VAR dfn i,
Prev: [f--ile1] [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\." ], Up: Top
20 @ {} .
***********
-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
*********
-File: , Node: sansserif slanted, Next: \'indicateurl\', Prev: 8.27in, Up:
Top
+File: , Node: sansserif slanted, Next: indicateurl, Prev: 8.27in, Up: Top
24 sansserif slanted
********************
-File: , Node: \'indicateurl\', Next: _{g}H 3^{rd}, Prev: sansserif slanted,
Up: Top
+File: , Node: indicateurl, Next: _{g}H 3^{rd}, Prev: sansserif slanted,
Up: Top
25 \'indicateurl\'
****************
-File: , Node: _{g}H 3^{rd}, Next: <http://somewhere_aaa> text (url) ls,
Prev: \'indicateurl\', Up: Top
+File: , Node: _{g}H 3^{rd}, Next: <http://somewhere_aaa> text (url) ls,
Prev: indicateurl, Up: Top
26 _{g}H 3^{rd}
***************
@@ -23752,11 +23751,10 @@
e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
,, ,:: *note << >> << >> < >:: *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::
+<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::
@@ -23783,13 +23781,13 @@
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" i4184
-Node: \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x
<ESC>\'4446
-Node: 8.27in4726
-Node: sansserif slanted4874
-Node: \'indicateurl\'5000
-Node: _{g}H 3^{rd}5124
-Node: <http://somewhere_aaa> text (url) ls5265
+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
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-04 15:52:50 UTC (rev 6388)
+++
trunk/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
2015-07-05 19:37:52 UTC (rev 6389)
@@ -157,43 +157,43 @@
*******************************************************************************
-File: at_commands_in_refs_latin1.info, Node: @ {} . , Next: 'cite asis' in
@w b in r SC *str* t VAR "dfn" i, Prev: [f--ile1] [image src="f--ile.png"
alt="alt" text="Image description\"\"\\." ], Up: Top
+File: at_commands_in_refs_latin1.info, Node: @ {} . , Next: cite asis in @w
b in r SC *str* t VAR dfn i, Prev: [f--ile1] [image src="f--ile.png"
alt="alt" text="Image description\"\"\\." ], Up: Top
20 @ {} .
***********
-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
*********
-File: at_commands_in_refs_latin1.info, Node: sansserif slanted, Next:
'indicateurl', Prev: 8.27in, Up: Top
+File: at_commands_in_refs_latin1.info, Node: sansserif slanted, Next:
indicateurl, Prev: 8.27in, Up: Top
24 sansserif slanted
********************
-File: at_commands_in_refs_latin1.info, Node: 'indicateurl', Next: _{g}H
3^{rd}, Prev: sansserif slanted, Up: Top
+File: at_commands_in_refs_latin1.info, Node: indicateurl, Next: _{g}H
3^{rd}, Prev: sansserif slanted, Up: Top
25 'indicateurl'
****************
-File: at_commands_in_refs_latin1.info, Node: _{g}H 3^{rd}, Next:
<http://somewhere_aaa> text (url) ls, Prev: 'indicateurl', Up: Top
+File: at_commands_in_refs_latin1.info, Node: _{g}H 3^{rd}, Next:
<http://somewhere_aaa> text (url) ls, Prev: indicateurl, Up: Top
26 _{g}H 3^{rd}
***************
@@ -217,10 +217,10 @@
e_ .e e< j ee[:: *note i E=` C',:: *note `` '' ` ' ,, ,:: *note \xAB \xBB \xAB
\xBB
< >:: *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::
+*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::
@@ -247,13 +247,13 @@
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" i4698
-Node: 'env' 'code' 'option' 'samp' 'command' 'file' 'C-x <ESC>'4991
-Node: 8.27in5302
-Node: sansserif slanted5481
-Node: 'indicateurl'5638
-Node: _{g}H 3^{rd}5793
-Node: <http://somewhere_aaa> text (url) ls5965
+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
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-04 15:52:50 UTC (rev 6388)
+++
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
2015-07-05 19:37:52 UTC (rev 6389)
@@ -157,43 +157,43 @@
*******************************************************************************
-File: at_commands_in_refs_utf8.info, Node: @ {} . , Next: ‘cite asis’ in @w
b in r SC *str* t VAR “dfn” i, Prev: [f--ile1] [image src="f--ile.png"
alt="alt" text="Image description\"\"\\." ], Up: Top
+File: at_commands_in_refs_utf8.info, Node: @ {} . , Next: cite asis in @w b
in r SC *str* t VAR dfn i, Prev: [f--ile1] [image src="f--ile.png" alt="alt"
text="Image description\"\"\\." ], Up: Top
20 @ {} .
***********
-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
*********
-File: at_commands_in_refs_utf8.info, Node: sansserif slanted, Next:
‘indicateurl’, Prev: 8.27in, Up: Top
+File: at_commands_in_refs_utf8.info, Node: sansserif slanted, Next:
indicateurl, Prev: 8.27in, Up: Top
24 sansserif slanted
********************
-File: at_commands_in_refs_utf8.info, Node: ‘indicateurl’, Next: _{g}H
3^{rd}, Prev: sansserif slanted, Up: Top
+File: at_commands_in_refs_utf8.info, Node: indicateurl, Next: _{g}H 3^{rd},
Prev: sansserif slanted, Up: Top
25 ‘indicateurl’
****************
-File: at_commands_in_refs_utf8.info, Node: _{g}H 3^{rd}, Next:
<http://somewhere_aaa> text (url) ls, Prev: ‘indicateurl’, Up: Top
+File: at_commands_in_refs_utf8.info, Node: _{g}H 3^{rd}, Next:
<http://somewhere_aaa> text (url) ls, Prev: indicateurl, Up: Top
26 _{g}H 3^{rd}
***************
@@ -217,10 +217,10 @@
ee͡:: *note ı Ḕ Ḉ:: *note “ ” ‘ ’ „ ‚:: *note « » « » ‹ ›:: *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::
+ @ {} . :: *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::
@@ -247,13 +247,13 @@
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” i4995
-Node: ‘env’ ‘code’ ‘option’ ‘samp’ ‘command’ ‘file’ ‘C-x <ESC>’5330
-Node: 8.27in5703
-Node: sansserif slanted5908
-Node: ‘indicateurl’6067
-Node: _{g}H 3^{rd}6228
-Node: <http://somewhere_aaa> text (url) ls6402
+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
End Tag Table
Modified: trunk/tp/t/results/converters_tests/ref_in_sectioning.pl
===================================================================
--- trunk/tp/t/results/converters_tests/ref_in_sectioning.pl 2015-07-04
15:52:50 UTC (rev 6388)
+++ trunk/tp/t/results/converters_tests/ref_in_sectioning.pl 2015-07-05
19:37:52 UTC (rev 6389)
@@ -3060,7 +3060,7 @@
2 *note node:: just node
2.1 *note cross ref name: node. node, crossref arg2
2.2 *note \'title\': node. code node, samptitle arg3
- 2.3 *note (file name)\'node\':: code node, file name
+ 2.3 *note (file name)node:: code node, file name
2.4 *note ()node:: node and manual
2.5 *note ()Top:: Top and manual
2.6 *note ():: no node just manual
@@ -3085,8 +3085,8 @@
2.2 *note \'title\': node. code node, samptitle arg3
==================================================
-2.3 *note (file name)\'node\':: code node, file name
-==================================================
+2.3 *note (file name)node:: code node, file name
+================================================
2.4 *note ()node:: node and manual
==================================
Modified: trunk/tp/t/results/coverage_braces/nested_args.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/nested_args.pl 2015-07-04 15:52:50 UTC
(rev 6388)
+++ trunk/tp/t/results/coverage_braces/nested_args.pl 2015-07-05 19:37:52 UTC
(rev 6389)
@@ -248,7 +248,7 @@
-$result_converted{'plaintext'}->{'nested_args'} = '*Note descr in b:
(\'manual\')@ \'in samp\'.
+$result_converted{'plaintext'}->{'nested_args'} = '*Note descr in b:
(\'manual\')@ in samp.
';
Modified: trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
2015-07-04 15:52:50 UTC (rev 6388)
+++ trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
2015-07-05 19:37:52 UTC (rev 6389)
@@ -17179,13 +17179,13 @@
* ;expose on ;Window: Top. (line 59)
* ;expose on ;Window <1>: Top. (line 63)
* A2: Top. (line 69)
-* \'A2\': Top. (line 71)
+* A2 <1>: Top. (line 71)
* A3: Top. (line 77)
-* \'A3\': Top. (line 79)
+* A3 <1>: Top. (line 79)
* A3 on A2: Top. (line 97)
-* \'A3\' on \'A2\': Top. (line 99)
+* A3 on A2 <1>: Top. (line 99)
* A4 on A2: Top. (line 101)
-* \'A4\' on \'A2\': Top. (line 103)
+* A4 on A2 <1>: Top. (line 103)
* apply: Top. (line 67)
* e)xpose on W)indow: Top. (line 49)
* e)xpose on W)indow <1>: Top. (line 53)
@@ -17202,7 +17202,7 @@
* FORWARD--CHAR: Top. (line 3)
* fun_name: Top. (line 105)
* fun_name1: Top. (line 107)
-* name on Window\'int\': Top. (line 65)
+* name on Windowint: Top. (line 65)
* push: Top. (line 18)
Types
@@ -17212,8 +17212,8 @@
* Menu:
* A2: Top. (line 85)
-* \'A2\': Top. (line 87)
-* \'A2\' <1>: Top. (line 91)
+* A2 <1>: Top. (line 87)
+* A2 <2>: Top. (line 91)
* pair: Top. (line 24)
Variables
@@ -17223,12 +17223,12 @@
* Menu:
* A2: Top. (line 73)
-* \'A2\': Top. (line 75)
+* A2 <1>: Top. (line 75)
* A3: Top. (line 81)
-* \'A3\': Top. (line 83)
-* A3 <1>: Top. (line 89)
+* A3 <1>: Top. (line 83)
+* A3 <2>: Top. (line 89)
* A4 of A2: Top. (line 93)
-* \'A4\' of \'A2\': Top. (line 95)
+* A4 of A2 <1>: Top. (line 95)
* border-pattern: Top. (line 27)
* border-pattern of Window: Top. (line 30)
* enable: Top. (line 21)
Modified: trunk/tp/t/results/sectioning/equivalent_labels.pl
===================================================================
--- trunk/tp/t/results/sectioning/equivalent_labels.pl 2015-07-04 15:52:50 UTC
(rev 6388)
+++ trunk/tp/t/results/sectioning/equivalent_labels.pl 2015-07-05 19:37:52 UTC
(rev 6389)
@@ -747,7 +747,7 @@
$result_converted{'info'}->{'equivalent_labels'} = 'This is , produced from .
-File: , Node: Top, Next: \'anch\', Up: (dir)
+File: , Node: Top, Next: anch, Up: (dir)
.
@@ -763,8 +763,8 @@
Tag Table:
Node: Top27
-Ref: \'anch\'76
-Ref: floa79
+Ref: anch74
+Ref: floa77
End Tag Table
';
Modified: trunk/tp/t/results/sectioning/equivalent_nodes.pl
===================================================================
--- trunk/tp/t/results/sectioning/equivalent_nodes.pl 2015-07-04 15:52:50 UTC
(rev 6388)
+++ trunk/tp/t/results/sectioning/equivalent_nodes.pl 2015-07-05 19:37:52 UTC
(rev 6389)
@@ -541,21 +541,21 @@
$result_converted{'info'}->{'equivalent_nodes'} = 'This is , produced from .
-File: , Node: Top, Next: \'node\'
+File: , Node: Top, Next: node
* Menu:
* *node*::
-File: , Node: \'node\', Up: Top
+File: , Node: node, Up: Top
-*Note \'node\'::.
+*Note node::.
Tag Table:
Node: Top27
-Node: \'node\'85
+Node: node83
End Tag Table
';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6389] suppress most styles in indices and nodenames,
Gavin D. Smith <=