[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7494] don't save normalized for @inforef
|
From: |
gavinsmith0123 |
|
Subject: |
[7494] don't save normalized for @inforef |
|
Date: |
Thu, 3 Nov 2016 12:17:06 +0000 (UTC) |
Revision: 7494
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7494
Author: gavin
Date: 2016-11-03 12:17:06 +0000 (Thu, 03 Nov 2016)
Log Message:
-----------
don't save normalized for @inforef
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/converters_tests/ref_error_formatting.pl
trunk/tp/t/results/converters_tests/ref_in_sectioning.pl
trunk/tp/t/results/converters_tests/refs_formatting.pl
trunk/tp/t/results/converters_tests/top_in_ref.pl
trunk/tp/t/results/converters_tests/top_in_ref_keep_top.pl
trunk/tp/t/results/coverage_braces/inforef_too_much_args.pl
trunk/tp/t/results/coverage_braces/ref_in_style_command.pl
trunk/tp/t/results/info_tests/pxref_test.pl
trunk/tp/t/results/info_tests/ref_tests.pl
trunk/tp/t/results/info_tests/xref_test.pl
trunk/tp/t/results/invalid_nestings/on_node_line.pl
trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl
trunk/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
trunk/tp/t/results/sectioning/nodename_parentheses.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-11-03 10:10:19 UTC (rev 7493)
+++ trunk/ChangeLog 2016-11-03 12:17:06 UTC (rev 7494)
@@ -1,6 +1,12 @@
2016-11-03 Gavin Smith <address@hidden>
* tp/Texinfo/Parser.pm (_parse_texi) <cross-reference commands>:
+ Don't record 'normalized' for @inforef, and for any reference
+ that is not recorded in the 'internal_references' array.
+
+2016-11-03 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Parser.pm (_parse_texi) <cross-reference commands>:
Don't record 'normalized' value on command if cross-reference is
to another manual.
(_check_empty_node): Check that 'normalized' value is defined.
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2016-11-03 10:10:19 UTC (rev 7493)
+++ trunk/tp/Texinfo/Parser.pm 2016-11-03 12:17:06 UTC (rev 7494)
@@ -5092,17 +5092,16 @@
$closed_command), $line_nr);
} else {
my $parsed_ref_node =
_parse_node_manual($ref->{'args'}->[0]);
- if (defined($parsed_ref_node)) {
- if ($args[3] or $args[4]) {
+ if (defined $parsed_ref_node) {
+ if ($closed_command ne 'inforef'
+ and !defined($args[3]) and !defined($args[4])
+ and !$parsed_ref_node->{'manual_content'}) {
+ push @{$self->{'internal_references'}}, $ref;
+ } else {
delete $parsed_ref_node->{'normalized'};
}
$ref->{'extra'}->{'node_argument'} = $parsed_ref_node
}
- if ($closed_command ne 'inforef'
- and !defined($args[3]) and !defined($args[4])
- and !$parsed_ref_node->{'manual_content'}) {
- push @{$self->{'internal_references'}}, $ref;
- }
}
if (defined($args[1])) {
my $normalized_cross_ref_name =
Modified: trunk/tp/t/results/converters_tests/ref_error_formatting.pl
===================================================================
--- trunk/tp/t/results/converters_tests/ref_error_formatting.pl 2016-11-03
10:10:19 UTC (rev 7493)
+++ trunk/tp/t/results/converters_tests/ref_error_formatting.pl 2016-11-03
12:17:06 UTC (rev 7494)
@@ -3544,8 +3544,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'node'
+ ]
}
},
'line_nr' => {},
@@ -3622,8 +3621,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'node'
+ ]
}
},
'line_nr' => {},
@@ -3718,8 +3716,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'node'
+ ]
}
},
'line_nr' => {},
@@ -3815,8 +3812,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'node'
+ ]
}
},
'line_nr' => {},
Modified: trunk/tp/t/results/converters_tests/ref_in_sectioning.pl
===================================================================
--- trunk/tp/t/results/converters_tests/ref_in_sectioning.pl 2016-11-03
10:10:19 UTC (rev 7493)
+++ trunk/tp/t/results/converters_tests/ref_in_sectioning.pl 2016-11-03
12:17:06 UTC (rev 7494)
@@ -1692,8 +1692,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'a'
+ ]
}
},
'line_nr' => {
Modified: trunk/tp/t/results/converters_tests/refs_formatting.pl
===================================================================
--- trunk/tp/t/results/converters_tests/refs_formatting.pl 2016-11-03
10:10:19 UTC (rev 7493)
+++ trunk/tp/t/results/converters_tests/refs_formatting.pl 2016-11-03
12:17:06 UTC (rev 7494)
@@ -1781,8 +1781,7 @@
'parent' => {},
'text' => 'anode'
}
- ],
- 'normalized' => 'anode'
+ ]
}
},
'line_nr' => {},
@@ -1887,8 +1886,7 @@
'parent' => {},
'text' => 'anode'
}
- ],
- 'normalized' => 'anode'
+ ]
}
},
'line_nr' => {},
@@ -2234,8 +2232,7 @@
'parent' => {},
'text' => 'anode'
}
- ],
- 'normalized' => 'anode'
+ ]
}
},
'line_nr' => {},
@@ -3513,8 +3510,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'chapter'
+ ]
}
},
'line_nr' => {},
@@ -3591,8 +3587,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'chapter'
+ ]
}
},
'line_nr' => {},
@@ -3687,8 +3682,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'chapter'
+ ]
}
},
'line_nr' => {},
@@ -3784,8 +3778,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'chapter'
+ ]
}
},
'line_nr' => {},
Modified: trunk/tp/t/results/converters_tests/top_in_ref.pl
===================================================================
--- trunk/tp/t/results/converters_tests/top_in_ref.pl 2016-11-03 10:10:19 UTC
(rev 7493)
+++ trunk/tp/t/results/converters_tests/top_in_ref.pl 2016-11-03 12:17:06 UTC
(rev 7494)
@@ -1732,8 +1732,7 @@
'parent' => {},
'text' => 'Top'
}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -1838,8 +1837,7 @@
'parent' => {},
'text' => 'Top'
}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -2185,8 +2183,7 @@
'parent' => {},
'text' => 'Top'
}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -3464,8 +3461,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -3542,8 +3538,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -3638,8 +3633,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -3735,8 +3729,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
Modified: trunk/tp/t/results/converters_tests/top_in_ref_keep_top.pl
===================================================================
--- trunk/tp/t/results/converters_tests/top_in_ref_keep_top.pl 2016-11-03
10:10:19 UTC (rev 7493)
+++ trunk/tp/t/results/converters_tests/top_in_ref_keep_top.pl 2016-11-03
12:17:06 UTC (rev 7494)
@@ -1732,8 +1732,7 @@
'parent' => {},
'text' => 'Top'
}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -1838,8 +1837,7 @@
'parent' => {},
'text' => 'Top'
}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -2185,8 +2183,7 @@
'parent' => {},
'text' => 'Top'
}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -3464,8 +3461,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -3542,8 +3538,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -3638,8 +3633,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -3735,8 +3729,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
Modified: trunk/tp/t/results/coverage_braces/inforef_too_much_args.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/inforef_too_much_args.pl 2016-11-03
10:10:19 UTC (rev 7493)
+++ trunk/tp/t/results/coverage_braces/inforef_too_much_args.pl 2016-11-03
12:17:06 UTC (rev 7494)
@@ -109,8 +109,7 @@
'node_argument' => {
'node_content' => [
{}
- ],
- 'normalized' => 'chapter'
+ ]
}
},
'line_nr' => {
Modified: trunk/tp/t/results/coverage_braces/ref_in_style_command.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/ref_in_style_command.pl 2016-11-03
10:10:19 UTC (rev 7493)
+++ trunk/tp/t/results/coverage_braces/ref_in_style_command.pl 2016-11-03
12:17:06 UTC (rev 7494)
@@ -46,8 +46,7 @@
'parent' => {},
'text' => 'other node'
}
- ],
- 'normalized' => 'other-node'
+ ]
}
},
'line_nr' => {
Modified: trunk/tp/t/results/info_tests/pxref_test.pl
===================================================================
--- trunk/tp/t/results/info_tests/pxref_test.pl 2016-11-03 10:10:19 UTC (rev
7493)
+++ trunk/tp/t/results/info_tests/pxref_test.pl 2016-11-03 12:17:06 UTC (rev
7494)
@@ -86,8 +86,7 @@
'parent' => {},
'text' => 'in pxref'
}
- ],
- 'normalized' => 'in-pxref'
+ ]
}
},
'line_nr' => {
@@ -152,8 +151,7 @@
'parent' => {},
'text' => 'in pxref'
}
- ],
- 'normalized' => 'in-pxref'
+ ]
}
},
'line_nr' => {},
@@ -197,8 +195,7 @@
'parent' => {},
'text' => 'n'
}
- ],
- 'normalized' => 'n'
+ ]
}
},
'line_nr' => {
@@ -263,8 +260,7 @@
'parent' => {},
'text' => 'n'
}
- ],
- 'normalized' => 'n'
+ ]
}
},
'line_nr' => {},
Modified: trunk/tp/t/results/info_tests/ref_tests.pl
===================================================================
--- trunk/tp/t/results/info_tests/ref_tests.pl 2016-11-03 10:10:19 UTC (rev
7493)
+++ trunk/tp/t/results/info_tests/ref_tests.pl 2016-11-03 12:17:06 UTC (rev
7494)
@@ -89,8 +89,7 @@
'parent' => {},
'text' => 'in ref followed by comma'
}
- ],
- 'normalized' => 'in-ref-followed-by-comma'
+ ]
}
},
'line_nr' => {
@@ -138,8 +137,7 @@
'parent' => {},
'text' => 'in ref not followed by comma'
}
- ],
- 'normalized' => 'in-ref-not-followed-by-comma'
+ ]
}
},
'line_nr' => {
@@ -191,8 +189,7 @@
'parent' => {},
'text' => 'in ref followed by end command'
}
- ],
- 'normalized' => 'in-ref-followed-by-end-command'
+ ]
}
},
'line_nr' => {
@@ -286,8 +283,7 @@
'parent' => {},
'text' => 'in ref followed by comma'
}
- ],
- 'normalized' => 'in-ref-followed-by-comma'
+ ]
}
},
'line_nr' => {
@@ -353,8 +349,7 @@
'parent' => {},
'text' => 'in ref not followed by comma'
}
- ],
- 'normalized' => 'in-ref-not-followed-by-comma'
+ ]
}
},
'line_nr' => {
@@ -424,8 +419,7 @@
'parent' => {},
'text' => 'in ref followed by end command'
}
- ],
- 'normalized' => 'in-ref-followed-by-end-command'
+ ]
}
},
'line_nr' => {
@@ -501,8 +495,7 @@
'parent' => {},
'text' => 'in ref ending with a dot.'
}
- ],
- 'normalized' => 'in-ref-ending-with-a-dot_002e'
+ ]
}
},
'line_nr' => {
Modified: trunk/tp/t/results/info_tests/xref_test.pl
===================================================================
--- trunk/tp/t/results/info_tests/xref_test.pl 2016-11-03 10:10:19 UTC (rev
7493)
+++ trunk/tp/t/results/info_tests/xref_test.pl 2016-11-03 12:17:06 UTC (rev
7494)
@@ -89,8 +89,7 @@
'parent' => {},
'text' => 'in xref'
}
- ],
- 'normalized' => 'in-xref'
+ ]
}
},
'line_nr' => {
@@ -137,8 +136,7 @@
'parent' => {},
'text' => 'bad xref'
}
- ],
- 'normalized' => 'bad-xref'
+ ]
}
},
'line_nr' => {},
@@ -186,8 +184,7 @@
'parent' => {},
'text' => 'bad nested xref'
}
- ],
- 'normalized' => 'bad-nested-xref'
+ ]
}
},
'line_nr' => {
@@ -263,8 +260,7 @@
'parent' => {},
'text' => 'in ref ending with a dot.'
}
- ],
- 'normalized' => 'in-ref-ending-with-a-dot_002e'
+ ]
}
},
'line_nr' => {
@@ -312,8 +308,7 @@
'parent' => {},
'text' => 'in ref followed by symbol'
}
- ],
- 'normalized' => 'in-ref-followed-by-symbol'
+ ]
}
},
'line_nr' => {
Modified: trunk/tp/t/results/invalid_nestings/on_node_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_node_line.pl 2016-11-03 10:10:19 UTC
(rev 7493)
+++ trunk/tp/t/results/invalid_nestings/on_node_line.pl 2016-11-03 12:17:06 UTC
(rev 7494)
@@ -162,8 +162,7 @@
'parent' => {},
'text' => 'Top'
}
- ],
- 'normalized' => 'Top'
+ ]
}
},
'line_nr' => {},
@@ -406,8 +405,7 @@
{
'text' => 'somemanual'
}
- ],
- 'normalized' => 'Top'
+ ]
}
}
}
Modified: trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl
===================================================================
--- trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl
2016-11-03 10:10:19 UTC (rev 7493)
+++ trunk/tp/t/results/sectioning/character_and_spaces_in_refs.pl
2016-11-03 12:17:06 UTC (rev 7494)
@@ -531,8 +531,7 @@
'parent' => {},
'text' => 'Cross References'
}
- ],
- 'normalized' => 'Cross-References'
+ ]
}
},
'line_nr' => {
Modified: trunk/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
===================================================================
--- trunk/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
2016-11-03 10:10:19 UTC (rev 7493)
+++ trunk/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
2016-11-03 12:17:06 UTC (rev 7494)
@@ -532,8 +532,7 @@
'parent' => {},
'text' => 'Cross References'
}
- ],
- 'normalized' => 'Cross-References'
+ ]
}
},
'line_nr' => {
Modified: trunk/tp/t/results/sectioning/nodename_parentheses.pl
===================================================================
--- trunk/tp/t/results/sectioning/nodename_parentheses.pl 2016-11-03
10:10:19 UTC (rev 7493)
+++ trunk/tp/t/results/sectioning/nodename_parentheses.pl 2016-11-03
12:17:06 UTC (rev 7494)
@@ -659,8 +659,7 @@
'parent' => {},
'text' => 'node'
}
- ],
- 'normalized' => 'node'
+ ]
}
},
'line_nr' => {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7494] don't save normalized for @inforef,
gavinsmith0123 <=