[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/XML.pm t/results/sec...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/XML.pm t/results/sec... |
|
Date: |
Tue, 06 Sep 2011 20:32:42 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/06 20:32:41
Modified files:
tp/Texinfo/Convert: XML.pm
tp/t/results/sectioning: chapter_before_and_after_part.pl
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_section.pl
part_before_top.pl
part_chapter_after_top.pl
part_node_chapter_after_top.pl
section_before_chapter.pl
section_before_part.pl
section_before_top.pl
section_before_top_no_node.pl
section_chapter_before_top.pl
section_in_unnumbered_plaintext.pl
section_node_before_part.pl
sectioning_part_appendix.pl
top_part_chapter.pl
two_unnumbered_no_argument.pl
Log message:
XML: title -> sectiontitle, and no change of command for @subtitle and
@title.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_before_and_after_part.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_before_part.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_part.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_before_section.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_before_top.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_chapter.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_part.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top_no_node.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_chapter_before_top.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_node_before_part.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/sectioning_part_appendix.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/top_part_chapter.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/two_unnumbered_no_argument.pl?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Texinfo/Convert/XML.pm 6 Sep 2011 20:20:44 -0000 1.16
+++ Texinfo/Convert/XML.pm 6 Sep 2011 20:32:40 -0000 1.17
@@ -17,30 +17,12 @@
#
# Original author: Patrice Dumas <address@hidden>
-# msg Karl: <printindex value="cp"></printindex> instead of
<printindex>cp</printindex>
-# <xref> -> xref or pxref or ref
-# drop the See
-# @findex -> <findex><indexterm
index=\"${index_name}\">${formatted_entry_reference}</indexterm>
-# @fooindex -> <indexcommand command="fooindex"
index="foo"><indexterm
index=\"${index_name}\">${formatted_entry_reference}</indexterm>
-# @abbr do not becomes abbrev, but stays as abbr
-# menu comment -> menucomment
-# menu entry description -> menudescription (instead of menucomment)
+# msg Karl:
# preformatted -> pre
-# preamble added
# <tableterm command="item">
# 'command_as_argument' -> apply it? definfoenclosed? attribute
automatic=on?
# <ftable commandarg="asis"> or <itemize commandarg="bullet">
# in itemize <itemfunction> -> <itemprepend>?
-# no more <floatpos>
-# both inlineimage and image?
-# definfoenclose -> <infoenclose command=".." begin=".." end="..">...
-# settitle and title -> corresponding elements
-# title -> sectiontitle
-# def* ->
-# <defivar>
-# <definitionterm>
-# 'category', 'class' , 'type', 'name'
-# typearg, arg, delimiter 'param', 'paramtype', 'delimiter'
package Texinfo::Convert::XML;
@@ -154,12 +136,6 @@
$xml_accent_types{$accent} = $accent;
}
-
-my %xml_misc_elements_with_arg_map = (
- 'title' => 'booktitle',
- 'subtitle' => 'booksubtitle'
-);
-
my %misc_command_line_attributes = (
'setfilename' => 'file',
'documentencoding' => 'encoding',
@@ -509,12 +485,7 @@
$attribute .= "
index=\"$root->{'extra'}->{'index_entry'}->{'index_name'}\"";
return
"<$element${attribute}>".$self->_index_entry($root)."</$element>\n";
} elsif (exists($xml_misc_commands{$root->{'cmdname'}})) {
- my $command;
- if (exists ($xml_misc_elements_with_arg_map{$root->{'cmdname'}})) {
- $command = $xml_misc_elements_with_arg_map{$root->{'cmdname'}};
- } else {
- $command = $root->{'cmdname'};
- }
+ my $command = $root->{'cmdname'};
my $type = $xml_misc_commands{$root->{'cmdname'}};
if ($type eq 'text') {
return '' if ($root->{'cmdname'} eq 'end');
@@ -584,7 +555,7 @@
} else {
$end_line = "";
}
- $result .= "<title>$arg</title>$end_line"
+ $result .= "<sectiontitle>$arg</sectiontitle>$end_line"
}
} else {
my $attribute = '';
Index: t/results/sectioning/chapter_before_and_after_part.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_before_and_after_part.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/chapter_before_and_after_part.pl 31 Aug 2011
22:54:52 -0000 1.9
+++ t/results/sectioning/chapter_before_and_after_part.pl 6 Sep 2011
20:32:40 -0000 1.10
@@ -333,14 +333,14 @@
$result_converted{'xml'}->{'chapter_before_and_after_part'} = '<chapter>
-<title>chapter</title>
+<sectiontitle>chapter</sectiontitle>
</chapter>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<chapter>
-<title>chapter 2</title>
+<sectiontitle>chapter 2</sectiontitle>
</chapter>
</part>
';
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/chapter_before_part.pl 1 Sep 2011 22:00:27 -0000
1.3
+++ t/results/sectioning/chapter_before_part.pl 6 Sep 2011 20:32:40 -0000
1.4
@@ -309,11 +309,11 @@
$result_converted{'xml'}->{'chapter_before_part'} = '<chapter>
-<title>chapter</title>
+<sectiontitle>chapter</sectiontitle>
</chapter>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
</part>
';
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/sectioning/chapter_node_before_and_after_part.pl 4 Sep 2011
10:00:00 -0000 1.15
+++ t/results/sectioning/chapter_node_before_and_after_part.pl 6 Sep 2011
20:32:40 -0000 1.16
@@ -791,7 +791,7 @@
<nodeup automatic="on">(dir)</nodeup>
</node>
<chapter>
-<title>chapter</title>
+<sectiontitle>chapter</sectiontitle>
<menu>
<menuentry><menunode>after</menunode><menudescription>
@@ -799,7 +799,7 @@
</chapter>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<node name="after">
<nodename>after</nodename>
@@ -807,7 +807,7 @@
<nodeup automatic="on">Top</nodeup>
</node>
<chapter>
-<title>chapter 2</title>
+<sectiontitle>chapter 2</sectiontitle>
<contents></contents>
</chapter>
Index: t/results/sectioning/double_part.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_part.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/sectioning/double_part.pl 4 Sep 2011 10:00:00 -0000 1.10
+++ t/results/sectioning/double_part.pl 6 Sep 2011 20:32:40 -0000 1.11
@@ -994,7 +994,7 @@
<nodeup automatic="on">(dir)</nodeup>
</node>
<top>
-<title>top</title>
+<sectiontitle>top</sectiontitle>
<menu>
<menuentry><menunode>node chapter</menunode><menudescription>
@@ -1002,12 +1002,12 @@
</top>
<part>
-<title>part first</title>
+<sectiontitle>part first</sectiontitle>
<para>Text part first.
</para></part>
<part>
-<title>part second</title>
+<sectiontitle>part second</sectiontitle>
<para>Text part second.
</para>
<node name="node-chapter">
@@ -1016,7 +1016,7 @@
<nodeup automatic="on">Top</nodeup>
</node>
<chapter>
-<title>chapter after 2 parts</title>
+<sectiontitle>chapter after 2 parts</sectiontitle>
</chapter>
</part>
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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/sectioning/node_part_chapter_after_chapter.pl 4 Sep 2011
10:00:00 -0000 1.16
+++ t/results/sectioning/node_part_chapter_after_chapter.pl 6 Sep 2011
20:32:40 -0000 1.17
@@ -1263,7 +1263,7 @@
<nodeup automatic="on">(dir)</nodeup>
</node>
<top>
-<title>top</title>
+<sectiontitle>top</sectiontitle>
<menu>
<menuentry><menunode>chapter node</menunode><menudescription>
@@ -1279,7 +1279,7 @@
</node>
<chapter>
-<title>chapter node</title>
+<sectiontitle>chapter node</sectiontitle>
</chapter>
<node name="part-chapter-node">
@@ -1288,10 +1288,10 @@
<nodeup automatic="on">Top</nodeup>
</node>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<chapter>
-<title>chapter with part node</title>
+<sectiontitle>chapter with part node</sectiontitle>
<contents></contents>
</chapter>
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/node_part_chapter_after_top.pl 6 Sep 2011 20:20:48
-0000 1.9
+++ t/results/sectioning/node_part_chapter_after_top.pl 6 Sep 2011 20:32:40
-0000 1.10
@@ -861,7 +861,7 @@
<nodeup automatic="on">(dir)</nodeup>
</node>
<top>
-<title>top</title>
+<sectiontitle>top</sectiontitle>
<menu>
<menuentry><menunode>chapter node</menunode><menudescription>
@@ -874,10 +874,10 @@
<nodeup automatic="on">Top</nodeup>
</node>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<chapter>
-<title>chapter </title>
+<sectiontitle>chapter </sectiontitle>
</chapter>
</part>
';
Index: t/results/sectioning/part_before_section.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_before_section.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/sectioning/part_before_section.pl 6 Sep 2011 20:20:48 -0000
1.10
+++ t/results/sectioning/part_before_section.pl 6 Sep 2011 20:32:40 -0000
1.11
@@ -226,10 +226,10 @@
$result_converted{'xml'}->{'part_before_section'} = '<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<chapter originalcommand="section">
-<title>section </title>
+<sectiontitle>section </sectiontitle>
</chapter>
</part>
';
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/part_before_top.pl 1 Sep 2011 22:00:30 -0000
1.3
+++ t/results/sectioning/part_before_top.pl 6 Sep 2011 20:32:40 -0000
1.4
@@ -310,11 +310,11 @@
$result_converted{'xml'}->{'part_before_top'} = '<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
</part>
<top>
-<title>top</title>
+<sectiontitle>top</sectiontitle>
</top>
';
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/part_chapter_after_top.pl 6 Sep 2011 20:20:48
-0000 1.9
+++ t/results/sectioning/part_chapter_after_top.pl 6 Sep 2011 20:32:41
-0000 1.10
@@ -861,7 +861,7 @@
<nodeup automatic="on">(dir)</nodeup>
</node>
<top>
-<title>top</title>
+<sectiontitle>top</sectiontitle>
<menu>
<menuentry><menunode>chapter</menunode><menudescription>
@@ -869,7 +869,7 @@
</top>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<node name="chapter">
<nodename>chapter</nodename>
@@ -877,7 +877,7 @@
<nodeup automatic="on">Top</nodeup>
</node>
<chapter>
-<title>chapter </title>
+<sectiontitle>chapter </sectiontitle>
</chapter>
</part>
';
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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/sectioning/part_node_chapter_after_top.pl 6 Sep 2011 20:20:48
-0000 1.17
+++ t/results/sectioning/part_node_chapter_after_top.pl 6 Sep 2011 20:32:41
-0000 1.18
@@ -1135,7 +1135,7 @@
<nodeup automatic="on">(dir)</nodeup>
</node>
<top>
-<title>top</title>
+<sectiontitle>top</sectiontitle>
<menu>
<menuentry><menunode>a node after part</menunode><menudescription>
@@ -1144,7 +1144,7 @@
</top>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<node name="a-node-after-part">
<nodename>a node after part</nodename>
@@ -1160,7 +1160,7 @@
<nodeup automatic="on">Top</nodeup>
</node>
<chapter>
-<title>chapter </title>
+<sectiontitle>chapter </sectiontitle>
</chapter>
</part>
';
Index: t/results/sectioning/section_before_chapter.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_before_chapter.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/section_before_chapter.pl 6 Sep 2011 20:20:48
-0000 1.8
+++ t/results/sectioning/section_before_chapter.pl 6 Sep 2011 20:32:41
-0000 1.9
@@ -179,11 +179,11 @@
$result_converted{'xml'}->{'section_before_chapter'} = '<section>
-<title>section </title>
+<sectiontitle>section </sectiontitle>
</section>
<section originalcommand="chapter">
-<title>chapter</title>
+<sectiontitle>chapter</sectiontitle>
</section>
';
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/section_before_part.pl 6 Sep 2011 20:20:49 -0000
1.9
+++ t/results/sectioning/section_before_part.pl 6 Sep 2011 20:32:41 -0000
1.10
@@ -269,11 +269,11 @@
$result_converted{'xml'}->{'section_before_part'} = '<section>
-<title>section </title>
+<sectiontitle>section </sectiontitle>
</section>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<contents></contents>
</part>
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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/section_before_top.pl 6 Sep 2011 20:20:49 -0000
1.14
+++ t/results/sectioning/section_before_top.pl 6 Sep 2011 20:32:41 -0000
1.15
@@ -676,7 +676,7 @@
<nodeup>Top</nodeup>
</node>
<section>
-<title>section </title>
+<sectiontitle>section </sectiontitle>
</section>
<node name="Top">
@@ -685,7 +685,7 @@
<nodeup automatic="on">(dir)</nodeup>
</node>
<unnumberedsec originalcommand="top">
-<title>top</title>
+<sectiontitle>top</sectiontitle>
<menu>
<menuentry><menunode>section node</menunode><menudescription>
Index: t/results/sectioning/section_before_top_no_node.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_before_top_no_node.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/section_before_top_no_node.pl 6 Sep 2011 20:20:49
-0000 1.8
+++ t/results/sectioning/section_before_top_no_node.pl 6 Sep 2011 20:32:41
-0000 1.9
@@ -177,11 +177,11 @@
$result_converted{'xml'}->{'section_before_top_no_node'} = '<section>
-<title>section </title>
+<sectiontitle>section </sectiontitle>
</section>
<unnumberedsec originalcommand="top">
-<title>top</title>
+<sectiontitle>top</sectiontitle>
</unnumberedsec>
';
Index: t/results/sectioning/section_chapter_before_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_chapter_before_top.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/section_chapter_before_top.pl 6 Sep 2011 20:20:49
-0000 1.8
+++ t/results/sectioning/section_chapter_before_top.pl 6 Sep 2011 20:32:41
-0000 1.9
@@ -261,15 +261,15 @@
$result_converted{'xml'}->{'section_chapter_before_top'} = '<section>
-<title>section </title>
+<sectiontitle>section </sectiontitle>
</section>
<section originalcommand="chapter">
-<title>chapter</title>
+<sectiontitle>chapter</sectiontitle>
</section>
<unnumberedsec originalcommand="top">
-<title>top</title>
+<sectiontitle>top</sectiontitle>
</unnumberedsec>
';
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/sectioning/section_in_unnumbered_plaintext.pl 4 Sep 2011
10:00:00 -0000 1.15
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl 6 Sep 2011
20:32:41 -0000 1.16
@@ -9471,7 +9471,7 @@
<nodeup automatic="on">(dir)</nodeup>
</node>
<top>
-<title>Test section in unnumbered</title>
+<sectiontitle>Test section in unnumbered</sectiontitle>
<contents></contents>
@@ -9493,7 +9493,7 @@
<nodeup automatic="on">Top</nodeup>
</node>
<chapter>
-<title>chapter</title>
+<sectiontitle>chapter</sectiontitle>
<menu>
<menuentry><menunode>section in chapter</menunode><menudescription>
@@ -9504,7 +9504,7 @@
<nodeup automatic="on">chapter</nodeup>
</node>
<section>
-<title>section in chapter</title>
+<sectiontitle>section in chapter</sectiontitle>
</section>
</chapter>
@@ -9515,7 +9515,7 @@
<nodeup automatic="on">Top</nodeup>
</node>
<unnumbered>
-<title>unnumbered</title>
+<sectiontitle>unnumbered</sectiontitle>
<menu>
<menuentry><menunode>section in unnumbered</menunode><menudescription>
@@ -9526,7 +9526,7 @@
<nodeup automatic="on">unnumbered</nodeup>
</node>
<section>
-<title>section in unnumbered</title>
+<sectiontitle>section in unnumbered</sectiontitle>
</section>
</unnumbered>
@@ -9537,7 +9537,7 @@
<nodeup automatic="on">Top</nodeup>
</node>
<chapter>
-<title>chapter 2</title>
+<sectiontitle>chapter 2</sectiontitle>
<menu>
<menuentry><menunode>unnumberedsec 2</menunode><menudescription>
@@ -9550,7 +9550,7 @@
<nodeup automatic="on">chapter 2</nodeup>
</node>
<unnumberedsec>
-<title>unnumbered section 2</title>
+<sectiontitle>unnumbered section 2</sectiontitle>
<menu>
<menuentry><menunode>unnumbered sub 2</menunode><menudescription>
@@ -9565,7 +9565,7 @@
<nodeup automatic="on">unnumberedsec 2</nodeup>
</node>
<unnumberedsubsec>
-<title>unnumbered subsection 2</title>
+<sectiontitle>unnumbered subsection 2</sectiontitle>
</unnumberedsubsec>
<node name="numbered-sub-2">
@@ -9575,7 +9575,7 @@
<nodeup automatic="on">unnumberedsec 2</nodeup>
</node>
<subsection>
-<title>numbered subsection 2</title>
+<sectiontitle>numbered subsection 2</sectiontitle>
</subsection>
<node name="unnumbered-sub2-2">
@@ -9585,7 +9585,7 @@
<nodeup automatic="on">unnumberedsec 2</nodeup>
</node>
<unnumberedsubsec>
-<title>unnumbered subsection2 2</title>
+<sectiontitle>unnumbered subsection2 2</sectiontitle>
</unnumberedsubsec>
<node name="numbered-sub2-2">
@@ -9594,7 +9594,7 @@
<nodeup automatic="on">unnumberedsec 2</nodeup>
</node>
<subsection>
-<title>numbered subsection2 2</title>
+<sectiontitle>numbered subsection2 2</sectiontitle>
</subsection>
</unnumberedsec>
@@ -9604,7 +9604,7 @@
<nodeup automatic="on">chapter 2</nodeup>
</node>
<unnumberedsec>
-<title>unnumberedsec 2-1</title>
+<sectiontitle>unnumberedsec 2-1</sectiontitle>
<menu>
<menuentry><menunode>numbered sub 2-1</menunode><menudescription>
@@ -9615,7 +9615,7 @@
<nodeup automatic="on">unnumberedsec 2-1</nodeup>
</node>
<subsection>
-<title>numbered subsection 2-1</title>
+<sectiontitle>numbered subsection 2-1</sectiontitle>
</subsection>
@@ -9628,7 +9628,7 @@
<nodeup automatic="on">Top</nodeup>
</node>
<chapter>
-<title>chapter 3</title>
+<sectiontitle>chapter 3</sectiontitle>
<menu>
<menuentry><menunode>unnumberedsec 3</menunode><menudescription>
@@ -9644,7 +9644,7 @@
<nodeup automatic="on">chapter 3</nodeup>
</node>
<unnumberedsec>
-<title>unnumbered section 3</title>
+<sectiontitle>unnumbered section 3</sectiontitle>
<menu>
<menuentry><menunode>unnumbered sub 3</menunode><menudescription>
@@ -9659,7 +9659,7 @@
<nodeup automatic="on">unnumberedsec 3</nodeup>
</node>
<unnumberedsubsec>
-<title>unnumbered subsection 3</title>
+<sectiontitle>unnumbered subsection 3</sectiontitle>
</unnumberedsubsec>
<node name="numbered-sub-3">
@@ -9669,7 +9669,7 @@
<nodeup automatic="on">unnumberedsec 3</nodeup>
</node>
<subsection>
-<title>numbered subsection 3</title>
+<sectiontitle>numbered subsection 3</sectiontitle>
</subsection>
<node name="unnumbered-sub2-3">
@@ -9679,7 +9679,7 @@
<nodeup automatic="on">unnumberedsec 3</nodeup>
</node>
<unnumberedsubsec>
-<title>unnumbered subsection2 3</title>
+<sectiontitle>unnumbered subsection2 3</sectiontitle>
</unnumberedsubsec>
<node name="numbered-sub2-3">
@@ -9688,7 +9688,7 @@
<nodeup automatic="on">unnumberedsec 3</nodeup>
</node>
<subsection>
-<title>numbered subsection2 3</title>
+<sectiontitle>numbered subsection2 3</sectiontitle>
</subsection>
</unnumberedsec>
@@ -9699,7 +9699,7 @@
<nodeup automatic="on">chapter 3</nodeup>
</node>
<section>
-<title>section 3-1</title>
+<sectiontitle>section 3-1</sectiontitle>
</section>
<node name="unnumberedsec-3_002d2">
@@ -9709,7 +9709,7 @@
<nodeup automatic="on">chapter 3</nodeup>
</node>
<unnumberedsec>
-<title>unnumberedsec 3-2</title>
+<sectiontitle>unnumberedsec 3-2</sectiontitle>
<menu>
<menuentry><menunode>numbered sub 3-2</menunode><menudescription>
@@ -9720,7 +9720,7 @@
<nodeup automatic="on">unnumberedsec 3-2</nodeup>
</node>
<subsection>
-<title>numbered subsection 3-2</title>
+<sectiontitle>numbered subsection 3-2</sectiontitle>
</subsection>
</unnumberedsec>
@@ -9731,7 +9731,7 @@
<nodeup automatic="on">chapter 3</nodeup>
</node>
<section>
-<title>section 3-3</title>
+<sectiontitle>section 3-3</sectiontitle>
<menu>
<menuentry><menunode>subsection 3-3</menunode><menudescription>
@@ -9742,7 +9742,7 @@
<nodeup automatic="on">section 3-3</nodeup>
</node>
<subsection>
-<title>subsection 3-3</title>
+<sectiontitle>subsection 3-3</sectiontitle>
</subsection>
</section>
@@ -9752,7 +9752,7 @@
<nodeup automatic="on">chapter 3</nodeup>
</node>
<unnumberedsec>
-<title>unnumberedsec 3-4</title>
+<sectiontitle>unnumberedsec 3-4</sectiontitle>
<menu>
<menuentry><menunode>numbered sub 3-4</menunode><menudescription>
@@ -9763,7 +9763,7 @@
<nodeup automatic="on">unnumberedsec 3-4</nodeup>
</node>
<subsection>
-<title>numbered subsection 3-4</title>
+<sectiontitle>numbered subsection 3-4</sectiontitle>
</subsection>
</unnumberedsec>
@@ -9774,7 +9774,7 @@
<nodeup automatic="on">Top</nodeup>
</node>
<unnumbered>
-<title>unnumbered 4</title>
+<sectiontitle>unnumbered 4</sectiontitle>
<menu>
<menuentry><menunode>unnumberedsec 4</menunode><menudescription>
@@ -9785,7 +9785,7 @@
<nodeup automatic="on">unnumbered 4</nodeup>
</node>
<unnumberedsec>
-<title>unnumbered section 4</title>
+<sectiontitle>unnumbered section 4</sectiontitle>
<menu>
<menuentry><menunode>unnumbered sub 4</menunode><menudescription>
@@ -9800,7 +9800,7 @@
<nodeup automatic="on">unnumberedsec 4</nodeup>
</node>
<unnumberedsubsec>
-<title>unnumbered subsection 4</title>
+<sectiontitle>unnumbered subsection 4</sectiontitle>
</unnumberedsubsec>
<node name="numbered-sub-4">
@@ -9810,7 +9810,7 @@
<nodeup automatic="on">unnumberedsec 4</nodeup>
</node>
<subsection>
-<title>numbered subsection 4</title>
+<sectiontitle>numbered subsection 4</sectiontitle>
</subsection>
<node name="unnumbered-sub2-4">
@@ -9820,7 +9820,7 @@
<nodeup automatic="on">unnumberedsec 4</nodeup>
</node>
<unnumberedsubsec>
-<title>unnumbered subsection2 4</title>
+<sectiontitle>unnumbered subsection2 4</sectiontitle>
</unnumberedsubsec>
<node name="numbered-sub2-4">
@@ -9829,7 +9829,7 @@
<nodeup automatic="on">unnumberedsec 4</nodeup>
</node>
<subsection>
-<title>numbered subsection2 4</title>
+<sectiontitle>numbered subsection2 4</sectiontitle>
</subsection>
</unnumberedsec>
</unnumbered>
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/sectioning/section_node_before_part.pl 6 Sep 2011 20:20:49
-0000 1.10
+++ t/results/sectioning/section_node_before_part.pl 6 Sep 2011 20:32:41
-0000 1.11
@@ -362,11 +362,11 @@
<nodeup automatic="on">(dir)</nodeup>
</node>
<section>
-<title>section </title>
+<sectiontitle>section </sectiontitle>
</section>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
</part>
';
Index: t/results/sectioning/sectioning_part_appendix.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/sectioning_part_appendix.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/sectioning_part_appendix.pl 31 Aug 2011 22:54:52
-0000 1.2
+++ t/results/sectioning/sectioning_part_appendix.pl 6 Sep 2011 20:32:41
-0000 1.3
@@ -836,45 +836,45 @@
$result_converted{'xml'}->{'sectioning_part_appendix'} = '<top>
-<title>top</title>
+<sectiontitle>top</sectiontitle>
</top>
<chapter>
-<title>chapter</title>
+<sectiontitle>chapter</sectiontitle>
<section>
-<title>section</title>
+<sectiontitle>section</sectiontitle>
<subsection>
-<title>subsection</title>
+<sectiontitle>subsection</sectiontitle>
<subsubsection>
-<title>subsubsection</title>
+<sectiontitle>subsubsection</sectiontitle>
</subsubsection>
</subsection>
</section>
</chapter>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<chapter>
-<title>chapter in part</title>
+<sectiontitle>chapter in part</sectiontitle>
</chapter>
<chapter>
-<title>second chapter in part</title>
+<sectiontitle>second chapter in part</sectiontitle>
</chapter>
<unnumbered>
-<title>unnumbered</title>
+<sectiontitle>unnumbered</sectiontitle>
</unnumbered>
<appendix>
-<title>appendix</title>
+<sectiontitle>appendix</sectiontitle>
<appendixsec>
-<title>appendixsec</title>
+<sectiontitle>appendixsec</sectiontitle>
</appendixsec>
</appendix>
</part>
Index: t/results/sectioning/top_part_chapter.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/top_part_chapter.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/sectioning/top_part_chapter.pl 6 Sep 2011 20:20:49 -0000
1.4
+++ t/results/sectioning/top_part_chapter.pl 6 Sep 2011 20:32:41 -0000
1.5
@@ -335,14 +335,14 @@
$result_converted{'xml'}->{'top_part_chapter'} = '<top>
-<title>top</title>
+<sectiontitle>top</sectiontitle>
</top>
<part>
-<title>part</title>
+<sectiontitle>part</sectiontitle>
<chapter>
-<title>chapter </title>
+<sectiontitle>chapter </sectiontitle>
</chapter>
</part>
';
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/two_unnumbered_no_argument.pl 1 Sep 2011 22:00:31
-0000 1.3
+++ t/results/sectioning/two_unnumbered_no_argument.pl 6 Sep 2011 20:32:41
-0000 1.4
@@ -212,10 +212,10 @@
$result_converted{'xml'}->{'two_unnumbered_no_argument'} = '<unnumbered>
-<title></title>
+<sectiontitle></sectiontitle>
</unnumbered>
<unnumbered>
-<title></title>
+<sectiontitle></sectiontitle>
</unnumbered>
';