[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Common.pm Texinfo/Parser.pm ...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Common.pm Texinfo/Parser.pm ... |
|
Date: |
Tue, 18 Dec 2012 00:07:18 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/12/18 00:07:18
Modified files:
tp/Texinfo : Common.pm Parser.pm
tp/Texinfo/Convert: Converter.pm HTML.pm Info.pm
tp/init : tex4ht.pm
tp/t/results/float: float_copying.pl
tp/t/results/indices: unknown_synindex.pl
tp/t/results/regions: anchor_in_copying.pl
anchor_in_copying_in_footnote.pl
tp/t/results/sectioning: node_part_chapter_after_chapter.pl
node_part_chapter_after_top.pl
part_node_after_top.pl
part_node_before_top.pl
part_node_node_part_appendix.pl
top_node_part_top.pl
tp/tests : Makefile.am
tp/tests/formatting: .cvsignore Makefile.am tests-parser.txt
tp/tests/indices/res_parser_info/index_special_region:
index_special_region.2
tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes:
equivalent_nodes.2
tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes:
equivalent_nodes.2
Added files:
tp/tests/formatting: unknown_nodes_renamed-noderename.cnf-ref
unknown_nodes_renamed.texi
tp/tests/formatting/res_parser/unknown_nodes_renamed:
unknown_nodes_renamed.1
unknown_nodes_renamed.2
unknown_nodes_renamed.html
Log message:
Improve some error/warning messages. Report from Benno Schulenberg,
most messages by Karl.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.165&r2=1.166
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.405&r2=1.406
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.267&r2=1.268
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/tex4ht.pm?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/float_copying.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/unknown_synindex.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/regions/anchor_in_copying.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_after_top.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_before_top.pl?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/top_node_part_top.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/Makefile.am?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/.cvsignore?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/Makefile.am?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/tests-parser.txt?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/unknown_nodes_renamed-noderename.cnf-ref?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/unknown_nodes_renamed.texi?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.2?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.html?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/indices/res_parser_info/index_special_region/index_special_region.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2?cvsroot=texinfo&r1=1.4&r2=1.5
Patches:
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- Texinfo/Common.pm 16 Dec 2012 22:14:44 -0000 1.165
+++ Texinfo/Common.pm 18 Dec 2012 00:07:15 -0000 1.166
@@ -1467,8 +1467,8 @@
if (scalar(@old_names)) {
foreach my $old_node_name (@old_names) {
$renamed_nodes->{$old_node_name} = $_;
- $renamed_nodes_lines->{$_} = $renamed_nodes_line_nr;
}
+ $renamed_nodes_lines->{$_} = $renamed_nodes_line_nr;
@old_names = ();
} else {
warn (sprintf($self->__("%s:%d: no node to be renamed\n"),
@@ -1486,7 +1486,9 @@
$renamed_nodes_file, $renamed_nodes_line_nr));
}
if (!close(RENAMEDFILE)) {
- $self->document_warn(sprintf($self->__("Error on closing renamed nodes
file %s: %s"),
+ $self->document_warn(sprintf($self->__p(
+ "see HTML Xref Link Preservation in the Texinfo manual for context",
+ "Error on closing node-renaming configuration file %s: %s"),
$renamed_nodes_file, $!));
}
} else {
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -b -r1.405 -r1.406
--- Texinfo/Parser.pm 16 Dec 2012 22:14:45 -0000 1.405
+++ Texinfo/Parser.pm 18 Dec 2012 00:07:15 -0000 1.406
@@ -3299,7 +3299,8 @@
push @{$self->{'current_parts'}}, $current;
if ($self->{'current_node'}
and !$self->{'current_node'}->{'extra'}->{'associated_section'}) {
- $self->line_warn (sprintf($self->__("address@hidden precedes
address@hidden, but part are not associated with nodes"),
+ $self->line_warn (sprintf($self->__(
+ "address@hidden precedes address@hidden, but parts may not be
associated with nodes"),
$command), $line_nr);
}
}
@@ -5260,9 +5261,11 @@
if ($line =~
/^([[:alnum:]][[:alnum:]\-]*)\s+([[:alnum:]][[:alnum:]\-]*)$/) {
my $index_from = $1;
my $index_to = $2;
- $self->line_error (sprintf($self->__("Unknown from index `%s' in
address@hidden"), $index_from, $command), $line_nr)
+ $self->line_error (sprintf($self->__("Unknown source index in
address@hidden: %s"),
+ $command, $index_from), $line_nr)
unless $self->{'index_names'}->{$index_from};
- $self->line_error (sprintf($self->__("Unknown to index name `%s' in
address@hidden"), $index_to, $command), $line_nr)
+ $self->line_error (sprintf($self->__("Unknown destination index in
address@hidden: %s"),
+ $command, $index_to), $line_nr)
unless $self->{'index_names'}->{$index_to};
if ($self->{'index_names'}->{$index_from}
and $self->{'index_names'}->{$index_to}) {
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- Texinfo/Convert/Converter.pm 16 Dec 2012 22:14:45 -0000 1.93
+++ Texinfo/Convert/Converter.pm 18 Dec 2012 00:07:15 -0000 1.94
@@ -437,8 +437,12 @@
$input_basename = '';
}
$self->{'input_basename'} = $input_basename;
- $input_basename = $STDIN_DOCU_NAME if ($input_basename eq '-');
+ if ($input_basename eq '-') {
+ $input_basename = $STDIN_DOCU_NAME
+ } else {
$input_basename =~ s/\.te?x(i|info)?$//;
+ }
+ $self->{'input_basename_name'} = $input_basename;
my $setfilename;
if (defined($self->get_conf('setfilename'))) {
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -b -r1.267 -r1.268
--- Texinfo/Convert/HTML.pm 16 Dec 2012 02:21:40 -0000 1.267
+++ Texinfo/Convert/HTML.pm 18 Dec 2012 00:07:15 -0000 1.268
@@ -6748,7 +6748,7 @@
# collect renamed nodes
($self->{'renamed_nodes'}, $self->{'renamed_nodes_lines'},
$self->{'renamed_nodes_file'})
- = Texinfo::Common::collect_renamed_nodes($self, $self->{'document_name'},
+ = Texinfo::Common::collect_renamed_nodes($self,
$self->{'input_basename_name'},
$self->{'renamed_nodes'});
# This should return undef if called on a tree without node or sections.
@@ -7071,6 +7071,7 @@
if ($self->{'parser'}) {
$parser_for_renamed_nodes = $self->{'parser'}->parser();
}
+ my %warned_new_node;
foreach my $old_node_name (keys(%{$self->{'renamed_nodes'}})) {
my $parsed_old_node = $self->_parse_node_and_warn_external(
$old_node_name, $parser_for_renamed_nodes,
@@ -7079,7 +7080,7 @@
if ($parsed_old_node) {
if ($self->label_command($parsed_old_node->{'normalized'})) {
$self->document_error(sprintf($self->__(
- "Node `%s' that is to be renamed exists"), $old_node_name));
+ "Old name for `%s' is a node of the document"),
$old_node_name));
$parsed_old_node = undef;
} elsif ($parsed_old_node->{'normalized'} !~ /[^-]/) {
$self->document_error(sprintf($self->__(
@@ -7092,12 +7093,15 @@
$new_node_name, $parser_for_renamed_nodes,
$self->{'renamed_nodes_lines'}->{$new_node_name},
$self->{'renamed_nodes_file'});
- if ($parsed_new_node) {
if (!$self->label_command($parsed_new_node->{'normalized'})) {
- $self->document_error(sprintf($self->__(
- "Node to be renamed as, `%s' not found"), $new_node_name));
- $parsed_new_node = undef;
+ if (!$warned_new_node{$new_node_name}) {
+ $self->file_line_warn(sprintf($self->__(
+ "Target node (new name for `%s') not in document: %s"),
+ $old_node_name, $new_node_name), $self->{'renamed_nodes_file'},
+ $self->{'renamed_nodes_lines'}->{$new_node_name});
+ $warned_new_node{$new_node_name} = 1;
}
+ $parsed_new_node = undef;
}
if ($parsed_new_node and $parsed_old_node) {
my ($filename, $target, $id) = $self->_node_id_file($parsed_old_node);
@@ -7123,7 +7127,8 @@
print $file_fh $redirection_page;
$self->register_close_file($out_filename);
if (!close ($file_fh)) {
- $self->document_error(sprintf($self->__("Error on closing renamed
node file %s: %s"),
+ $self->document_error(sprintf($self->__(
+ "Error on closing renamed node redirection file %s: %s"),
$out_filename, $!));
return undef;
}
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- Texinfo/Convert/Info.pm 11 Nov 2012 16:25:01 -0000 1.89
+++ Texinfo/Convert/Info.pm 18 Dec 2012 00:07:16 -0000 1.90
@@ -223,7 +223,7 @@
$prefix = 'Node';
} else {
if ($seen_anchors{$label->{'root'}->{'extra'}->{'normalized'}}) {
- $self->line_error(sprintf($self->__("address@hidden `%s' output more
than once"),
+ $self->line_error(sprintf($self->__("address@hidden output more than
once: %s"),
$label->{'root'}->{'cmdname'},
Texinfo::Convert::Texinfo::convert({'contents' =>
$label->{'root'}->{'extra'}->{'node_content'}})),
Index: init/tex4ht.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/tex4ht.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- init/tex4ht.pm 25 Sep 2012 17:46:37 -0000 1.11
+++ init/tex4ht.pm 18 Dec 2012 00:07:16 -0000 1.12
@@ -239,7 +239,7 @@
return 0 unless ($commands{$command}->{'counter'});
- $self->document_warn(sprintf($self->__("tex4ht output %s missing"),
+ $self->document_warn(sprintf($self->__("tex4ht output file missing: %s"),
$commands{$command}->{'basefile'}))
unless (-f $commands{$command}->{'basefile'});
my $style = $commands{$command}->{'style'};
@@ -291,7 +291,8 @@
}
}
if ($got_count != $commands{$command}->{'counter'}) {
- $self->document_warn (sprintf($self->__("tex4ht output got %d for %d items
entered"),
+ $self->document_warn (sprintf($self->__(
+ "tex4ht processing produced %d items in HTML; expected %d, the number
of items found in the document"),
$got_count,
$commands{$command}->{'counter'}));
}
close (TEX4HT_HTMLFILE);
@@ -309,7 +310,7 @@
$commands{$cmdname}->{'output_counter'}++;
return $commands{$cmdname}->{'results'}->{$command};
} else {
- $self->document_warn (sprintf($self->__("tex4ht output no text for
address@hidden %s"),
+ $self->document_warn (sprintf($self->__("tex4ht output has no HTML item
for address@hidden %s"),
$cmdname, $command));
return '';
}
Index: t/results/float/float_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/float_copying.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/float/float_copying.pl 9 Nov 2012 22:30:31 -0000 1.30
+++ t/results/float/float_copying.pl 18 Dec 2012 00:07:16 -0000 1.31
@@ -1816,54 +1816,54 @@
$result_converted_errors{'info'}->{'float_copying'} = [
{
'file_name' => '',
- 'error_line' => ':3: @float `public domain\' output more than once
+ 'error_line' => ':3: @float output more than once: public domain
',
- 'text' => '@float `public domain\' output more than once',
+ 'text' => '@float output more than once: public domain',
'type' => 'error',
'macro' => '',
'line_nr' => 3
},
{
'file_name' => '',
- 'error_line' => ':19: @anchor `public domain anchor\' output more than once
+ 'error_line' => ':19: @anchor output more than once: public domain anchor
',
- 'text' => '@anchor `public domain anchor\' output more than once',
+ 'text' => '@anchor output more than once: public domain anchor',
'type' => 'error',
'macro' => '',
'line_nr' => 19
},
{
'file_name' => '',
- 'error_line' => ':3: @float `public domain\' output more than once
+ 'error_line' => ':3: @float output more than once: public domain
',
- 'text' => '@float `public domain\' output more than once',
+ 'text' => '@float output more than once: public domain',
'type' => 'error',
'macro' => '',
'line_nr' => 3
},
{
'file_name' => '',
- 'error_line' => ':19: @anchor `public domain anchor\' output more than once
+ 'error_line' => ':19: @anchor output more than once: public domain anchor
',
- 'text' => '@anchor `public domain anchor\' output more than once',
+ 'text' => '@anchor output more than once: public domain anchor',
'type' => 'error',
'macro' => '',
'line_nr' => 19
},
{
'file_name' => '',
- 'error_line' => ':10: @anchor `caption copying footnote anchor\' output
more than once
+ 'error_line' => ':10: @anchor output more than once: caption copying
footnote anchor
',
- 'text' => '@anchor `caption copying footnote anchor\' output more than
once',
+ 'text' => '@anchor output more than once: caption copying footnote anchor',
'type' => 'error',
'macro' => '',
'line_nr' => 10
},
{
'file_name' => '',
- 'error_line' => ':10: @anchor `caption copying footnote anchor\' output
more than once
+ 'error_line' => ':10: @anchor output more than once: caption copying
footnote anchor
',
- 'text' => '@anchor `caption copying footnote anchor\' output more than
once',
+ 'text' => '@anchor output more than once: caption copying footnote anchor',
'type' => 'error',
'macro' => '',
'line_nr' => 10
Index: t/results/indices/unknown_synindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/unknown_synindex.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/indices/unknown_synindex.pl 23 Aug 2012 18:14:48 -0000
1.13
+++ t/results/indices/unknown_synindex.pl 18 Dec 2012 00:07:16 -0000
1.14
@@ -56,21 +56,21 @@
$result_errors{'unknown_synindex'} = [
{
- 'error_line' => ':1: Unknown from index `c\' in @synindex
+ 'error_line' => ':1: Unknown source index in @synindex: c
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'Unknown from index `c\' in @synindex',
+ 'text' => 'Unknown source index in @synindex: c',
'type' => 'error'
},
{
- 'error_line' => ':1: Unknown to index name `truc\' in @synindex
+ 'error_line' => ':1: Unknown destination index in @synindex: truc
',
'file_name' => '',
'line_nr' => 1,
'macro' => '',
- 'text' => 'Unknown to index name `truc\' in @synindex',
+ 'text' => 'Unknown destination index in @synindex: truc',
'type' => 'error'
}
];
Index: t/results/regions/anchor_in_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/regions/anchor_in_copying.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/regions/anchor_in_copying.pl 9 Nov 2012 22:30:37 -0000
1.23
+++ t/results/regions/anchor_in_copying.pl 18 Dec 2012 00:07:16 -0000
1.24
@@ -453,9 +453,9 @@
$result_converted_errors{'info'}->{'anchor_in_copying'} = [
{
'file_name' => '',
- 'error_line' => ':5: @anchor `Copying information\' output more than once
+ 'error_line' => ':5: @anchor output more than once: Copying information
',
- 'text' => '@anchor `Copying information\' output more than once',
+ 'text' => '@anchor output more than once: Copying information',
'type' => 'error',
'macro' => '',
'line_nr' => 5
Index: t/results/regions/anchor_in_copying_in_footnote.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/regions/anchor_in_copying_in_footnote.pl 9 Nov 2012 22:30:37
-0000 1.26
+++ t/results/regions/anchor_in_copying_in_footnote.pl 18 Dec 2012 00:07:16
-0000 1.27
@@ -507,9 +507,9 @@
$result_converted_errors{'info'}->{'anchor_in_copying_in_footnote'} = [
{
'file_name' => '',
- 'error_line' => ':5: @anchor `Copying footnote\' output more than once
+ 'error_line' => ':5: @anchor output more than once: Copying footnote
',
- 'text' => '@anchor `Copying footnote\' output more than once',
+ 'text' => '@anchor output more than once: Copying footnote',
'type' => 'error',
'macro' => '',
'line_nr' => 5
Index: t/results/sectioning/node_part_chapter_after_chapter.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- t/results/sectioning/node_part_chapter_after_chapter.pl 9 Nov 2012
22:30:39 -0000 1.43
+++ t/results/sectioning/node_part_chapter_after_chapter.pl 18 Dec 2012
00:07:16 -0000 1.44
@@ -945,12 +945,12 @@
$result_errors{'node_part_chapter_after_chapter'} = [
{
- 'error_line' => ':14: warning: @node precedes @part, but part are not
associated with nodes
+ 'error_line' => ':14: warning: @node precedes @part, but parts may not be
associated with nodes
',
'file_name' => '',
'line_nr' => 14,
'macro' => '',
- 'text' => '@node precedes @part, but part are not associated with nodes',
+ 'text' => '@node precedes @part, but parts may not be associated with
nodes',
'type' => 'warning'
}
];
Index: t/results/sectioning/node_part_chapter_after_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/sectioning/node_part_chapter_after_top.pl 9 Nov 2012 22:30:39
-0000 1.32
+++ t/results/sectioning/node_part_chapter_after_top.pl 18 Dec 2012 00:07:16
-0000 1.33
@@ -647,12 +647,12 @@
$result_errors{'node_part_chapter_after_top'} = [
{
- 'error_line' => ':9: warning: @node precedes @part, but part are not
associated with nodes
+ 'error_line' => ':9: warning: @node precedes @part, but parts may not be
associated with nodes
',
'file_name' => '',
'line_nr' => 9,
'macro' => '',
- 'text' => '@node precedes @part, but part are not associated with nodes',
+ 'text' => '@node precedes @part, but parts may not be associated with
nodes',
'type' => 'warning'
}
];
Index: t/results/sectioning/part_node_after_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_after_top.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/sectioning/part_node_after_top.pl 9 Nov 2012 22:30:41 -0000
1.23
+++ t/results/sectioning/part_node_after_top.pl 18 Dec 2012 00:07:16 -0000
1.24
@@ -540,12 +540,12 @@
$result_errors{'part_node_after_top'} = [
{
- 'error_line' => ':9: warning: @node precedes @part, but part are not
associated with nodes
+ 'error_line' => ':9: warning: @node precedes @part, but parts may not be
associated with nodes
',
'file_name' => '',
'line_nr' => 9,
'macro' => '',
- 'text' => '@node precedes @part, but part are not associated with nodes',
+ 'text' => '@node precedes @part, but parts may not be associated with
nodes',
'type' => 'warning'
},
{
Index: t/results/sectioning/part_node_before_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_before_top.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- t/results/sectioning/part_node_before_top.pl 9 Nov 2012 22:30:41
-0000 1.34
+++ t/results/sectioning/part_node_before_top.pl 18 Dec 2012 00:07:16
-0000 1.35
@@ -592,12 +592,12 @@
$result_errors{'part_node_before_top'} = [
{
- 'error_line' => ':2: warning: @node precedes @part, but part are not
associated with nodes
+ 'error_line' => ':2: warning: @node precedes @part, but parts may not be
associated with nodes
',
'file_name' => '',
'line_nr' => 2,
'macro' => '',
- 'text' => '@node precedes @part, but part are not associated with nodes',
+ 'text' => '@node precedes @part, but parts may not be associated with
nodes',
'type' => 'warning'
},
{
Index: t/results/sectioning/part_node_node_part_appendix.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_node_part_appendix.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/sectioning/part_node_node_part_appendix.pl 9 Nov 2012
22:30:42 -0000 1.12
+++ t/results/sectioning/part_node_node_part_appendix.pl 18 Dec 2012
00:07:17 -0000 1.13
@@ -991,12 +991,12 @@
$result_errors{'part_node_node_part_appendix'} = [
{
- 'error_line' => ':15: warning: @node precedes @part, but part are not
associated with nodes
+ 'error_line' => ':15: warning: @node precedes @part, but parts may not be
associated with nodes
',
'file_name' => '',
'line_nr' => 15,
'macro' => '',
- 'text' => '@node precedes @part, but part are not associated with nodes',
+ 'text' => '@node precedes @part, but parts may not be associated with
nodes',
'type' => 'warning'
}
];
Index: t/results/sectioning/top_node_part_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/top_node_part_top.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/sectioning/top_node_part_top.pl 9 Nov 2012 22:30:43 -0000
1.4
+++ t/results/sectioning/top_node_part_top.pl 18 Dec 2012 00:07:17 -0000
1.5
@@ -294,12 +294,12 @@
$result_errors{'top_node_part_top'} = [
{
- 'error_line' => ':3: warning: @node precedes @part, but part are not
associated with nodes
+ 'error_line' => ':3: warning: @node precedes @part, but parts may not be
associated with nodes
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
- 'text' => '@node precedes @part, but part are not associated with nodes',
+ 'text' => '@node precedes @part, but parts may not be associated with
nodes',
'type' => 'warning'
},
{
Index: tests/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- tests/Makefile.am 11 Nov 2012 19:53:19 -0000 1.11
+++ tests/Makefile.am 18 Dec 2012 00:07:17 -0000 1.12
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.11 2012/11/11 19:53:19 pertusus Exp $
+# $Id: Makefile.am,v 1.12 2012/12/18 00:07:17 pertusus Exp $
# Makefile.am for texinfo/tp/tests.
# Copyright 2012 Free Software Foundation, Inc.
#
@@ -52,7 +52,8 @@
# when check is done in this directory.
all-local: htmlxref/htmlxref.cnf htmlxref-only_mono/htmlxref.cnf \
htmlxref-only_split/htmlxref.cnf htmlxref-only_split/.texinfo/htmlxref.cnf \
- sectioning/equivalent_nodes-noderename.cnf
+ sectioning/equivalent_nodes-noderename.cnf \
+ formatting/unknown_nodes_renamed-noderename.cnf
htmlxref/htmlxref.cnf: htmlxref/htmlxref.cnf-ref
${INSTALL_DATA} $(srcdir)/htmlxref/htmlxref.cnf-ref $@
@@ -73,5 +74,8 @@
sectioning/equivalent_nodes-noderename.cnf: sectioning/renamednodes.cnf-ref
${INSTALL_DATA} $(srcdir)/sectioning/renamednodes.cnf-ref $@
+formatting/unknown_nodes_renamed-noderename.cnf:
formatting/unknown_nodes_renamed-noderename.cnf-ref
+ ${INSTALL_DATA}
$(srcdir)/formatting/unknown_nodes_renamed-noderename.cnf-ref $@
+
EXTRA_DIST = run_parser_all.sh parser_tests.sh \
$(TESTS) coverage_macro.texi
Index: tests/formatting/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/formatting/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/formatting/.cvsignore 15 Jan 2012 17:12:05 -0000 1.2
+++ tests/formatting/.cvsignore 18 Dec 2012 00:07:17 -0000 1.3
@@ -4,3 +4,4 @@
tests.out
diffs
out_parser
+unknown_nodes_renamed-noderename.cnf
Index: tests/formatting/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/formatting/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/formatting/Makefile.am 14 Jul 2012 23:20:16 -0000 1.7
+++ tests/formatting/Makefile.am 18 Dec 2012 00:07:17 -0000 1.8
@@ -6,10 +6,11 @@
direntry_dircategory.texi \
float_copying.texi my-bib-macros.texi \
documentlanguage_set.texi japanese_long_name.texi \
- simple_with_menu.texi \
+ simple_with_menu.texi unknown_nodes_renamed.texi
+ unknown_nodes_renamed-noderename.cnf-ref \
file.css tests-parser.txt res_parser
-DISTCLEANFILES = tests.log tests.out
+DISTCLEANFILES = tests.log tests.out unknown_nodes_renamed-noderename.cnf
distclean-local:
rm -rf out_parser diffs
Index: tests/formatting/tests-parser.txt
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/formatting/tests-parser.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tests/formatting/tests-parser.txt 28 Jul 2012 23:47:37 -0000 1.10
+++ tests/formatting/tests-parser.txt 18 Dec 2012 00:07:17 -0000 1.11
@@ -15,6 +15,9 @@
defcondx_Dbar defxcond.texi -D bar
defcondx_Ubar defxcond.texi -U bar
+# renamed nodes
+unknown_nodes_renamed unknown_nodes_renamed.texi
+
# api
texi ignore_and_comments.texi --init ignore_and_comments_output.init
ignore_and_comments_output ignore_and_comments.texi --init
ignore_and_comments_output.init
Index: tests/indices/res_parser_info/index_special_region/index_special_region.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/indices/res_parser_info/index_special_region/index_special_region.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/indices/res_parser_info/index_special_region/index_special_region.2
14 Jan 2012 19:03:29 -0000 1.1
+++ tests/indices/res_parser_info/index_special_region/index_special_region.2
18 Dec 2012 00:07:18 -0000 1.2
@@ -5,5 +5,5 @@
index_special_region.texi:49: warning: Missing name for @deffnx
index_special_region.texi:52: ftable requires an argument: the formatter for
@item
index_special_region.texi:53: warning: @item missing argument
-index_special_region.texi:8: @anchor `Copying information' output more than
once
-index_special_region.texi:11: @anchor `Public domain reference' output more
than once
+index_special_region.texi:8: @anchor output more than once: Copying information
+index_special_region.texi:11: @anchor output more than once: Public domain
reference
Index:
tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
---
tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
13 Jul 2012 22:23:44 -0000 1.4
+++
tests/sectioning/res_parser/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
18 Dec 2012 00:07:18 -0000 1.5
@@ -7,7 +7,7 @@
equivalent_nodes-noderename.cnf:8: no node to be renamed
equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file
warning: Must specify a title with a title command or @top
-Node `ToP' that is to be renamed exists
-Node `Top' that is to be renamed exists
+Old name for `ToP' is a node of the document
+Old name for `Top' is a node of the document
File empty for renamed node address@hidden'
-Node to be renamed as, `non existing file' not found
+equivalent_nodes-noderename.cnf: Target node (new name for `old non existing')
not in document: non existing file
Index:
tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
---
tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
13 Jul 2012 22:23:44 -0000 1.4
+++
tests/sectioning/res_parser_html/equivalent_nodes_test_renamed_nodes/equivalent_nodes.2
18 Dec 2012 00:07:18 -0000 1.5
@@ -7,7 +7,7 @@
equivalent_nodes-noderename.cnf:8: no node to be renamed
equivalent_nodes-noderename.cnf:10: nodes without a new name at the end of file
warning: Must specify a title with a title command or @top
-Node `ToP' that is to be renamed exists
-Node `Top' that is to be renamed exists
+Old name for `ToP' is a node of the document
+Old name for `Top' is a node of the document
File empty for renamed node address@hidden'
-Node to be renamed as, `non existing file' not found
+equivalent_nodes-noderename.cnf: Target node (new name for `old non existing')
not in document: non existing file
Index: tests/formatting/unknown_nodes_renamed-noderename.cnf-ref
===================================================================
RCS file: tests/formatting/unknown_nodes_renamed-noderename.cnf-ref
diff -N tests/formatting/unknown_nodes_renamed-noderename.cnf-ref
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/formatting/unknown_nodes_renamed-noderename.cnf-ref 18 Dec 2012
00:07:17 -0000 1.1
@@ -0,0 +1,4 @@
+Unknown node 1
+unknown node 2
+@@{} renamed as unknow too
+
Index: tests/formatting/unknown_nodes_renamed.texi
===================================================================
RCS file: tests/formatting/unknown_nodes_renamed.texi
diff -N tests/formatting/unknown_nodes_renamed.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/formatting/unknown_nodes_renamed.texi 18 Dec 2012 00:07:17 -0000
1.1
@@ -0,0 +1 @@
address@hidden Top
Index: tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.1
===================================================================
RCS file:
tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.1
diff -N
tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.1
Index: tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.2
===================================================================
RCS file:
tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.2
diff -N
tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.2
18 Dec 2012 00:07:18 -0000 1.1
@@ -0,0 +1,2 @@
+warning: Must specify a title with a title command or @top
+unknown_nodes_renamed-noderename.cnf:3: Target node (new name for `unknown
node 2') not in document: renamed as unknow too
Index:
tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.html
===================================================================
RCS file:
tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.html
diff -N
tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
tests/formatting/res_parser/unknown_nodes_renamed/unknown_nodes_renamed.html
18 Dec 2012 00:07:18 -0000 1.1
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.indentedblock {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style:oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space:nowrap}
+span.nolinebreak {white-space:nowrap}
+span.roman {font-family:serif; font-weight:normal}
+span.sansserif {font-family:sans-serif; font-weight:normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+<a name="Top"></a>
+<hr>
+<p><font size="-1">
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</font></p>
+
+
+</body>
+</html>