[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: |
Sun, 04 Sep 2011 10:00:00 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/04 10:00:00
Modified files:
tp/Texinfo/Convert: XML.pm
tp/t/results/sectioning: chapter_node_before_and_after_part.pl
double_part.pl
node_part_chapter_after_chapter.pl
node_part_chapter_after_top.pl
part_chapter_after_top.pl
part_node_chapter_after_top.pl
section_before_top.pl
section_in_unnumbered_plaintext.pl
section_node_before_part.pl
Log message:
Handle @verb and @def* and @verbatim.
Add name for commands with labels, type for float.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_part.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_node_before_part.pl?cvsroot=texinfo&r1=1.8&r2=1.9
Patches:
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Texinfo/Convert/XML.pm 3 Sep 2011 23:54:34 -0000 1.13
+++ Texinfo/Convert/XML.pm 4 Sep 2011 09:59:59 -0000 1.14
@@ -21,17 +21,26 @@
# <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)
# preformatted -> pre
# preamble added
# <tableterm command="item">
-# 'command_as_argument' -> apply it?
+# '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;
@@ -169,7 +178,8 @@
my %xml_misc_commands = %Texinfo::Common::misc_commands;
-foreach my $command ('item', 'headitem', 'itemx', 'tab') {
+foreach my $command ('item', 'headitem', 'itemx', 'tab',
+ keys %Texinfo::Common::def_commands) {
delete $xml_misc_commands{$command};
}
@@ -196,7 +206,7 @@
'image' => ['imagefile', 'imagewidth', 'imageheight',
'alttext', 'imageextension'],
'quotation' => ['quotationtype'],
- 'float' => ['floatname', 'floattype'],
+ 'float' => ['floattype', 'floatname'],
'itemize' => ['itemfunction'],
);
@@ -220,6 +230,18 @@
}
}
+my %defcommand_name_type = (
+ 'deffn' => 'function',
+ 'defvr' => 'variable',
+ 'deftypefn' => 'function',
+ 'deftypeop' => 'operation',
+ 'deftypevr' => 'variable',
+ 'defcv' => 'classvar',
+ 'deftypecv' => 'classvar',
+ 'defop' => 'operation',
+ 'deftp' => 'datatype',
+);
+
my %ignored_types;
foreach my $type ('empty_line_after_command',
'empty_spaces_after_command', 'spaces_at_end',
@@ -247,6 +269,7 @@
'row' => 'row',
'multitable_head' => 'thead',
'multitable_body' => 'tbody',
+ 'def_item' => 'definitionitem',
);
my %context_block_commands = (
@@ -440,7 +463,6 @@
# } elsif ($root->{'cmdname'} eq 'item' and
} elsif ($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx'
or $root->{'cmdname'} eq 'headitem' or $root->{'cmdname'} eq
'tab') {
- # TODO
if ($root->{'cmdname'} eq 'item'
and $root->{'parent'}->{'cmdname'}
and ($root->{'parent'}->{'cmdname'} eq 'itemize'
@@ -480,7 +502,8 @@
or $root->{'cmdname'} eq 'tab')
and $root->{'parent'}->{'type'}
and $root->{'parent'}->{'type'} eq 'row') {
- print STDERR "HHH ".Texinfo::Parser::_print_current($root);
+ print STDERR "BUG: multitable cell command not in a row "
+ .Texinfo::Parser::_print_current($root);
}
$result .= "<entry command=\"$root->{'cmdname'}\">";
@@ -507,7 +530,7 @@
."</$command>\n"
} elsif ($type eq 'line') {
if ($root->{'cmdname'} eq 'node') {
- $result .= "<node>\n";
+ $result .= "<node name=\"$root->{'extra'}->{'normalized'}\">\n";
$self->{'document_context'}->[-1]->{'code'}++;
$result .= "<nodename>".
$self->_convert({'contents' =>
$root->{'extra'}->{'node_content'}})
@@ -557,10 +580,11 @@
if ($root->{'cmdname'} eq 'listoffloats' and $root->{'extra'}
and $root->{'extra'}->{'type'}
and defined($root->{'extra'}->{'type'}->{'normalized'})) {
- $attribute = "
type=\"$root->{'extra'}->{'type'}->{'normalized'}\n";
+ $attribute = "
type=\"$root->{'extra'}->{'type'}->{'normalized'}\"";
}
- return "<$command${attribute}>".$self->_convert($root->{'args'}->[0])
- ."</$command>\n";
+ my $arg = $self->_convert($root->{'args'}->[0]);
+ #chomp ($arg);
+ return "<$command${attribute}>$arg</$command>\n";
}
} elsif ($type eq 'skipline' or $type eq 'noarg') {
return "<$command></$command>\n";
@@ -623,6 +647,19 @@
}
return "<$command${attribute}></$command>\n";
}
+ } elsif ($root->{'type'}
+ and $root->{'type'} eq 'definfoenclose_command') {
+ my $in_code;
+ $in_code = 1
+ if (defined($commands_args_style{$root->{'cmdname'}})
+ and defined($commands_args_style{$root->{'cmdname'}}->[0]));
+ $self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
+ my $arg = $self->_convert($root->{'args'}->[0]);
+ $result .= "<infoenclose command=\"$root->{'cmdname'}\" begin=\"".
+ $self->xml_protect_text($root->{'extra'}->{'begin'})."\" end=\"".
+ $self->xml_protect_text($root->{'extra'}->{'end'})
+ ."\">$arg</infoenclose>";
+ $self->{'document_context'}->[-1]->{'code'}-- if ($in_code);
} elsif ($root->{'args'}
and exists($Texinfo::Common::brace_commands{$root->{'cmdname'}}))
{
if ($Texinfo::Common::context_brace_commands{$root->{'cmdname'}}) {
@@ -633,6 +670,13 @@
if (scalar(@elements) > 1) {
$command = shift @elements;
}
+ my $attribute = '';
+ if ($root->{'cmdname'} eq 'verb') {
+ $attribute = " delimiter=\"".$self->xml_protect_text($root->{'type'})
+ ."\"";
+ } elsif ($root->{'cmdname'} eq 'anchor') {
+ $attribute = " name=\"$root->{'extra'}->{'normalized'}\"";
+ }
my $arg_index = 0;
foreach my $element (@elements) {
if (defined($root->{'args'}->[$arg_index])) {
@@ -642,8 +686,9 @@
and
defined($commands_args_style{$root->{'cmdname'}}->[$arg_index]));
$self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
my $arg = $self->_convert($root->{'args'}->[$arg_index]);
- if ($arg ne '') {
- $result .= "<$element>$arg</$element>";
+ if (!defined($command) or $arg ne '') {
+ # ${attribute} is only set for @verb
+ $result .= "<$element${attribute}>$arg</$element>";
}
$self->{'document_context'}->[-1]->{'code'}-- if ($in_code);
} else {
@@ -651,7 +696,7 @@
}
$arg_index++;
}
- if (defined($command) and $result ne '') {
+ if (defined($command)) {
$result = "<$command>$result<$command>";
}
if ($Texinfo::Common::context_brace_commands{$root->{'cmdname'}}) {
@@ -670,6 +715,16 @@
$attribute .= " first=\""
.$self->xml_protect_text($root->{'extra'}->{'enumerate_specification'})
."\"";
+ } elsif ($root->{'cmdname'} eq 'float' and $root->{'extra'}) {
+ if (defined($root->{'extra'}->{'normalized'})) {
+ $attribute .= " name=\"$root->{'extra'}->{'normalized'}\"";
+ }
+ if ($root->{'extra'}->{'type'} and
+ defined($root->{'extra'}->{'type'}->{'normalized'})) {
+ $attribute .= " type=\"$root->{'extra'}->{'type'}->{'normalized'}\"";
+ }
+ } elsif ($root->{'cmdname'} eq 'verbatim') {
+ $attribute = " xml:space=\"preserve\"";
}
$result .= "<$root->{'cmdname'}${attribute}>";
if ($root->{'args'}) {
@@ -695,10 +750,12 @@
}
} elsif ($root->{'cmdname'} eq 'multitable' and $root->{'extra'}) {
if ($root->{'extra'}->{'prototypes'}) {
+ $result .= "<columnprototypes>";
foreach my $prototype (@{$root->{'extra'}->{'prototypes'}}) {
$result .= "<columnprototype>".$self->_convert($prototype)
."</columnprototype>";
}
+ $result .= "</columnprototypes>";
} elsif ($root->{'extra'}->{'columnfractions'}) {
$result .= "<columnfractions>";
foreach my $fraction (@{$root->{'extra'}->{'columnfractions'}}) {
@@ -713,39 +770,61 @@
$close_element = $root->{'cmdname'};
}
}
- #} elsif ($root->{'cmdname'} eq 'item'
- # and $root->{'parent'}->{'cmdname'}
- # and $root->{'parent'}->{'cmdname'} eq 'enumerate') {
- # $result .= enumerate_item_representation(
- # $root->{'parent'}->{'extra'}->{'enumerate_specification'},
- # $root->{'extra'}->{'item_number'}) . '. ';
- #}
- #}
- #if ($root->{'type'} and $root->{'type'} eq 'def_line') {
- #print STDERR "$root->{'extra'}->{'def_command'}\n";
- # if ($root->{'extra'} and $root->{'extra'}->{'def_args'}
- # and @{$root->{'extra'}->{'def_args'}}) {
- # my $parsed_definition_category
- # = Texinfo::Common::definition_category ($options->{'converter'},
$root);
- # my @contents = ($parsed_definition_category, {'text' => ': '});
- # if ($root->{'extra'}->{'def_parsed_hash'}->{'type'}) {
- # push @contents, ($root->{'extra'}->{'def_parsed_hash'}->{'type'},
- # {'text' => ' '});
- # }
- # push @contents, $root->{'extra'}->{'def_parsed_hash'}->{'name'};
-#
- # my $arguments = Texinfo::Common::definition_arguments_content($root);
- # if ($arguments) {
- # push @contents, {'text' => ' '};
- # push @contents, @$arguments;
- # }
- # push @contents, {'text' => "\n"};
- # $result = convert({'contents' => address@hidden,
_code_options($options));
- # }
if ($root->{'type'}) {
if (defined($type_elements{$root->{'type'}})) {
$result .= "<$type_elements{$root->{'type'}}>";
}
+ if ($root->{'type'} eq 'def_line') {
+ if ($root->{'cmdname'}) {
+ $result .= "<$root->{'cmdname'}>";
+ }
+ $result .= "<definitionterm>";
+ $result .= $self->_index_entry($root);
+ $self->{'document_context'}->[-1]->{'code'}++;
+ if ($root->{'extra'} and $root->{'extra'}->{'def_args'}) {
+ my $main_command;
+ my $alias;
+ if ($Texinfo::Common::def_aliases{$root->{'extra'}->{'def_command'}}) {
+ $main_command =
$Texinfo::Common::def_aliases{$root->{'extra'}->{'def_command'}};
+ $alias = 1;
+ } else {
+ $main_command = $root->{'extra'}->{'def_command'};
+ $alias = 0;
+ }
+ foreach my $arg (@{$root->{'extra'}->{'def_args'}}) {
+ my $type = $arg->[0];
+ my $content = $self->_convert($arg->[1]);
+ if ($type eq 'spaces') {
+ $result .= $content;
+ } else {
+ my $attribute;
+ if ($type eq 'category' and $alias) {
+ $attribute = " automatic=\"on\"";
+ } else {
+ $attribute = "";
+ }
+ my $element;
+ if ($type eq 'name') {
+ $element = $defcommand_name_type{$main_command};
+ } elsif ($type eq 'arg') {
+ $element = 'param';
+ } elsif ($type eq 'argtype') {
+ $element = 'paramtype';
+ } else {
+ $element = $type;
+ }
+ $result .= "<def$element${attribute}>$content</def$element>";
+ }
+ }
+ }
+ $self->{'document_context'}->[-1]->{'code'}--;
+ $result .= "</definitionterm>";
+ if ($root->{'cmdname'}) {
+ $result .= "</$root->{'cmdname'}>";
+ }
+ chomp ($result);
+ $result .= "\n";
+ }
}
if ($root->{'contents'}) {
my $in_code;
@@ -818,32 +897,10 @@
#set_default('NUMBER_SECTIONS', 0);
-#special -> args -> {type 'misc_arg' , text }
-
-# anchor, node and float -> add a name="->normalized" attribute
-# float
-# my $result = "<float name=\"$label_texi\">\n";
-
-# return '<verbatim xml:space="preserve">' . &$protect_text($text) .
'</verbatim>';
-
# $complex_format_map{$complex_format}->{'begin'} = "<$complex_format
xml:space=\"preserve\">";
# $complex_format_map{$complex_format}->{'end'} = "</$complex_format>";
# my $tag = 'inlineimage';
# $tag = 'image' if ($preformatted or !$in_paragraph);
-# return "<$tag width=\"$width\" height=\"$height\" name=\"".
&$protect_text($base)."\"
extension=\"$extension\"><alttext>$alt</alttext></$tag>";
-
-#%def_format_xml = (
-# 'deffn' => [ ['category', 'category'], ['function', 'name'] ],
-# 'defvr' => [ ['category', 'category'], ['variable', 'name'] ],
-# 'deftypefn' => [ ['category', 'category'], ['type', 'type'], ['function',
'name'] ],
-# 'deftypeop' => [ ['category', 'category'], ['type', 'type'], ['operation',
'name'] ],
-# 'deftypevr' => [ ['category', 'category'], ['type', 'type'], ['variable',
'name'] ],
-# 'defcv' => [ ['category' , 'category'], ['class', 'class'], ['classvar',
'name'] ],
-# 'deftypecv' => [ ['category', 'category'], ['type', 'type'], ['classvar',
'name'] ],
-# 'defop' => [ ['category', 'category'], ['class', 'class'], ['operation',
'name'] ],
-# 'deftp' => [ ['category', 'category'], ['datatype', 'name'] ]
-#);
-
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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/chapter_node_before_and_after_part.pl 1 Sep 2011
22:00:28 -0000 1.14
+++ t/results/sectioning/chapter_node_before_and_after_part.pl 4 Sep 2011
10:00:00 -0000 1.15
@@ -785,7 +785,7 @@
$result_converted{'xml'}->{'chapter_node_before_and_after_part'} = '
-<node>
+<node name="Top">
<nodename>Top</nodename>
<nodenext automatic="on">after</nodenext>
<nodeup automatic="on">(dir)</nodeup>
@@ -801,7 +801,7 @@
<part>
<title>part</title>
-<node>
+<node name="after">
<nodename>after</nodename>
<nodeprev automatic="on">Top</nodeprev>
<nodeup automatic="on">Top</nodeup>
Index: t/results/sectioning/double_part.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_part.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/double_part.pl 1 Sep 2011 22:00:28 -0000 1.9
+++ t/results/sectioning/double_part.pl 4 Sep 2011 10:00:00 -0000 1.10
@@ -988,7 +988,7 @@
';
-$result_converted{'xml'}->{'double_part'} = '<node>
+$result_converted{'xml'}->{'double_part'} = '<node name="Top">
<nodename>Top</nodename>
<nodenext automatic="on">node chapter</nodenext>
<nodeup automatic="on">(dir)</nodeup>
@@ -1010,7 +1010,7 @@
<title>part second</title>
<para>Text part second.
</para>
-<node>
+<node name="node-chapter">
<nodename>node chapter</nodename>
<nodeprev automatic="on">Top</nodeprev>
<nodeup automatic="on">Top</nodeup>
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/sectioning/node_part_chapter_after_chapter.pl 1 Sep 2011
22:00:29 -0000 1.15
+++ t/results/sectioning/node_part_chapter_after_chapter.pl 4 Sep 2011
10:00:00 -0000 1.16
@@ -1257,7 +1257,7 @@
';
-$result_converted{'xml'}->{'node_part_chapter_after_chapter'} = '<node>
+$result_converted{'xml'}->{'node_part_chapter_after_chapter'} = '<node
name="Top">
<nodename>Top</nodename>
<nodenext automatic="on">chapter node</nodenext>
<nodeup automatic="on">(dir)</nodeup>
@@ -1271,7 +1271,7 @@
</menudescription></menuentry></menu>
</top>
-<node>
+<node name="chapter-node">
<nodename>chapter node</nodename>
<nodenext automatic="on">part chapter node</nodenext>
<nodeprev automatic="on">Top</nodeprev>
@@ -1282,7 +1282,7 @@
<title>chapter node</title>
</chapter>
-<node>
+<node name="part-chapter-node">
<nodename>part chapter node</nodename>
<nodeprev automatic="on">chapter node</nodeprev>
<nodeup automatic="on">Top</nodeup>
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/sectioning/node_part_chapter_after_top.pl 1 Sep 2011 22:00:29
-0000 1.7
+++ t/results/sectioning/node_part_chapter_after_top.pl 4 Sep 2011 10:00:00
-0000 1.8
@@ -855,7 +855,7 @@
';
-$result_converted{'xml'}->{'node_part_chapter_after_top'} = '<node>
+$result_converted{'xml'}->{'node_part_chapter_after_top'} = '<node name="Top">
<nodename>Top</nodename>
<nodenext automatic="on">chapter node</nodenext>
<nodeup automatic="on">(dir)</nodeup>
@@ -868,7 +868,7 @@
</menudescription></menuentry></menu>
</top>
-<node>
+<node name="chapter-node">
<nodename>chapter node</nodename>
<nodeprev automatic="on">Top</nodeprev>
<nodeup automatic="on">Top</nodeup>
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/sectioning/part_chapter_after_top.pl 1 Sep 2011 22:00:30
-0000 1.7
+++ t/results/sectioning/part_chapter_after_top.pl 4 Sep 2011 10:00:00
-0000 1.8
@@ -855,7 +855,7 @@
';
-$result_converted{'xml'}->{'part_chapter_after_top'} = '<node>
+$result_converted{'xml'}->{'part_chapter_after_top'} = '<node name="Top">
<nodename>Top</nodename>
<nodenext automatic="on">chapter</nodenext>
<nodeup automatic="on">(dir)</nodeup>
@@ -871,7 +871,7 @@
<part>
<title>part</title>
-<node>
+<node name="chapter">
<nodename>chapter</nodename>
<nodeprev automatic="on">Top</nodeprev>
<nodeup automatic="on">Top</nodeup>
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/sectioning/part_node_chapter_after_top.pl 1 Sep 2011 22:00:30
-0000 1.15
+++ t/results/sectioning/part_node_chapter_after_top.pl 4 Sep 2011 10:00:00
-0000 1.16
@@ -1129,7 +1129,7 @@
';
-$result_converted{'xml'}->{'part_node_chapter_after_top'} = '<node>
+$result_converted{'xml'}->{'part_node_chapter_after_top'} = '<node name="Top">
<nodename>Top</nodename>
<nodenext automatic="on">a node after part</nodenext>
<nodeup automatic="on">(dir)</nodeup>
@@ -1146,7 +1146,7 @@
<part>
<title>part</title>
-<node>
+<node name="a-node-after-part">
<nodename>a node after part</nodename>
<nodenext>chapter</nodenext>
<nodeprev>Top</nodeprev>
@@ -1154,7 +1154,7 @@
</node>
<para>After a node after part
</para>
-<node>
+<node name="chapter">
<nodename>chapter</nodename>
<nodeprev automatic="on">a node after part</nodeprev>
<nodeup automatic="on">Top</nodeup>
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/sectioning/section_before_top.pl 1 Sep 2011 22:00:31 -0000
1.12
+++ t/results/sectioning/section_before_top.pl 4 Sep 2011 10:00:00 -0000
1.13
@@ -670,7 +670,7 @@
';
-$result_converted{'xml'}->{'section_before_top'} = '<node>
+$result_converted{'xml'}->{'section_before_top'} = '<node name="section-node">
<nodename>section node</nodename>
<nodeprev automatic="on">Top</nodeprev>
<nodeup>Top</nodeup>
@@ -679,7 +679,7 @@
<title>section</title>
</section>
-<node>
+<node name="Top">
<nodename>Top</nodename>
<nodenext automatic="on">section node</nodenext>
<nodeup automatic="on">(dir)</nodeup>
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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/section_in_unnumbered_plaintext.pl 1 Sep 2011
22:00:31 -0000 1.14
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl 4 Sep 2011
10:00:00 -0000 1.15
@@ -9465,7 +9465,7 @@
$result_converted{'xml'}->{'section_in_unnumbered_plaintext'} = '
<setcontentsaftertitlepage></setcontentsaftertitlepage>
-<node>
+<node name="Top">
<nodename>Top</nodename>
<nodenext automatic="on">chapter</nodenext>
<nodeup automatic="on">(dir)</nodeup>
@@ -9486,7 +9486,7 @@
</menudescription></menuentry></menu>
</top>
-<node>
+<node name="chapter">
<nodename>chapter</nodename>
<nodenext automatic="on">unnumbered</nodenext>
<nodeprev automatic="on">Top</nodeprev>
@@ -9499,7 +9499,7 @@
<menuentry><menunode>section in chapter</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="section-in-chapter">
<nodename>section in chapter</nodename>
<nodeup automatic="on">chapter</nodeup>
</node>
@@ -9508,7 +9508,7 @@
</section>
</chapter>
-<node>
+<node name="unnumbered">
<nodename>unnumbered</nodename>
<nodenext automatic="on">chapter 2</nodenext>
<nodeprev automatic="on">chapter</nodeprev>
@@ -9521,7 +9521,7 @@
<menuentry><menunode>section in unnumbered</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="section-in-unnumbered">
<nodename>section in unnumbered</nodename>
<nodeup automatic="on">unnumbered</nodeup>
</node>
@@ -9530,7 +9530,7 @@
</section>
</unnumbered>
-<node>
+<node name="chapter-2">
<nodename>chapter 2</nodename>
<nodenext automatic="on">chapter 3</nodenext>
<nodeprev automatic="on">unnumbered</nodeprev>
@@ -9544,7 +9544,7 @@
</menudescription></menuentry><menuentry><menunode>unnumberedsec
2-1</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="unnumberedsec-2">
<nodename>unnumberedsec 2</nodename>
<nodenext automatic="on">unnumberedsec 2-1</nodenext>
<nodeup automatic="on">chapter 2</nodeup>
@@ -9559,7 +9559,7 @@
</menudescription></menuentry><menuentry><menunode>numbered sub2
2</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="unnumbered-sub-2">
<nodename>unnumbered sub 2</nodename>
<nodenext automatic="on">numbered sub 2</nodenext>
<nodeup automatic="on">unnumberedsec 2</nodeup>
@@ -9568,7 +9568,7 @@
<title>unnumbered subsection 2</title>
</unnumberedsubsec>
-<node>
+<node name="numbered-sub-2">
<nodename>numbered sub 2</nodename>
<nodenext automatic="on">unnumbered sub2 2</nodenext>
<nodeprev automatic="on">unnumbered sub 2</nodeprev>
@@ -9578,7 +9578,7 @@
<title>numbered subsection 2</title>
</subsection>
-<node>
+<node name="unnumbered-sub2-2">
<nodename>unnumbered sub2 2</nodename>
<nodenext automatic="on">numbered sub2 2</nodenext>
<nodeprev automatic="on">numbered sub 2</nodeprev>
@@ -9588,7 +9588,7 @@
<title>unnumbered subsection2 2</title>
</unnumberedsubsec>
-<node>
+<node name="numbered-sub2-2">
<nodename>numbered sub2 2</nodename>
<nodeprev automatic="on">unnumbered sub2 2</nodeprev>
<nodeup automatic="on">unnumberedsec 2</nodeup>
@@ -9598,7 +9598,7 @@
</subsection>
</unnumberedsec>
-<node>
+<node name="unnumberedsec-2_002d1">
<nodename>unnumberedsec 2-1</nodename>
<nodeprev automatic="on">unnumberedsec 2</nodeprev>
<nodeup automatic="on">chapter 2</nodeup>
@@ -9610,7 +9610,7 @@
<menuentry><menunode>numbered sub 2-1</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="numbered-sub-2_002d1">
<nodename>numbered sub 2-1</nodename>
<nodeup automatic="on">unnumberedsec 2-1</nodeup>
</node>
@@ -9621,7 +9621,7 @@
</subsection>
</unnumberedsec>
</chapter>
-<node>
+<node name="chapter-3">
<nodename>chapter 3</nodename>
<nodenext automatic="on">unnumbered 4</nodenext>
<nodeprev automatic="on">chapter 2</nodeprev>
@@ -9638,7 +9638,7 @@
</menudescription></menuentry><menuentry><menunode>unnumberedsec
3-4</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="unnumberedsec-3">
<nodename>unnumberedsec 3</nodename>
<nodenext automatic="on">section 3-1</nodenext>
<nodeup automatic="on">chapter 3</nodeup>
@@ -9653,7 +9653,7 @@
</menudescription></menuentry><menuentry><menunode>numbered sub2
3</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="unnumbered-sub-3">
<nodename>unnumbered sub 3</nodename>
<nodenext automatic="on">numbered sub 3</nodenext>
<nodeup automatic="on">unnumberedsec 3</nodeup>
@@ -9662,7 +9662,7 @@
<title>unnumbered subsection 3</title>
</unnumberedsubsec>
-<node>
+<node name="numbered-sub-3">
<nodename>numbered sub 3</nodename>
<nodenext automatic="on">unnumbered sub2 3</nodenext>
<nodeprev automatic="on">unnumbered sub 3</nodeprev>
@@ -9672,7 +9672,7 @@
<title>numbered subsection 3</title>
</subsection>
-<node>
+<node name="unnumbered-sub2-3">
<nodename>unnumbered sub2 3</nodename>
<nodenext automatic="on">numbered sub2 3</nodenext>
<nodeprev automatic="on">numbered sub 3</nodeprev>
@@ -9682,7 +9682,7 @@
<title>unnumbered subsection2 3</title>
</unnumberedsubsec>
-<node>
+<node name="numbered-sub2-3">
<nodename>numbered sub2 3</nodename>
<nodeprev automatic="on">unnumbered sub2 3</nodeprev>
<nodeup automatic="on">unnumberedsec 3</nodeup>
@@ -9692,7 +9692,7 @@
</subsection>
</unnumberedsec>
-<node>
+<node name="section-3_002d1">
<nodename>section 3-1</nodename>
<nodenext automatic="on">unnumberedsec 3-2</nodenext>
<nodeprev automatic="on">unnumberedsec 3</nodeprev>
@@ -9702,7 +9702,7 @@
<title>section 3-1</title>
</section>
-<node>
+<node name="unnumberedsec-3_002d2">
<nodename>unnumberedsec 3-2</nodename>
<nodenext automatic="on">section 3-3</nodenext>
<nodeprev automatic="on">section 3-1</nodeprev>
@@ -9715,7 +9715,7 @@
<menuentry><menunode>numbered sub 3-2</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="numbered-sub-3_002d2">
<nodename>numbered sub 3-2</nodename>
<nodeup automatic="on">unnumberedsec 3-2</nodeup>
</node>
@@ -9724,7 +9724,7 @@
</subsection>
</unnumberedsec>
-<node>
+<node name="section-3_002d3">
<nodename>section 3-3</nodename>
<nodenext automatic="on">unnumberedsec 3-4</nodenext>
<nodeprev automatic="on">unnumberedsec 3-2</nodeprev>
@@ -9737,7 +9737,7 @@
<menuentry><menunode>subsection 3-3</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="subsection-3_002d3">
<nodename>subsection 3-3</nodename>
<nodeup automatic="on">section 3-3</nodeup>
</node>
@@ -9746,7 +9746,7 @@
</subsection>
</section>
-<node>
+<node name="unnumberedsec-3_002d4">
<nodename>unnumberedsec 3-4</nodename>
<nodeprev automatic="on">section 3-3</nodeprev>
<nodeup automatic="on">chapter 3</nodeup>
@@ -9758,7 +9758,7 @@
<menuentry><menunode>numbered sub 3-4</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="numbered-sub-3_002d4">
<nodename>numbered sub 3-4</nodename>
<nodeup automatic="on">unnumberedsec 3-4</nodeup>
</node>
@@ -9768,7 +9768,7 @@
</subsection>
</unnumberedsec>
</chapter>
-<node>
+<node name="unnumbered-4">
<nodename>unnumbered 4</nodename>
<nodeprev automatic="on">chapter 3</nodeprev>
<nodeup automatic="on">Top</nodeup>
@@ -9780,7 +9780,7 @@
<menuentry><menunode>unnumberedsec 4</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="unnumberedsec-4">
<nodename>unnumberedsec 4</nodename>
<nodeup automatic="on">unnumbered 4</nodeup>
</node>
@@ -9794,7 +9794,7 @@
</menudescription></menuentry><menuentry><menunode>numbered sub2
4</menunode><menudescription>
</menudescription></menuentry></menu>
-<node>
+<node name="unnumbered-sub-4">
<nodename>unnumbered sub 4</nodename>
<nodenext automatic="on">numbered sub 4</nodenext>
<nodeup automatic="on">unnumberedsec 4</nodeup>
@@ -9803,7 +9803,7 @@
<title>unnumbered subsection 4</title>
</unnumberedsubsec>
-<node>
+<node name="numbered-sub-4">
<nodename>numbered sub 4</nodename>
<nodenext automatic="on">unnumbered sub2 4</nodenext>
<nodeprev automatic="on">unnumbered sub 4</nodeprev>
@@ -9813,7 +9813,7 @@
<title>numbered subsection 4</title>
</subsection>
-<node>
+<node name="unnumbered-sub2-4">
<nodename>unnumbered sub2 4</nodename>
<nodenext automatic="on">numbered sub2 4</nodenext>
<nodeprev automatic="on">numbered sub 4</nodeprev>
@@ -9823,7 +9823,7 @@
<title>unnumbered subsection2 4</title>
</unnumberedsubsec>
-<node>
+<node name="numbered-sub2-4">
<nodename>numbered sub2 4</nodename>
<nodeprev automatic="on">unnumbered sub2 4</nodeprev>
<nodeup automatic="on">unnumberedsec 4</nodeup>
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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/sectioning/section_node_before_part.pl 1 Sep 2011 22:00:31
-0000 1.8
+++ t/results/sectioning/section_node_before_part.pl 4 Sep 2011 10:00:00
-0000 1.9
@@ -357,7 +357,7 @@
$result_converted{'xml'}->{'section_node_before_part'} = '
-<node>
+<node name="Top">
<nodename>Top</nodename>
<nodeup automatic="on">(dir)</nodeup>
</node>
- texinfo/tp Texinfo/Convert/XML.pm t/results/sec...,
Patrice Dumas <=