[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Convert/NodeNameNormali...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Convert/NodeNameNormali... |
|
Date: |
Thu, 04 Aug 2011 07:41:05 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/08/04 07:41:05
Modified files:
tp : TODO
tp/Texinfo/Convert: NodeNameNormalization.pm Plaintext.pm
Text.pm
tp/t : 03coverage_braces.t 30sectioning.t
plaintext_tests.t
tp/t/results/coverage: commands.pl symbol_after_block.pl
tp/t/results/coverage_braces: nested_in_sc.pl
tp/t/results/float: complex_float.pl
tp/t/results/plaintext_tests: accents_in_var_enable_encoding.pl
characters_and_commands_in_var.pl
sc_with_utf8_enable_encoding.pl
tp/t/results/sectioning: at_commands_in_refs.pl
some_at_commands_in_ref_nodes.pl
Log message:
More fixes for @sc and accented characters.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.145&r2=1.146
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/03coverage_braces.t?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/30sectioning.t?cvsroot=texinfo&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/plaintext_tests.t?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_block.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.38&r2=1.39
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- TODO 31 Jul 2011 01:52:42 -0000 1.145
+++ TODO 4 Aug 2011 07:41:03 -0000 1.146
@@ -116,7 +116,7 @@
the paragraph starts right after the footnote number.
test node non automatic directions, especially in html and for external
-nodes.
+nodes. Done?
In html, test
empty lines at the begining,
@@ -133,8 +133,7 @@
@chapter jjj
@contents
address@hidden@u{r}} leads to R( in @var? Test in
-plaintext_tests/characters_and_commands_in_var
+Fix @address@hidden
construct like
@menu @c
Index: Texinfo/Convert/NodeNameNormalization.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Texinfo/Convert/NodeNameNormalization.pm 31 Jul 2011 23:21:49 -0000
1.8
+++ Texinfo/Convert/NodeNameNormalization.pm 4 Aug 2011 07:41:03 -0000
1.9
@@ -251,8 +251,13 @@
# commands with braces
} elsif ($accent_commands{$root->{'cmdname'}}) {
return '' if (!$root->{'args'});
- return
Texinfo::Convert::Unicode::unicode_accent(_convert($root->{'args'}->[0]),
+ my $accented_char =
Texinfo::Convert::Unicode::unicode_accent(_convert($root->{'args'}->[0]),
$root, \&Texinfo::Convert::Text::ascii_accent);
+ if ($in_sc) {
+ return uc ($accented_char);
+ } else {
+ return $accented_char;
+ }
} elsif ($root->{'cmdname'} eq 'image') {
return _convert($root->{'args'}->[0]);
} elsif ($root->{'cmdname'} eq 'email') {
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- Texinfo/Convert/Plaintext.pm 2 Aug 2011 21:01:34 -0000 1.143
+++ Texinfo/Convert/Plaintext.pm 4 Aug 2011 07:41:03 -0000 1.144
@@ -1240,6 +1240,7 @@
}
my $accented_text
= Texinfo::Convert::Text::text_accents($root, $encoding);
+ $accented_text = uc($accented_text) if ($formatter->{'upper_case'});
$result .= $self->_count_added($formatter->{'container'},
$formatter->{'container'}->add_text($accented_text));
# in case the text added ends with punctuation.
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- Texinfo/Convert/Text.pm 3 Aug 2011 22:33:53 -0000 1.46
+++ Texinfo/Convert/Text.pm 4 Aug 2011 07:41:04 -0000 1.47
@@ -1028,12 +1028,9 @@
or $root->{'cmdname'} eq 'math')) {
my $result;
if ($root->{'cmdname'} eq 'sc') {
- $options->{'sc'}++;
+ $options = {%$options, 'sc' => 1};
}
$result = convert($root->{'args'}->[0], $options);
- if ($root->{'cmdname'} eq 'sc') {
- $options->{'sc'}--;
- }
return $result;
# block commands
} elsif ($root->{'cmdname'} eq 'quotation'
Index: t/03coverage_braces.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/03coverage_braces.t,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/03coverage_braces.t 3 Aug 2011 22:33:53 -0000 1.37
+++ t/03coverage_braces.t 4 Aug 2011 07:41:04 -0000 1.38
@@ -35,7 +35,7 @@
['nested_args', '@xref{@@ @samp{in samp}, descr @b{in b}, address@hidden,
@cite{manual}}.'],
['nested_in_sc',
-'@address@hidden @~n @footnote{In footnote}, @abbr{ABr, expl},
+'@address@hidden @~n @aa{} @footnote{In footnote}, @abbr{ABr, expl},
@verb{:in verb:}}}
'],
['ref_in_style_command', '@address@hidden(manula)other node}}.'],
Index: t/30sectioning.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/30sectioning.t,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- t/30sectioning.t 31 Jul 2011 01:52:42 -0000 1.45
+++ t/30sectioning.t 4 Aug 2011 07:41:04 -0000 1.46
@@ -381,10 +381,10 @@
@top Top
@menu
-* A @sc{sc} node @"i @"address@hidden @address@hidden @l{} @,address@hidden'C}
@exclamdown{}::
+* A @sc{sc @~n} node @"i @"address@hidden @address@hidden @l{}
@,address@hidden'C} @exclamdown{}::
@end menu
address@hidden A @sc{sc} node @"i @"address@hidden @address@hidden @l{}
@,address@hidden'C} @exclamdown{}
address@hidden A @sc{sc @~n} node @"i @"address@hidden @address@hidden @l{}
@,address@hidden'C} @exclamdown{}
@chapter A @sc{sc} node @"i @"address@hidden @address@hidden @l{}
@,address@hidden'C} @exclamdown{}
see @ref{a @strong{strong} ref with @address@hidden a i trema @"address@hidden
a dotless i trema @"address@hidden @address@hidden and exclamdown
@exclamdown{},,,manual}.
Index: t/plaintext_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/plaintext_tests.t,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/plaintext_tests.t 19 Mar 2011 00:04:28 -0000 1.20
+++ t/plaintext_tests.t 4 Aug 2011 07:41:04 -0000 1.21
@@ -382,7 +382,7 @@
@var{somethingf @c ]
vvar}.
address@hidden@,c @u{r} @`e}.
address@hidden@,c @u{r} @`e @aa{}}.
address@hidden
dsf
Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/coverage/commands.pl 3 Jul 2011 14:50:53 -0000 1.37
+++ t/results/coverage/commands.pl 4 Aug 2011 07:41:04 -0000 1.38
@@ -520,7 +520,7 @@
$result_texts{'commands'} = '@ TeX e" i^ a~ a*
File -> Open.
b code --- -- \'\' ``
---- -- \'\' ``. small caps.
+--- -- \'\' ``. SMALL CAPS.
majorheading in b
Index: t/results/coverage/symbol_after_block.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/symbol_after_block.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/coverage/symbol_after_block.pl 3 Jul 2011 14:50:54 -0000
1.5
+++ t/results/coverage/symbol_after_block.pl 4 Aug 2011 07:41:04 -0000
1.6
@@ -2085,12 +2085,12 @@
'type' => 'error'
},
{
- 'error_line' => ':29: Superfluous argument to @end table: @
+ 'error_line' => ':29: Superfluous argument to @end table: @@
',
'file_name' => '',
'line_nr' => 29,
'macro' => '',
- 'text' => 'Superfluous argument to @end table: @',
+ 'text' => 'Superfluous argument to @end table: @@',
'type' => 'error'
},
{
@@ -2103,12 +2103,12 @@
'type' => 'error'
},
{
- 'error_line' => ':39: Superfluous argument to @end itemize: @
+ 'error_line' => ':39: Superfluous argument to @end itemize: @@
',
'file_name' => '',
'line_nr' => 39,
'macro' => '',
- 'text' => 'Superfluous argument to @end itemize: @',
+ 'text' => 'Superfluous argument to @end itemize: @@',
'type' => 'error'
},
{
@@ -2121,12 +2121,12 @@
'type' => 'error'
},
{
- 'error_line' => ':51: Superfluous argument to @end multitable: {
+ 'error_line' => ':51: Superfluous argument to @end multitable: @{
',
'file_name' => '',
'line_nr' => 51,
'macro' => '',
- 'text' => 'Superfluous argument to @end multitable: {',
+ 'text' => 'Superfluous argument to @end multitable: @{',
'type' => 'error'
},
{
@@ -2139,12 +2139,12 @@
'type' => 'error'
},
{
- 'error_line' => ':61: Superfluous argument to @end flushleft: @
+ 'error_line' => ':61: Superfluous argument to @end flushleft: @@
',
'file_name' => '',
'line_nr' => 61,
'macro' => '',
- 'text' => 'Superfluous argument to @end flushleft: @',
+ 'text' => 'Superfluous argument to @end flushleft: @@',
'type' => 'error'
},
{
@@ -2166,12 +2166,12 @@
'type' => 'warning'
},
{
- 'error_line' => ':71: Superfluous argument to @end copying: @
+ 'error_line' => ':71: Superfluous argument to @end copying: @@
',
'file_name' => '',
'line_nr' => 71,
'macro' => '',
- 'text' => 'Superfluous argument to @end copying: @',
+ 'text' => 'Superfluous argument to @end copying: @@',
'type' => 'error'
}
];
Index: t/results/coverage_braces/nested_in_sc.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/nested_in_sc.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage_braces/nested_in_sc.pl 3 Aug 2011 22:33:53 -0000
1.1
+++ t/results/coverage_braces/nested_in_sc.pl 4 Aug 2011 07:41:04 -0000
1.2
@@ -38,6 +38,22 @@
{
'args' => [
{
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'aa',
+ 'contents' => [],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
'contents' => [
{
'contents' => [
@@ -175,38 +191,41 @@
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[1];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[1]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[1]{'contents'}[1];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[1];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[1]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[1]{'contents'}[1];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'};
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'}
=
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'};
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'line_nr'} =
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
+$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'line_nr'} =
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'};
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'nested_in_sc'}{'contents'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'nested_in_sc'}{'contents'}[0];
$result_trees{'nested_in_sc'}{'contents'}[0]{'parent'} =
$result_trees{'nested_in_sc'};
-$result_texis{'nested_in_sc'} = '@address@hidden @~n @footnote{In footnote},
@abbr{ABr, expl},
+$result_texis{'nested_in_sc'} = '@address@hidden @~n @aa{} @footnote{In
footnote}, @abbr{ABr, expl},
@verb{:in verb:}}}
';
-$result_texts{'nested_in_sc'} = 'AAA N~ , ABR (EXPL),
+$result_texts{'nested_in_sc'} = 'AAA N~ aa , ABR (EXPL),
in verb
';
@@ -214,7 +233,7 @@
-$result_converted{'plaintext'}->{'nested_in_sc'} = 'AAA n~ (1), ABR (EXPL), in
verb
+$result_converted{'plaintext'}->{'nested_in_sc'} = 'AAA N~ aa (1), ABR (EXPL),
in verb
---------- Footnotes ----------
Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/float/complex_float.pl 13 Jul 2011 14:49:10 -0000 1.20
+++ t/results/float/complex_float.pl 4 Aug 2011 07:41:04 -0000 1.21
@@ -4868,7 +4868,7 @@
A footnote.
.
-TeX and te\'i^an_url and it is @verb a word !@ AE.
+TeX and te\'i^an_url AND it is @verb a word !@ AE.
Index: t/results/plaintext_tests/accents_in_var_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/accents_in_var_enable_encoding.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/plaintext_tests/accents_in_var_enable_encoding.pl 3 Jul 2011
14:51:00 -0000 1.5
+++ t/results/plaintext_tests/accents_in_var_enable_encoding.pl 4 Aug 2011
07:41:05 -0000 1.6
@@ -172,7 +172,7 @@
-$result_converted{'plaintext'}->{'accents_in_var_enable_encoding'} = 'AAç rÌ
è.
+$result_converted{'plaintext'}->{'accents_in_var_enable_encoding'} = 'AAÃ RÌ
Ã.
';
1;
Index: t/results/plaintext_tests/characters_and_commands_in_var.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/characters_and_commands_in_var.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/plaintext_tests/characters_and_commands_in_var.pl 3 Jul 2011
14:51:01 -0000 1.3
+++ t/results/plaintext_tests/characters_and_commands_in_var.pl 4 Aug 2011
07:41:05 -0000 1.4
@@ -226,6 +226,22 @@
],
'cmdname' => '`',
'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'aa',
+ 'contents' => [],
+ 'parent' => {}
}
],
'parent' => {},
@@ -379,6 +395,9 @@
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
=
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5];
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
=
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0];
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'line_nr'}
=
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'};
$result_trees{'characters_and_commands_in_var'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'characters_and_commands_in_var'}{'contents'}[4];
@@ -405,7 +424,7 @@
@var{somethingf @c ]
vvar}.
address@hidden@,c @u{r} @`e}.
address@hidden@,c @u{r} @`e @aa{}}.
address@hidden
dsf
@@ -418,7 +437,7 @@
somethingf vvar.
-AAc, r( e`.
+AAc, r( e` aa.
AAA
';
@@ -431,7 +450,7 @@
SOMETHINGF VVAR.
- AAc, r( e`.
+ AAC, R( E` aa.
AAA(1)
Index: t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl 3 Jul 2011
14:51:01 -0000 1.5
+++ t/results/plaintext_tests/sc_with_utf8_enable_encoding.pl 4 Aug 2011
07:41:05 -0000 1.6
@@ -100,7 +100,7 @@
';
-$result_texts{'sc_with_utf8_enable_encoding'} = 'in sc.
+$result_texts{'sc_with_utf8_enable_encoding'} = 'IN SC.
';
$result_errors{'sc_with_utf8_enable_encoding'} = [];
Index: t/results/sectioning/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/results/sectioning/at_commands_in_refs.pl 3 Aug 2011 21:42:06 -0000
1.46
+++ t/results/sectioning/at_commands_in_refs.pl 4 Aug 2011 07:41:05 -0000
1.47
@@ -18606,7 +18606,7 @@
* the someone address@hidden::
* f--ile1 f--ile::
* @ {} . ::
-* cite asis in @w b in r sc str t var dfn i::
+* 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::
@@ -18668,7 +18668,7 @@
18 @ {} .
***********
-19 cite asis in @w b in r sc str t var dfn i
+19 cite asis in @w b in r SC str t var dfn i
********************************************
20 env code option samp command file C-x ESC
Index: t/results/sectioning/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- t/results/sectioning/some_at_commands_in_ref_nodes.pl 9 Jul 2011
06:35:43 -0000 1.38
+++ t/results/sectioning/some_at_commands_in_ref_nodes.pl 4 Aug 2011
07:41:05 -0000 1.39
@@ -133,7 +133,17 @@
'contents' => [
{
'parent' => {},
- 'text' => 'sc'
+ 'text' => 'sc '
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'n'
+ }
+ ],
+ 'cmdname' => '~',
+ 'parent' => {}
}
],
'parent' => {},
@@ -327,7 +337,7 @@
{},
{}
],
- 'normalized' =>
'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+ 'normalized' =>
'A-SC-_00d1-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
}
},
'line_nr' => {},
@@ -427,7 +437,17 @@
'contents' => [
{
'parent' => {},
- 'text' => 'sc'
+ 'text' => 'sc '
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'n'
+ }
+ ],
+ 'cmdname' => '~',
+ 'parent' => {}
}
],
'parent' => {},
@@ -614,10 +634,10 @@
'nodes_manuals' => [
{
'node_content' => [],
- 'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+ 'normalized' =>
'A-SC-_00d1-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
}
],
- 'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+ 'normalized' => 'A-SC-_00d1-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
},
'line_nr' => {},
'parent' => {}
@@ -1124,6 +1144,8 @@
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
@@ -1192,6 +1214,8 @@
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[3]{'args'}[0];
@@ -1374,10 +1398,10 @@
@top Top
@menu
-* A @sc{sc} node @"i @"address@hidden @address@hidden @l{} @,address@hidden'C}
@exclamdown{}::
+* A @sc{sc @~n} node @"i @"address@hidden @address@hidden @l{}
@,address@hidden'C} @exclamdown{}::
@end menu
address@hidden A @sc{sc} node @"i @"address@hidden @address@hidden @l{}
@,address@hidden'C} @exclamdown{}
address@hidden A @sc{sc @~n} node @"i @"address@hidden @address@hidden @l{}
@,address@hidden'C} @exclamdown{}
@chapter A @sc{sc} node @"i @"address@hidden @address@hidden @l{}
@,address@hidden'C} @exclamdown{}
see @ref{a @strong{strong} ref with @address@hidden a i trema @"address@hidden
a dotless i trema @"address@hidden @address@hidden and exclamdown
@exclamdown{},,,manual}.
@@ -1388,9 +1412,9 @@
Top
***
-* A sc node i" i" E=` /l C\', !::
+* A SC N~ node i" i" E=` /l C\', !::
-1 A sc node i" i" E=` /l C\', !
+1 A SC node i" i" E=` /l C\', !
******************************
see .
@@ -1417,7 +1441,7 @@
'associated_node' => {
'cmdname' => 'node',
'extra' => {
- 'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+ 'normalized' =>
'A-SC-_00d1-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
}
}
},
@@ -1454,7 +1478,7 @@
'level' => 1,
'number' => 1
},
- 'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+ 'normalized' => 'A-SC-_00d1-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
},
'node_prev' => {},
'node_up' => {}
@@ -1498,7 +1522,7 @@
'menu_child' => {
'cmdname' => 'node',
'extra' => {
- 'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+ 'normalized' => 'A-SC-_00d1-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
},
'menu_up' => {},
'menu_up_hash' => {
@@ -1515,17 +1539,17 @@
$result_converted{'info'}->{'some_at_commands_in_ref_nodes'} = 'This is ,
produced by makeinfo version 4.13 from .
-File: , Node: Top, Next: A SC node i" i" E=` /l C\', !, Up: (dir)
+File: , Node: Top, Next: A SC N~ node i" i" E=` /l C\', !, Up: (dir)
Top
***
* Menu:
-* A SC node i" i" E=` /l C\', !::
+* A SC N~ node i" i" E=` /l C\', !::
-File: , Node: A SC node i" i" E=` /l C\', !, Prev: Top, Up: Top
+File: , Node: A SC N~ node i" i" E=` /l C\', !, Prev: Top, Up: Top
1 A SC node i" i" E=` /l C\', !
******************************
@@ -1537,7 +1561,7 @@
Tag Table:
Node: Top52
-Node: A SC node i" i" E=` /l C\', !175
+Node: A SC N~ node i" i" E=` /l C\', !181
End Tag Table
';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Convert/NodeNameNormali...,
Patrice Dumas <=