[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/XML.pm t/30sectionin...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/XML.pm t/30sectionin... |
|
Date: |
Thu, 01 Sep 2011 22:00:31 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/01 22:00:31
Modified files:
tp/Texinfo/Convert: XML.pm
tp/t : 30sectioning.t
tp/t/results/sectioning: chapter_before_part.pl
chapter_node_before_and_after_part.pl
double_part.pl
node_part_chapter_after_chapter.pl
node_part_chapter_after_top.pl
part_before_top.pl
part_chapter_after_top.pl
part_node_chapter_after_top.pl
section_before_part.pl
section_before_top.pl
section_in_unnumbered_plaintext.pl
section_node_before_part.pl
two_unnumbered_no_argument.pl
Log message:
Fix determination of autoamtic node directions.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/30sectioning.t?cvsroot=texinfo&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_before_part.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_part.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_before_top.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_part.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_node_before_part.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/two_unnumbered_no_argument.pl?cvsroot=texinfo&r1=1.2&r2=1.3
Patches:
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Texinfo/Convert/XML.pm 31 Aug 2011 22:54:51 -0000 1.6
+++ Texinfo/Convert/XML.pm 1 Sep 2011 22:00:19 -0000 1.7
@@ -426,14 +426,15 @@
$result .= "<nodename>".
$self->_convert({'contents' =>
$root->{'extra'}->{'node_content'}})
."</nodename>\n";
- my $direction_index = 0;
+ # first arg is the node name.
+ my $direction_index = 1;
foreach my $direction(@node_directions) {
if ($root->{'node_'.lc($direction)}) {
my $node_direction = $root->{'node_'.lc($direction)};
my $element = 'node'.lc($direction);
my $node_name = '';
my $attribute = '';
- if (!
defined($node_direction->{'extra'}->{'nodes_manuals'}->[$direction_index])) {
+ if (!
defined($root->{'extra'}->{'nodes_manuals'}->[$direction_index])) {
$attribute = ' automatic="on"';
}
if ($node_direction->{'extra'}->{'manual_content'}) {
@@ -447,8 +448,8 @@
'contents' =>
$node_direction->{'extra'}->{'node_content'}}));
}
$result .= "<$element${attribute}>$node_name</$element>\n";
- $direction_index++;
}
+ $direction_index++;
}
$result .= "</node>\n";
$self->{'document_context'}->[-1]->{'code'}--;
Index: t/30sectioning.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/30sectioning.t,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- t/30sectioning.t 31 Aug 2011 22:54:51 -0000 1.53
+++ t/30sectioning.t 1 Sep 2011 22:00:27 -0000 1.54
@@ -1462,8 +1462,8 @@
foreach my $test (@tests_converted) {
push @{$test->[2]->{'test_formats'}}, 'plaintext';
push @{$test->[2]->{'test_formats'}}, 'html';
-# push @{$test->[2]->{'test_formats'}}, 'xml'
-# if (grep {$_ eq $test->[0]} @xml_tests_converted_tests);
+ push @{$test->[2]->{'test_formats'}}, 'xml'
+ if (grep {$_ eq $test->[0]} @xml_tests_converted_tests);
}
my @xml_tests_info_tests = ('part_chapter_after_top',
@@ -1474,8 +1474,8 @@
foreach my $test (@tests_info) {
push @{$test->[2]->{'test_formats'}}, 'info';
push @{$test->[2]->{'test_formats'}}, 'html';
-# push @{$test->[2]->{'test_formats'}}, 'xml'
-# if (grep {$_ eq $test->[0]} @xml_tests_info_tests);
+ push @{$test->[2]->{'test_formats'}}, 'xml'
+ if (grep {$_ eq $test->[0]} @xml_tests_info_tests);
}
my @xml_tests_cases_tests = ('part_before_section',
Index: t/results/sectioning/chapter_before_part.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_before_part.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/chapter_before_part.pl 27 Jul 2011 00:21:30 -0000
1.2
+++ t/results/sectioning/chapter_before_part.pl 1 Sep 2011 22:00:27 -0000
1.3
@@ -307,4 +307,14 @@
];
+
+$result_converted{'xml'}->{'chapter_before_part'} = '<chapter>
+<title>chapter</title>
+
+</chapter>
+<part>
+<title>part</title>
+</part>
+';
+
1;
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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/sectioning/chapter_node_before_and_after_part.pl 19 Aug 2011
23:09:45 -0000 1.13
+++ t/results/sectioning/chapter_node_before_and_after_part.pl 1 Sep 2011
22:00:28 -0000 1.14
@@ -783,4 +783,35 @@
];
+
+$result_converted{'xml'}->{'chapter_node_before_and_after_part'} = '
+<node>
+<nodename>Top</nodename>
+<nodenext automatic="on">after</nodenext>
+<nodeup automatic="on">(dir)</nodeup>
+</node>
+<chapter>
+<title>chapter</title>
+
+<menu>
+<menuentry><menunode>after</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+</chapter>
+<part>
+<title>part</title>
+
+<node>
+<nodename>after</nodename>
+<nodeprev automatic="on">Top</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<chapter>
+<title>chapter 2</title>
+
+<contents></contents>
+</chapter>
+</part>
+';
+
1;
Index: t/results/sectioning/double_part.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_part.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/double_part.pl 21 Aug 2011 13:43:53 -0000 1.8
+++ t/results/sectioning/double_part.pl 1 Sep 2011 22:00:28 -0000 1.9
@@ -987,4 +987,39 @@
</html>
';
+
+$result_converted{'xml'}->{'double_part'} = '<node>
+<nodename>Top</nodename>
+<nodenext automatic="on">node chapter</nodenext>
+<nodeup automatic="on">(dir)</nodeup>
+</node>
+<top>
+<title>top</title>
+
+<menu>
+<menuentry><menunode>node chapter</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+</top>
+<part>
+<title>part first</title>
+
+<para>Text part first.
+</para></part>
+<part>
+<title>part second</title>
+<para>Text part second.
+</para>
+<node>
+<nodename>node chapter</nodename>
+<nodeprev automatic="on">Top</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<chapter>
+<title>chapter after 2 parts</title>
+
+</chapter>
+</part>
+';
+
1;
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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/node_part_chapter_after_chapter.pl 21 Aug 2011
13:43:53 -0000 1.14
+++ t/results/sectioning/node_part_chapter_after_chapter.pl 1 Sep 2011
22:00:29 -0000 1.15
@@ -1256,4 +1256,46 @@
</html>
';
+
+$result_converted{'xml'}->{'node_part_chapter_after_chapter'} = '<node>
+<nodename>Top</nodename>
+<nodenext automatic="on">chapter node</nodenext>
+<nodeup automatic="on">(dir)</nodeup>
+</node>
+<top>
+<title>top</title>
+
+<menu>
+<menuentry><menunode>chapter node</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>part chapter
node</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+</top>
+<node>
+<nodename>chapter node</nodename>
+<nodenext automatic="on">part chapter node</nodenext>
+<nodeprev automatic="on">Top</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+
+<chapter>
+<title>chapter node</title>
+
+</chapter>
+<node>
+<nodename>part chapter node</nodename>
+<nodeprev automatic="on">chapter node</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<part>
+<title>part</title>
+
+<chapter>
+<title>chapter with part node</title>
+
+<contents></contents>
+</chapter>
+</part>
+';
+
1;
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/node_part_chapter_after_top.pl 21 Aug 2011 13:43:53
-0000 1.6
+++ t/results/sectioning/node_part_chapter_after_top.pl 1 Sep 2011 22:00:29
-0000 1.7
@@ -854,4 +854,32 @@
</html>
';
+
+$result_converted{'xml'}->{'node_part_chapter_after_top'} = '<node>
+<nodename>Top</nodename>
+<nodenext automatic="on">chapter node</nodenext>
+<nodeup automatic="on">(dir)</nodeup>
+</node>
+<top>
+<title>top</title>
+
+<menu>
+<menuentry><menunode>chapter node</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+</top>
+<node>
+<nodename>chapter node</nodename>
+<nodeprev automatic="on">Top</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<part>
+<title>part</title>
+
+<chapter>
+<title>chapter</title>
+</chapter>
+</part>
+';
+
1;
Index: t/results/sectioning/part_before_top.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/part_before_top.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/part_before_top.pl 27 Jul 2011 00:21:30 -0000
1.2
+++ t/results/sectioning/part_before_top.pl 1 Sep 2011 22:00:30 -0000
1.3
@@ -308,4 +308,14 @@
</html>
';
+
+$result_converted{'xml'}->{'part_before_top'} = '<part>
+<title>part</title>
+
+</part>
+<top>
+<title>top</title>
+</top>
+';
+
1;
Index: t/results/sectioning/part_chapter_after_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/part_chapter_after_top.pl 21 Aug 2011 13:43:53
-0000 1.6
+++ t/results/sectioning/part_chapter_after_top.pl 1 Sep 2011 22:00:30
-0000 1.7
@@ -854,4 +854,32 @@
</html>
';
+
+$result_converted{'xml'}->{'part_chapter_after_top'} = '<node>
+<nodename>Top</nodename>
+<nodenext automatic="on">chapter</nodenext>
+<nodeup automatic="on">(dir)</nodeup>
+</node>
+<top>
+<title>top</title>
+
+<menu>
+<menuentry><menunode>chapter</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+</top>
+<part>
+<title>part</title>
+
+<node>
+<nodename>chapter</nodename>
+<nodeprev automatic="on">Top</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<chapter>
+<title>chapter</title>
+</chapter>
+</part>
+';
+
1;
Index: t/results/sectioning/part_node_chapter_after_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/part_node_chapter_after_top.pl 21 Aug 2011 13:43:54
-0000 1.14
+++ t/results/sectioning/part_node_chapter_after_top.pl 1 Sep 2011 22:00:30
-0000 1.15
@@ -1128,4 +1128,41 @@
</html>
';
+
+$result_converted{'xml'}->{'part_node_chapter_after_top'} = '<node>
+<nodename>Top</nodename>
+<nodenext automatic="on">a node after part</nodenext>
+<nodeup automatic="on">(dir)</nodeup>
+</node>
+<top>
+<title>top</title>
+
+<menu>
+<menuentry><menunode>a node after part</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>chapter</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+</top>
+<part>
+<title>part</title>
+
+<node>
+<nodename>a node after part</nodename>
+<nodenext>chapter</nodenext>
+<nodeprev>Top</nodeprev>
+<nodeup>Top</nodeup>
+</node>
+<para>After a node after part
+</para>
+<node>
+<nodename>chapter</nodename>
+<nodeprev automatic="on">a node after part</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<chapter>
+<title>chapter</title>
+</chapter>
+</part>
+';
+
1;
Index: t/results/sectioning/section_before_part.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_before_part.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/sectioning/section_before_part.pl 27 Jul 2011 00:21:31 -0000
1.7
+++ t/results/sectioning/section_before_part.pl 1 Sep 2011 22:00:31 -0000
1.8
@@ -267,4 +267,16 @@
];
+
+$result_converted{'xml'}->{'section_before_part'} = '<section>
+<title>section</title>
+
+</section>
+<part>
+<title>part</title>
+
+<contents></contents>
+</part>
+';
+
1;
Index: t/results/sectioning/section_before_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/section_before_top.pl 19 Aug 2011 23:09:46 -0000
1.11
+++ t/results/sectioning/section_before_top.pl 1 Sep 2011 22:00:31 -0000
1.12
@@ -669,4 +669,28 @@
</html>
';
+
+$result_converted{'xml'}->{'section_before_top'} = '<node>
+<nodename>section node</nodename>
+<nodeprev automatic="on">Top</nodeprev>
+<nodeup>Top</nodeup>
+</node>
+<section>
+<title>section</title>
+
+</section>
+<node>
+<nodename>Top</nodename>
+<nodenext automatic="on">section node</nodenext>
+<nodeup automatic="on">(dir)</nodeup>
+</node>
+<unnumberedsec originalcommand="top">
+<title>top</title>
+
+<menu>
+<menuentry><menunode>section node</menunode><menudescription>
+</menudescription></menuentry></menu>
+</unnumberedsec>
+';
+
1;
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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/sectioning/section_in_unnumbered_plaintext.pl 19 Aug 2011
23:09:46 -0000 1.13
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl 1 Sep 2011
22:00:31 -0000 1.14
@@ -9461,4 +9461,378 @@
</html>
';
+
+$result_converted{'xml'}->{'section_in_unnumbered_plaintext'} = '
+<setcontentsaftertitlepage></setcontentsaftertitlepage>
+
+<node>
+<nodename>Top</nodename>
+<nodenext automatic="on">chapter</nodenext>
+<nodeup automatic="on">(dir)</nodeup>
+</node>
+<top>
+<title>Test section in unnumbered</title>
+
+<contents></contents>
+
+<para>Menu:
+</para>
+<menu>
+<menuentry><menunode>chapter</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>unnumbered</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>chapter
2</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>chapter
3</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>unnumbered
4</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+</top>
+<node>
+<nodename>chapter</nodename>
+<nodenext automatic="on">unnumbered</nodenext>
+<nodeprev automatic="on">Top</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<chapter>
+<title>chapter</title>
+
+<menu>
+<menuentry><menunode>section in chapter</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>section in chapter</nodename>
+<nodeup automatic="on">chapter</nodeup>
+</node>
+<section>
+<title>section in chapter</title>
+
+</section>
+</chapter>
+<node>
+<nodename>unnumbered</nodename>
+<nodenext automatic="on">chapter 2</nodenext>
+<nodeprev automatic="on">chapter</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<unnumbered>
+<title>unnumbered</title>
+
+<menu>
+<menuentry><menunode>section in unnumbered</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>section in unnumbered</nodename>
+<nodeup automatic="on">unnumbered</nodeup>
+</node>
+<section>
+<title>section in unnumbered</title>
+
+</section>
+</unnumbered>
+<node>
+<nodename>chapter 2</nodename>
+<nodenext automatic="on">chapter 3</nodenext>
+<nodeprev automatic="on">unnumbered</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<chapter>
+<title>chapter 2</title>
+
+<menu>
+<menuentry><menunode>unnumberedsec 2</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>unnumberedsec
2-1</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>unnumberedsec 2</nodename>
+<nodenext automatic="on">unnumberedsec 2-1</nodenext>
+<nodeup automatic="on">chapter 2</nodeup>
+</node>
+<unnumberedsec>
+<title>unnumbered section 2</title>
+
+<menu>
+<menuentry><menunode>unnumbered sub 2</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>numbered sub
2</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>unnumbered sub2
2</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>numbered sub2
2</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>unnumbered sub 2</nodename>
+<nodenext automatic="on">numbered sub 2</nodenext>
+<nodeup automatic="on">unnumberedsec 2</nodeup>
+</node>
+<unnumberedsubsec>
+<title>unnumbered subsection 2</title>
+
+</unnumberedsubsec>
+<node>
+<nodename>numbered sub 2</nodename>
+<nodenext automatic="on">unnumbered sub2 2</nodenext>
+<nodeprev automatic="on">unnumbered sub 2</nodeprev>
+<nodeup automatic="on">unnumberedsec 2</nodeup>
+</node>
+<subsection>
+<title>numbered subsection 2</title>
+
+</subsection>
+<node>
+<nodename>unnumbered sub2 2</nodename>
+<nodenext automatic="on">numbered sub2 2</nodenext>
+<nodeprev automatic="on">numbered sub 2</nodeprev>
+<nodeup automatic="on">unnumberedsec 2</nodeup>
+</node>
+<unnumberedsubsec>
+<title>unnumbered subsection2 2</title>
+
+</unnumberedsubsec>
+<node>
+<nodename>numbered sub2 2</nodename>
+<nodeprev automatic="on">unnumbered sub2 2</nodeprev>
+<nodeup automatic="on">unnumberedsec 2</nodeup>
+</node>
+<subsection>
+<title>numbered subsection2 2</title>
+
+</subsection>
+</unnumberedsec>
+<node>
+<nodename>unnumberedsec 2-1</nodename>
+<nodeprev automatic="on">unnumberedsec 2</nodeprev>
+<nodeup automatic="on">chapter 2</nodeup>
+</node>
+<unnumberedsec>
+<title>unnumberedsec 2-1</title>
+
+<menu>
+<menuentry><menunode>numbered sub 2-1</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>numbered sub 2-1</nodename>
+<nodeup automatic="on">unnumberedsec 2-1</nodeup>
+</node>
+<subsection>
+<title>numbered subsection 2-1</title>
+
+
+</subsection>
+</unnumberedsec>
+</chapter>
+<node>
+<nodename>chapter 3</nodename>
+<nodenext automatic="on">unnumbered 4</nodenext>
+<nodeprev automatic="on">chapter 2</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<chapter>
+<title>chapter 3</title>
+
+<menu>
+<menuentry><menunode>unnumberedsec 3</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>section
3-1</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>unnumberedsec
3-2</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>section
3-3</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>unnumberedsec
3-4</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>unnumberedsec 3</nodename>
+<nodenext automatic="on">section 3-1</nodenext>
+<nodeup automatic="on">chapter 3</nodeup>
+</node>
+<unnumberedsec>
+<title>unnumbered section 3</title>
+
+<menu>
+<menuentry><menunode>unnumbered sub 3</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>numbered sub
3</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>unnumbered sub2
3</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>numbered sub2
3</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>unnumbered sub 3</nodename>
+<nodenext automatic="on">numbered sub 3</nodenext>
+<nodeup automatic="on">unnumberedsec 3</nodeup>
+</node>
+<unnumberedsubsec>
+<title>unnumbered subsection 3</title>
+
+</unnumberedsubsec>
+<node>
+<nodename>numbered sub 3</nodename>
+<nodenext automatic="on">unnumbered sub2 3</nodenext>
+<nodeprev automatic="on">unnumbered sub 3</nodeprev>
+<nodeup automatic="on">unnumberedsec 3</nodeup>
+</node>
+<subsection>
+<title>numbered subsection 3</title>
+
+</subsection>
+<node>
+<nodename>unnumbered sub2 3</nodename>
+<nodenext automatic="on">numbered sub2 3</nodenext>
+<nodeprev automatic="on">numbered sub 3</nodeprev>
+<nodeup automatic="on">unnumberedsec 3</nodeup>
+</node>
+<unnumberedsubsec>
+<title>unnumbered subsection2 3</title>
+
+</unnumberedsubsec>
+<node>
+<nodename>numbered sub2 3</nodename>
+<nodeprev automatic="on">unnumbered sub2 3</nodeprev>
+<nodeup automatic="on">unnumberedsec 3</nodeup>
+</node>
+<subsection>
+<title>numbered subsection2 3</title>
+
+</subsection>
+</unnumberedsec>
+<node>
+<nodename>section 3-1</nodename>
+<nodenext automatic="on">unnumberedsec 3-2</nodenext>
+<nodeprev automatic="on">unnumberedsec 3</nodeprev>
+<nodeup automatic="on">chapter 3</nodeup>
+</node>
+<section>
+<title>section 3-1</title>
+
+</section>
+<node>
+<nodename>unnumberedsec 3-2</nodename>
+<nodenext automatic="on">section 3-3</nodenext>
+<nodeprev automatic="on">section 3-1</nodeprev>
+<nodeup automatic="on">chapter 3</nodeup>
+</node>
+<unnumberedsec>
+<title>unnumberedsec 3-2</title>
+
+<menu>
+<menuentry><menunode>numbered sub 3-2</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>numbered sub 3-2</nodename>
+<nodeup automatic="on">unnumberedsec 3-2</nodeup>
+</node>
+<subsection>
+<title>numbered subsection 3-2</title>
+
+</subsection>
+</unnumberedsec>
+<node>
+<nodename>section 3-3</nodename>
+<nodenext automatic="on">unnumberedsec 3-4</nodenext>
+<nodeprev automatic="on">unnumberedsec 3-2</nodeprev>
+<nodeup automatic="on">chapter 3</nodeup>
+</node>
+<section>
+<title>section 3-3</title>
+
+<menu>
+<menuentry><menunode>subsection 3-3</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>subsection 3-3</nodename>
+<nodeup automatic="on">section 3-3</nodeup>
+</node>
+<subsection>
+<title>subsection 3-3</title>
+
+</subsection>
+</section>
+<node>
+<nodename>unnumberedsec 3-4</nodename>
+<nodeprev automatic="on">section 3-3</nodeprev>
+<nodeup automatic="on">chapter 3</nodeup>
+</node>
+<unnumberedsec>
+<title>unnumberedsec 3-4</title>
+
+<menu>
+<menuentry><menunode>numbered sub 3-4</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>numbered sub 3-4</nodename>
+<nodeup automatic="on">unnumberedsec 3-4</nodeup>
+</node>
+<subsection>
+<title>numbered subsection 3-4</title>
+
+</subsection>
+</unnumberedsec>
+</chapter>
+<node>
+<nodename>unnumbered 4</nodename>
+<nodeprev automatic="on">chapter 3</nodeprev>
+<nodeup automatic="on">Top</nodeup>
+</node>
+<unnumbered>
+<title>unnumbered 4</title>
+
+<menu>
+<menuentry><menunode>unnumberedsec 4</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>unnumberedsec 4</nodename>
+<nodeup automatic="on">unnumbered 4</nodeup>
+</node>
+<unnumberedsec>
+<title>unnumbered section 4</title>
+
+<menu>
+<menuentry><menunode>unnumbered sub 4</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>numbered sub
4</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>unnumbered sub2
4</menunode><menudescription>
+</menudescription></menuentry><menuentry><menunode>numbered sub2
4</menunode><menudescription>
+</menudescription></menuentry></menu>
+
+<node>
+<nodename>unnumbered sub 4</nodename>
+<nodenext automatic="on">numbered sub 4</nodenext>
+<nodeup automatic="on">unnumberedsec 4</nodeup>
+</node>
+<unnumberedsubsec>
+<title>unnumbered subsection 4</title>
+
+</unnumberedsubsec>
+<node>
+<nodename>numbered sub 4</nodename>
+<nodenext automatic="on">unnumbered sub2 4</nodenext>
+<nodeprev automatic="on">unnumbered sub 4</nodeprev>
+<nodeup automatic="on">unnumberedsec 4</nodeup>
+</node>
+<subsection>
+<title>numbered subsection 4</title>
+
+</subsection>
+<node>
+<nodename>unnumbered sub2 4</nodename>
+<nodenext automatic="on">numbered sub2 4</nodenext>
+<nodeprev automatic="on">numbered sub 4</nodeprev>
+<nodeup automatic="on">unnumberedsec 4</nodeup>
+</node>
+<unnumberedsubsec>
+<title>unnumbered subsection2 4</title>
+
+</unnumberedsubsec>
+<node>
+<nodename>numbered sub2 4</nodename>
+<nodeprev automatic="on">unnumbered sub2 4</nodeprev>
+<nodeup automatic="on">unnumberedsec 4</nodeup>
+</node>
+<subsection>
+<title>numbered subsection2 4</title>
+</subsection>
+</unnumberedsec>
+</unnumbered>
+';
+
1;
Index: t/results/sectioning/section_node_before_part.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_node_before_part.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/sectioning/section_node_before_part.pl 19 Aug 2011 23:09:46
-0000 1.7
+++ t/results/sectioning/section_node_before_part.pl 1 Sep 2011 22:00:31
-0000 1.8
@@ -355,4 +355,19 @@
];
+
+$result_converted{'xml'}->{'section_node_before_part'} = '
+<node>
+<nodename>Top</nodename>
+<nodeup automatic="on">(dir)</nodeup>
+</node>
+<section>
+<title>section</title>
+
+</section>
+<part>
+<title>part</title>
+</part>
+';
+
1;
Index: t/results/sectioning/two_unnumbered_no_argument.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/two_unnumbered_no_argument.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/two_unnumbered_no_argument.pl 27 Jul 2011 00:21:31
-0000 1.2
+++ t/results/sectioning/two_unnumbered_no_argument.pl 1 Sep 2011 22:00:31
-0000 1.3
@@ -210,4 +210,13 @@
];
+
+$result_converted{'xml'}->{'two_unnumbered_no_argument'} = '<unnumbered>
+<title></title>
+</unnumbered>
+<unnumbered>
+<title></title>
+</unnumbered>
+';
+
1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/XML.pm t/30sectionin...,
Patrice Dumas <=