[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp texi2any.pl Texinfo/Structuring.pm T...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp texi2any.pl Texinfo/Structuring.pm T... |
|
Date: |
Sat, 14 Jul 2012 23:20:19 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/07/14 23:20:18
Modified files:
tp : texi2any.pl
tp/Texinfo : Structuring.pm
tp/Texinfo/Convert: Converter.pm Info.pm Plaintext.pm
tp/t : 10menu.t
tp/t/results/converters_tests: at_commands_in_refs.pl
ref_in_sectioning.pl
some_at_commands_in_ref_nodes.pl
tp/t/results/coverage_braces: two_footnotes_in_nodes.pl
two_footnotes_in_nodes_separate.pl
tp/t/results/float: complex_float.pl float_copying.pl
numbering_captions_listoffloats.pl
tp/t/results/indices: double_index_entry.pl
index_entry_before_node.pl
index_entry_in_footnote_different_node_end.pl
index_entry_in_footnote_separate.pl
printindex_index_entry_in_copying.pl
printindex_index_entry_in_copying_in_footnote.pl
printindex_index_entry_in_copying_no_insertcopying.pl
tp/t/results/plaintext_tests: line_passed_and_formats.pl
tp/t/results/plaintext_tests/japanese_utf8/res_plaintext:
japanese_utf8.txt
tp/t/results/sectioning: chapter_node_before_and_after_part.pl
double_part.pl
node_part_chapter_after_chapter.pl
node_up_external_node.pl
section_below_unnumbered.pl
section_in_unnumbered_plaintext.pl
two_nodes_at_the_end.pl
two_nodes_between_chapters.pl
tp/tests/formatting: Makefile.am tests-parser.txt
Added files:
tp/tests/formatting: simple_with_menu.texi
tp/tests/formatting/res_parser/simple_with_menu_docbook_info:
simple_with_menu.1
simple_with_menu.2
simple_with_menu.info
Log message:
Do not set variables for parser when parsing command line options, but
instead call converter_defaults on the output format converter class
to set the parser option if not already set.
No warnings for errors in menu if SHOW_MENU is not set.
Have specific defaults for Plaintext and Info (mostly copied from
Plaintext
defaults) instead of shared defaults. A consequence is that when doing
Plaintext from the module, menus are not shown anymore.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.131&r2=1.132
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.214&r2=1.215
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/10menu.t?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/float_copying.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/double_index_entry.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_before_node.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/japanese_utf8/res_plaintext/japanese_utf8.txt?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_part.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_up_external_node.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_below_unnumbered.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/two_nodes_at_the_end.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/Makefile.am?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/tests-parser.txt?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/simple_with_menu.texi?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.2?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.info?cvsroot=texinfo&rev=1.1
Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- texi2any.pl 14 Jul 2012 11:41:55 -0000 1.131
+++ texi2any.pl 14 Jul 2012 23:20:08 -0000 1.132
@@ -797,13 +797,10 @@
'silent|quiet' => sub {set_from_cmdline('SILENT', $_[1]);
push @texi2dvi_args, '--'.$_[0];},
- 'plaintext' => sub {$format = $_[0];
- set_from_cmdline('SHOW_MENU', 0);
- },
+ 'plaintext' => sub {$format = $_[0];},
'html' => sub {$format = set_format($_[0]);},
'info' => sub {$format = set_format($_[0]);},
- 'docbook' => sub {$format = set_format($_[0]);
- set_from_cmdline('SHOW_MENU', 0)},
+ 'docbook' => sub {$format = set_format($_[0]);},
'xml' => sub {$format = set_format($_[0]);},
'dvi' => sub {$format = set_texi2dvi_format($_[0]);},
'dvipdf' => sub {$format = set_texi2dvi_format($_[0]);},
@@ -892,6 +889,7 @@
},
);
+
if (!$format_from_command_line and defined($ENV{'TEXINFO_OUTPUT_FORMAT'})
and $ENV{'TEXINFO_OUTPUT_FORMAT'} ne '') {
if (!$formats_table{$ENV{'TEXINFO_OUTPUT_FORMAT'}}) {
@@ -938,6 +936,10 @@
unless (grep {$_ eq $format}
@{$parser_default_options->{'expanded_formats'}});
}
+# This gets the class right, even though there is a sub...
+my $converter_class = ref(&{$formats_table{$format}->{'converter'}});
+my %converter_defaults = $converter_class->converter_defaults();
+
# FIXME should this be set when the --set is set too? The corresponding
# code is ready above, but commented out.
foreach my $parser_settable_option ('TOP_NODE_UP', 'MAX_MACRO_CALL_NESTING',
@@ -945,8 +947,13 @@
'IGNORE_BEFORE_SETFILENAME', 'TEST',
'GLOBAL_COMMANDS', 'CPP_LINE_DIRECTIVES',
'USE_UP_NODE_FOR_ELEMENT_UP') {
- $parser_default_options->{$parser_settable_option} =
get_conf($parser_settable_option)
- if (defined(get_conf($parser_settable_option)));
+ if (defined(get_conf($parser_settable_option))) {
+ $parser_default_options->{$parser_settable_option}
+ = get_conf($parser_settable_option);
+ } elsif (defined($converter_defaults{$parser_settable_option})) {
+ $parser_default_options->{$parser_settable_option}
+ = $converter_defaults{$parser_settable_option};
+ }
}
# this is very wrong, but a way to avoid a spurious warning.
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- Texinfo/Structuring.pm 13 Jul 2012 22:23:43 -0000 1.133
+++ Texinfo/Structuring.pm 14 Jul 2012 23:20:08 -0000 1.134
@@ -551,6 +551,8 @@
# Remark: since the @menu are only checked if they are in @node,
# menu entry before the first node may be treated slightly differently.
# at least, there are no error messages for them
+
+ my $check_menu_entries = (!$self->{'novalidate'} and
$self->{'SHOW_MENU'});
foreach my $menu (@{$node->{'menus'}}) {
my $previous_node;
foreach my $menu_content (@{$menu->{'contents'}}) {
@@ -560,7 +562,7 @@
my $external_node;
if
(!$menu_content->{'extra'}->{'menu_entry_node'}->{'manual_content'}) {
if
(!$self->{'labels'}->{$menu_content->{'extra'}->{'menu_entry_node'}->{'normalized'}})
{
- if (!$self->{'novalidate'}) {
+ if ($check_menu_entries) {
$self->line_error (sprintf($self->
__("Menu reference to nonexistent node `%s'"),
Texinfo::Parser::_node_extra_to_texi(
@@ -574,7 +576,7 @@
my $normalized_menu_node
=
$menu_content->{'extra'}->{'menu_entry_node'}->{'normalized'};
$menu_node = $self->{'labels'}->{$normalized_menu_node};
- if (! $self->{'novalidate'} and !
_check_node_same_texinfo_code($menu_node,
+ if ($check_menu_entries and !
_check_node_same_texinfo_code($menu_node,
$menu_content->{'extra'}->{'menu_entry_node'})) {
$self->line_warn(sprintf($self->
__("Menu entry node name `%s' different from %s name
`%s'"),
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- Texinfo/Convert/Converter.pm 13 May 2012 22:48:07 -0000 1.82
+++ Texinfo/Convert/Converter.pm 14 Jul 2012 23:20:08 -0000 1.83
@@ -104,7 +104,7 @@
$self->gdt('address@hidden');
}
-sub converter_defaults($)
+sub converter_defaults($$)
{
return %defaults;
}
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- Texinfo/Convert/Info.pm 8 Jul 2012 08:25:05 -0000 1.84
+++ Texinfo/Convert/Info.pm 14 Jul 2012 23:20:08 -0000 1.85
@@ -49,6 +49,14 @@
my $STDIN_DOCU_NAME = 'stdin';
+my %defaults = Texinfo::Convert::Plaintext::converter_defaults(undef, undef);
+$defaults{'SHOW_MENU'} = 1;
+
+sub converter_defaults($$)
+{
+ return %defaults;
+}
+
sub output($)
{
my $self = shift;
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- Texinfo/Convert/Plaintext.pm 12 Jul 2012 18:09:18 -0000 1.214
+++ Texinfo/Convert/Plaintext.pm 14 Jul 2012 23:20:09 -0000 1.215
@@ -280,10 +280,8 @@
my %defaults = (
'ENABLE_ENCODING' => 1,
-# this default is for Info, but also when doing Texinfo fragments. So this
-# has to be explicitly set to 0 when doing real plaintext.
- 'SHOW_MENU' => 1,
-# not used for plaintext, since default is '-' for plaintext.
+ 'SHOW_MENU' => 0,
+# not used for plaintext, since default is '-', and always set, for plaintext.
'EXTENSION' => 'info',
'USE_SETFILENAME_EXTENSION' => 1,
Index: t/10menu.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/10menu.t,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/10menu.t 17 Jan 2012 23:21:01 -0000 1.29
+++ t/10menu.t 14 Jul 2012 23:20:09 -0000 1.30
@@ -445,6 +445,7 @@
);
foreach my $test (@test_cases) {
+ $test->[3]->{'SHOW_MENU'} = 1 if (!defined($test->[3]->{'SHOW_MENU'}));
push @{$test->[2]->{'test_formats'}}, 'plaintext';
push @{$test->[2]->{'test_formats'}}, 'html';
push @{$test->[2]->{'test_formats'}}, 'xml';
Index: t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/converters_tests/at_commands_in_refs.pl 10 Jul 2012 20:00:47
-0000 1.8
+++ t/results/converters_tests/at_commands_in_refs.pl 14 Jul 2012 23:20:09
-0000 1.9
@@ -21657,36 +21657,6 @@
$result_converted{'plaintext'}->{'at_commands_in_refs'} = 'Top
***
-* Menu:
-
-* { }::
-* !
- . . ? @::
-* @ { } \\ #::
-* LaTeX TeX * , (C) ... ...::
-* == error-> Euro ! ==> -::
-* >= <= ->::
-* a o -!- # -| ? (R)::
-* => o a b a sunny day aa::
-* AA ae oe AE OE /o /O ss /l /L D d TH th::
-* a" e~ i^ a^ a` e\' c, e= e* e\'\' e;::
-* e. e( e_ .e e< j ee[::
-* i E=` C\',::
-* `` \'\' ` \' ,, ,::
-* << >> << >> < >::
-* `` \'\' --- -- ` \'::
-* AAA (fff) AAA BBB::
-* CCC (rrr) CCC DDD::
-* the someone <address@hidden> <address@hidden>::
-* [f--ile1] [Image description""\\.]::
-* @ {} . ::
-* \'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::
-* <indicateurl>::
-* \'http://somewhere_aaa\' text (url) ls::
-
1 { }
*****
@@ -21790,15 +21760,6 @@
$result_converted_errors{'plaintext'}->{'at_commands_in_refs'} = [
{
'file_name' => '',
- 'error_line' => ':23: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
-',
- 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
- 'type' => 'warning',
- 'macro' => '',
- 'line_nr' => 23
- },
- {
- 'file_name' => '',
'error_line' => ':91: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
Index: t/results/converters_tests/ref_in_sectioning.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/converters_tests/ref_in_sectioning.pl 12 Jul 2012 18:09:18
-0000 1.5
+++ t/results/converters_tests/ref_in_sectioning.pl 14 Jul 2012 23:20:09
-0000 1.6
@@ -2958,11 +2958,6 @@
for example *note node:: (*note node::) (*note (file)Top::)
***********************************************************
-* Menu:
-
-* node::
-* chap::
-
1 *Note title: (file name)node.
*******************************
Index: t/results/converters_tests/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/some_at_commands_in_ref_nodes.pl 25 Jan 2012
00:01:04 -0000 1.1
+++ t/results/converters_tests/some_at_commands_in_ref_nodes.pl 14 Jul 2012
23:20:09 -0000 1.2
@@ -1718,10 +1718,6 @@
$result_converted{'plaintext'}->{'some_at_commands_in_ref_nodes'} = 'Top
***
-* Menu:
-
-* A SC N~ AA TeX node i" i" E=` /l C\', !::
-
1 A SC node i" i" E=` /l C\', !
******************************
Index: t/results/coverage_braces/two_footnotes_in_nodes.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/two_footnotes_in_nodes.pl 25 Feb 2012 13:15:40
-0000 1.2
+++ t/results/coverage_braces/two_footnotes_in_nodes.pl 14 Jul 2012 23:20:09
-0000 1.3
@@ -1038,10 +1038,6 @@
B(2)
-* Menu:
-
-* chapter::
-
---------- Footnotes ----------
(1) Footnote Top/1
Index: t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 25 Feb
2012 13:15:41 -0000 1.2
+++ t/results/coverage_braces/two_footnotes_in_nodes_separate.pl 14 Jul
2012 23:20:10 -0000 1.3
@@ -1069,10 +1069,6 @@
B(2) (*note Top-Footnote-2::)
-* Menu:
-
-* chapter::
-
(1) Footnote Top/1
para2
Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/float/complex_float.pl 25 Feb 2012 13:15:41 -0000 1.36
+++ t/results/float/complex_float.pl 14 Jul 2012 23:20:10 -0000 1.37
@@ -5275,9 +5275,6 @@
An example of float ...
After the listoffloats.
-* Menu:
-
-* chapter::
An example of float ...
Index: t/results/float/float_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/float_copying.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/float/float_copying.pl 27 May 2012 10:45:13 -0000 1.19
+++ t/results/float/float_copying.pl 14 Jul 2012 23:20:10 -0000 1.20
@@ -1616,10 +1616,6 @@
Copyright notice 1: The Public Domain notice(1)
-* Menu:
-
-* Copying and floats::
-
---------- Footnotes ----------
(1) The caption copying footnote
@@ -1645,13 +1641,13 @@
* Menu:
-* indexed caption: Copying and floats. (line 31)
-* indexed caption copying footnote: Top. (line 16)
+* indexed caption: Copying and floats. (line 27)
+* indexed caption copying footnote: Top. (line 12)
* Menu:
-* indexed caption function: Copying and floats. (line 31)
-* public domain function: Top. (line 16)
+* indexed caption function: Copying and floats. (line 27)
+* public domain function: Top. (line 12)
---------- Footnotes ----------
Index: t/results/float/numbering_captions_listoffloats.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/float/numbering_captions_listoffloats.pl 25 Feb 2012 13:15:42
-0000 1.33
+++ t/results/float/numbering_captions_listoffloats.pl 14 Jul 2012 23:20:10
-0000 1.34
@@ -9116,14 +9116,6 @@
Warning 1: C A warning
-* Menu:
-
-* chapter::
-* Unnumbered::
-* Chapter with unnumbsubsec::
-* Appendix for float::
-* list of floats::
-
1 A chapter
***********
@@ -9145,10 +9137,6 @@
Warning 1.1: C A warning in chapter
-* Menu:
-
-* section::
-
1.1 A section
=============
@@ -9159,10 +9147,6 @@
Unnumbered
**********
-* Menu:
-
-* Section within unnumbered::
-
unnum
Text 5: C unnumbered float
@@ -9181,10 +9165,6 @@
2 Chapter with unnumbsubsec
***************************
-* Menu:
-
-* unnumbered sec::
-
Chap
Text 2.1: C Chapter with subsec
Index: t/results/indices/double_index_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/double_index_entry.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/indices/double_index_entry.pl 27 May 2012 11:31:37 -0000
1.18
+++ t/results/indices/double_index_entry.pl 14 Jul 2012 23:20:10 -0000
1.19
@@ -745,13 +745,9 @@
* Menu:
-* other node::
-
-* Menu:
-
* aaa: Top. (line 0)
* aaa <1>: Top. (line 2)
-* aaa <2>: other node. (line 6)
+* aaa <2>: other node. (line 2)
';
Index: t/results/indices/index_entry_before_node.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_before_node.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/indices/index_entry_before_node.pl 27 May 2012 10:45:14
-0000 1.18
+++ t/results/indices/index_entry_before_node.pl 14 Jul 2012 23:20:10
-0000 1.19
@@ -810,16 +810,11 @@
';
-$result_converted{'plaintext'}->{'index_entry_before_node'} = '* Menu:
-
-* first::
-* second::
-
-Para.
+$result_converted{'plaintext'}->{'index_entry_before_node'} = 'Para.
* Menu:
-* lone entry: first. (line 6)
+* lone entry: first. (line 1)
';
Index: t/results/indices/index_entry_in_footnote_different_node_end.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/indices/index_entry_in_footnote_different_node_end.pl 27 May
2012 11:31:37 -0000 1.1
+++ t/results/indices/index_entry_in_footnote_different_node_end.pl 14 Jul
2012 23:20:10 -0000 1.2
@@ -714,11 +714,7 @@
';
-$result_converted{'plaintext'}->{'index_entry_in_footnote_different_node_end'}
= '* Menu:
-
-* First::
-
-Top node(1)
+$result_converted{'plaintext'}->{'index_entry_in_footnote_different_node_end'}
= 'Top node(1)
---------- Footnotes ----------
@@ -730,8 +726,8 @@
* Menu:
-* counting entry: Top. (line 13)
-* index entry in footnote: Top. (line 8)
+* counting entry: Top. (line 9)
+* index entry in footnote: Top. (line 4)
';
Index: t/results/indices/index_entry_in_footnote_separate.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/indices/index_entry_in_footnote_separate.pl 27 May 2012
10:45:14 -0000 1.4
+++ t/results/indices/index_entry_in_footnote_separate.pl 14 Jul 2012
23:20:10 -0000 1.5
@@ -764,11 +764,7 @@
';
-$result_converted{'plaintext'}->{'index_entry_in_footnote_separate'} = '* Menu:
-
-* First::
-
-Top node(1) (*note Top-Footnote-1::)
+$result_converted{'plaintext'}->{'index_entry_in_footnote_separate'} = 'Top
node(1) (*note Top-Footnote-1::)
(1) in footnote
@@ -778,8 +774,8 @@
* Menu:
-* counting entry: Top-Footnotes. (line 11)
-* index entry in footnote: Top-Footnotes. (line 6)
+* counting entry: Top-Footnotes. (line 7)
+* index entry in footnote: Top-Footnotes. (line 2)
';
Index: t/results/indices/printindex_index_entry_in_copying.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/indices/printindex_index_entry_in_copying.pl 27 May 2012
10:45:15 -0000 1.22
+++ t/results/indices/printindex_index_entry_in_copying.pl 14 Jul 2012
23:20:10 -0000 1.23
@@ -1536,10 +1536,6 @@
* xf: Top. (line 6)
* xftable xitem: Top. (line 10)
-* Menu:
-
-* chapter::
-
1 Chapter
*********
@@ -1552,19 +1548,19 @@
* Menu:
-* Copying this document: chapter. (line 27)
-* ftable item: chapter. (line 31)
-* fun: chapter. (line 27)
-* xf: chapter. (line 28)
-* xftable xitem: chapter. (line 32)
+* Copying this document: chapter. (line 23)
+* ftable item: chapter. (line 27)
+* fun: chapter. (line 23)
+* xf: chapter. (line 24)
+* xftable xitem: chapter. (line 28)
* Menu:
-* Copying this document: chapter. (line 27)
-* ftable item: chapter. (line 31)
-* fun: chapter. (line 27)
-* xf: chapter. (line 28)
-* xftable xitem: chapter. (line 32)
+* Copying this document: chapter. (line 23)
+* ftable item: chapter. (line 27)
+* fun: chapter. (line 23)
+* xf: chapter. (line 24)
+* xftable xitem: chapter. (line 28)
';
Index: t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 27 May
2012 10:45:15 -0000 1.19
+++ t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 14 Jul
2012 23:20:10 -0000 1.20
@@ -970,10 +970,6 @@
* Menu:
-* Menu:
-
-* chapter::
-
---------- Footnotes ----------
(1) In footnote
@@ -985,7 +981,7 @@
* Menu:
-* Copying this document: Top. (line 16)
+* Copying this document: Top. (line 12)
---------- Footnotes ----------
Index: t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
27 May 2012 10:45:15 -0000 1.18
+++ t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
14 Jul 2012 23:20:10 -0000 1.19
@@ -1448,10 +1448,6 @@
Top.
-* Menu:
-
-* chapter::
-
1 Chapter
*********
Index: t/results/plaintext_tests/line_passed_and_formats.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/line_passed_and_formats.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/plaintext_tests/line_passed_and_formats.pl 19 Aug 2011
23:09:44 -0000 1.13
+++ t/results/plaintext_tests/line_passed_and_formats.pl 14 Jul 2012
23:20:10 -0000 1.14
@@ -3501,9 +3501,6 @@
In nested
menu
-* Menu:
-
-* (manual)node::
end menu
';
Index: t/results/plaintext_tests/japanese_utf8/res_plaintext/japanese_utf8.txt
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/japanese_utf8/res_plaintext/japanese_utf8.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/japanese_utf8/res_plaintext/japanese_utf8.txt
27 Jan 2012 18:50:22 -0000 1.1
+++ t/results/plaintext_tests/japanese_utf8/res_plaintext/japanese_utf8.txt
14 Jul 2012 23:20:11 -0000 1.2
@@ -3,11 +3,6 @@
ãã㯠GNU LilyPond ãã¼ã¸ã§ã³
-* Menu:
-
-* Preface::
-* Introduction:: LilyPond ã¨ã¯ä½ãªã®ãããªã
LilyPond ã使ãã®ããã©ããã£ã¦ LilyPond ã使ãã®ã
-
1 Preface
*********
Index: t/results/sectioning/chapter_node_before_and_after_part.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/sectioning/chapter_node_before_and_after_part.pl 25 Feb 2012
13:15:47 -0000 1.26
+++ t/results/sectioning/chapter_node_before_and_after_part.pl 14 Jul 2012
23:20:11 -0000 1.27
@@ -653,10 +653,6 @@
$result_converted{'plaintext'}->{'chapter_node_before_and_after_part'} = '1
chapter
*********
-* Menu:
-
-* after::
-
2 chapter 2
***********
Index: t/results/sectioning/double_part.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_part.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/sectioning/double_part.pl 25 Feb 2012 13:15:48 -0000 1.22
+++ t/results/sectioning/double_part.pl 14 Jul 2012 23:20:11 -0000 1.23
@@ -872,10 +872,6 @@
$result_converted{'plaintext'}->{'double_part'} = 'top
***
-* Menu:
-
-* node chapter::
-
Text part first.
Text part second.
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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/sectioning/node_part_chapter_after_chapter.pl 25 Feb 2012
13:15:48 -0000 1.31
+++ t/results/sectioning/node_part_chapter_after_chapter.pl 14 Jul 2012
23:20:11 -0000 1.32
@@ -1109,11 +1109,6 @@
$result_converted{'plaintext'}->{'node_part_chapter_after_chapter'} = 'top
***
-* Menu:
-
-* chapter node::
-* part chapter node::
-
1 chapter node
**************
Index: t/results/sectioning/node_up_external_node.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/node_up_external_node.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/node_up_external_node.pl 25 Feb 2012 13:15:48
-0000 1.9
+++ t/results/sectioning/node_up_external_node.pl 14 Jul 2012 23:20:12
-0000 1.10
@@ -627,11 +627,7 @@
';
-$result_converted{'plaintext'}->{'node_up_external_node'} = '* Menu:
-
-* first::
-
-';
+$result_converted{'plaintext'}->{'node_up_external_node'} = '';
$result_converted{'html'}->{'node_up_external_node'} = '<!DOCTYPE html PUBLIC
"-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
Index: t/results/sectioning/section_below_unnumbered.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_below_unnumbered.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/sectioning/section_below_unnumbered.pl 25 Feb 2012 13:15:50
-0000 1.19
+++ t/results/sectioning/section_below_unnumbered.pl 14 Jul 2012 23:20:14
-0000 1.20
@@ -963,17 +963,9 @@
Top node.
-* Menu:
-
-* Unn::
-
Unn
***
-* Menu:
-
-* Sec::
-
Sec
===
Index: t/results/sectioning/section_in_unnumbered_plaintext.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/sectioning/section_in_unnumbered_plaintext.pl 25 Feb 2012
13:15:50 -0000 1.26
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl 14 Jul 2012
23:20:14 -0000 1.27
@@ -8805,52 +8805,24 @@
Menu:
-* Menu:
-
-* chapter::
-* unnumbered::
-* chapter 2::
-* chapter 3::
-* unnumbered 4::
-
1 chapter
*********
-* Menu:
-
-* section in chapter::
-
1.1 section in chapter
======================
unnumbered
**********
-* Menu:
-
-* section in unnumbered::
-
section in unnumbered
=====================
2 chapter 2
***********
-* Menu:
-
-* unnumberedsec 2::
-* unnumberedsec 2-1::
-
unnumbered section 2
====================
-* Menu:
-
-* unnumbered sub 2::
-* numbered sub 2::
-* unnumbered sub2 2::
-* numbered sub2 2::
-
unnumbered subsection 2
-----------------------
@@ -8866,34 +8838,15 @@
unnumberedsec 2-1
=================
-* Menu:
-
-* numbered sub 2-1::
-
numbered subsection 2-1
-----------------------
3 chapter 3
***********
-* Menu:
-
-* unnumberedsec 3::
-* section 3-1::
-* unnumberedsec 3-2::
-* section 3-3::
-* unnumberedsec 3-4::
-
unnumbered section 3
====================
-* Menu:
-
-* unnumbered sub 3::
-* numbered sub 3::
-* unnumbered sub2 3::
-* numbered sub2 3::
-
unnumbered subsection 3
-----------------------
@@ -8912,50 +8865,27 @@
unnumberedsec 3-2
=================
-* Menu:
-
-* numbered sub 3-2::
-
numbered subsection 3-2
-----------------------
3.2 section 3-3
===============
-* Menu:
-
-* subsection 3-3::
-
3.2.1 subsection 3-3
--------------------
unnumberedsec 3-4
=================
-* Menu:
-
-* numbered sub 3-4::
-
numbered subsection 3-4
-----------------------
unnumbered 4
************
-* Menu:
-
-* unnumberedsec 4::
-
unnumbered section 4
====================
-* Menu:
-
-* unnumbered sub 4::
-* numbered sub 4::
-* unnumbered sub2 4::
-* numbered sub2 4::
-
unnumbered subsection 4
-----------------------
Index: t/results/sectioning/two_nodes_at_the_end.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/two_nodes_at_the_end.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/two_nodes_at_the_end.pl 25 Feb 2012 13:15:51
-0000 1.6
+++ t/results/sectioning/two_nodes_at_the_end.pl 14 Jul 2012 23:20:15
-0000 1.7
@@ -1079,12 +1079,6 @@
$result_converted{'plaintext'}->{'two_nodes_at_the_end'} = 'top
***
-* Menu:
-
-* chapter 1::
-* node after chapter 1::
-* node after chapter 2::
-
1 chapter c1
************
Index: t/results/sectioning/two_nodes_between_chapters.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/two_nodes_between_chapters.pl 25 Feb 2012 13:15:51
-0000 1.9
+++ t/results/sectioning/two_nodes_between_chapters.pl 14 Jul 2012 23:20:16
-0000 1.10
@@ -1235,12 +1235,6 @@
$result_converted{'plaintext'}->{'two_nodes_between_chapters'} = 'top
***
-* Menu:
-
-* chapter 1::
-* node between chapters::
-* chapter 2::
-
1 chapter c1
************
Index: tests/formatting/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/formatting/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tests/formatting/Makefile.am 19 Apr 2012 21:14:49 -0000 1.6
+++ tests/formatting/Makefile.am 14 Jul 2012 23:20:16 -0000 1.7
@@ -6,6 +6,7 @@
direntry_dircategory.texi \
float_copying.texi my-bib-macros.texi \
documentlanguage_set.texi japanese_long_name.texi \
+ simple_with_menu.texi \
file.css tests-parser.txt res_parser
DISTCLEANFILES = tests.log tests.out
Index: tests/formatting/tests-parser.txt
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/formatting/tests-parser.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tests/formatting/tests-parser.txt 19 Apr 2012 21:14:50 -0000 1.8
+++ tests/formatting/tests-parser.txt 14 Jul 2012 23:20:18 -0000 1.9
@@ -34,4 +34,4 @@
documentlanguage_set_unknown documentlanguage_set.texi --document-language
unknown
documentlanguage_set_option_info documentlanguage_set.texi --info
--document-language fr
float_copying float_copying.texi --split chapter
-
+simple_with_menu_docbook_info simple_with_menu.texi --docbook --info
Index: tests/formatting/simple_with_menu.texi
===================================================================
RCS file: tests/formatting/simple_with_menu.texi
diff -N tests/formatting/simple_with_menu.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/formatting/simple_with_menu.texi 14 Jul 2012 23:20:17 -0000
1.1
@@ -0,0 +1,13 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden simple_with_menu.info
+
address@hidden Top
+
address@hidden
+* test::
address@hidden menu
+
address@hidden test
+
address@hidden
Index:
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.1
===================================================================
RCS file:
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.1
diff -N
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.1
Index:
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.2
===================================================================
RCS file:
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.2
diff -N
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.2
Index:
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.info
===================================================================
RCS file:
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.info
diff -N
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
tests/formatting/res_parser/simple_with_menu_docbook_info/simple_with_menu.info
14 Jul 2012 23:20:18 -0000 1.1
@@ -0,0 +1,20 @@
+This is simple_with_menu.info, produced by texi2any version from
+simple_with_menu.texi.
+
+
+File: simple_with_menu.info, Node: Top, Next: test, Up: (dir)
+
+* Menu:
+
+* test::
+
+
+File: simple_with_menu.info, Node: test, Prev: Top, Up: Top
+
+
+
+Tag Table:
+Node: Top89
+Node: test176
+
+End Tag Table
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp texi2any.pl Texinfo/Structuring.pm T...,
Patrice Dumas <=