[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Convert/XML.pm t/result...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Convert/XML.pm t/result... |
|
Date: |
Wed, 07 Sep 2011 23:17:47 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/07 23:17:47
Modified files:
tp : TODO
tp/Texinfo/Convert: XML.pm
tp/t/results/coverage: cartouche_in_example.pl
exdent_and_commands.pl
exdent_and_formats.pl
flushright_example_nested.pl
preformatted.pl
punctuation_in_line_commands.pl
symbol_after_command.pl table.pl
table_command_comment.pl
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
tp/t/results/xml_tests: comments_on_block_command_lines.pl
image_inline_or_not.pl
Log message:
Put preformatted type in pre in XML.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.164&r2=1.165
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/cartouche_in_example.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_commands.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_formats.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/flushright_example_nested.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_command.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_node_before_and_after_part.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_part.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_chapter.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/node_part_chapter_after_top.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_chapter_after_top.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- TODO 3 Sep 2011 21:25:40 -0000 1.164
+++ TODO 7 Sep 2011 23:17:44 -0000 1.165
@@ -21,6 +21,10 @@
There should be a warning when beginning a table item with @itemx.
+There should be a warning with something like
address@hidden text
+...
+
Verify that there is a test with a node both internal and external
ref, like
@xref{node1}.
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- Texinfo/Convert/XML.pm 7 Sep 2011 22:40:20 -0000 1.20
+++ Texinfo/Convert/XML.pm 7 Sep 2011 23:17:45 -0000 1.21
@@ -18,7 +18,6 @@
# Original author: Patrice Dumas <address@hidden>
# msg Karl:
-# preformatted -> <pre xml:space="preserve">
# if a 'command_as_argument' is definfoenclosed should lead to
# @definfoenclose a,:,:
# <table commandarg="a" begin=":" end=":">
@@ -224,7 +223,7 @@
my %type_elements = (
'paragraph' => 'para',
- #'preformatted' => 'pre',
+ 'preformatted' => 'pre',
'menu_entry' => 'menuentry',
'menu_entry_node' => 'menunode',
'menu_comment' => 'menucomment',
Index: t/results/coverage/cartouche_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/cartouche_in_example.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/coverage/cartouche_in_example.pl 13 Aug 2011 15:33:05 -0000
1.3
+++ t/results/coverage/cartouche_in_example.pl 7 Sep 2011 23:17:45 -0000
1.4
@@ -232,4 +232,14 @@
</pre></div>
';
+
+$result_converted{'xml'}->{'cartouche_in_example'} = '<example>
+<pre xml:space="preserve">In example
+</pre><cartouche>
+<pre xml:space="preserve">In cartouche in example
+</pre></cartouche>
+<pre xml:space="preserve">end example
+</pre></example>
+';
+
1;
Index: t/results/coverage/exdent_and_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/exdent_and_commands.pl 13 Aug 2011 15:33:05 -0000
1.12
+++ t/results/coverage/exdent_and_commands.pl 7 Sep 2011 23:17:45 -0000
1.13
@@ -561,4 +561,20 @@
</pre></div>
';
+
+$result_converted{'xml'}->{'exdent_and_commands'} = '<quotation>
+<para>quotation1
+</para><exdent>in exdented protected eol <spacecmd
type="nl"/></exdent><para>following
+</para><exdent>in exdented a &arobase;* &linebreak; and following</exdent>
+<para>after exdented
+</para></quotation>
+
+<example>
+<pre xml:space="preserve">example
+</pre><exdent>in exdented protected eol <spacecmd type="nl"/></exdent><pre
xml:space="preserve">following
+</pre><exdent>in exdented a &arobase;* &linebreak; and following</exdent>
+<pre xml:space="preserve">after exdented
+</pre></example>
+';
+
1;
Index: t/results/coverage/exdent_and_formats.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/coverage/exdent_and_formats.pl 14 Aug 2011 01:51:59 -0000
1.15
+++ t/results/coverage/exdent_and_formats.pl 7 Sep 2011 23:17:45 -0000
1.16
@@ -2390,4 +2390,87 @@
</p></blockquote>
';
+
+$result_converted{'xml'}->{'exdent_and_formats'} = '<example>
+<pre xml:space="preserve"> Example Hoho. &tex; . &linebreak; &arobase;.
+
+</pre><exdent>Other line</exdent>
+<pre xml:space="preserve">not exdented
+</pre></example>
+
+
+<example>
+<exdent>exdented and dash --- in example</exdent>
+<pre xml:space="preserve">Not exdented
+</pre><exdent>exdented</exdent>
+<pre xml:space="preserve">Not exdented
+</pre></example>
+
+<para>Para1.
+</para>
+<quotation>
+<para>qsddsqkdsqkkmljsqjsqodmmdsqdsmqj dqs sdq sqd sdq dsq sdq sqd sqd sdq sdq
+qsd dsq sdq dsq dssdq sdq sdq sdq dsq sdq dsq dsq sdq dsq sdqsd q
+</para></quotation>
+
+<para>Para2.
+</para>
+<para>Para3.
+</para>
+<para>Last para.
+</para>
+<quotation>
+<para>quotation1
+quotation2
+</para></quotation>
+
+<quotation>
+<para>quotation para 1
+</para>
+<para>quotation para 2
+</para></quotation>
+
+<example>
+<pre xml:space="preserve">Example Hoho.
+</pre><example>
+<pre xml:space="preserve">Nested Other line
+</pre><exdent>exdented nested other line</exdent>
+</example>
+</example>
+
+<quotation>
+<exdent>exdented quotation line and dash &textmdash; in quotation</exdent>
+</quotation>
+
+<quotation>
+<para>Not exdented followed by exdented
+</para><exdent>exdented quotation line</exdent>
+</quotation>
+
+<quotation>
+<exdent>exdented quotation line</exdent>
+<para>Followed by not exdented
+</para></quotation>
+
+<quotation>
+<exdent>exdented quotation line oidfjslsd aez a aze azaz aeae za eaz
az</exdent>
+<exdent>azeaz az az az az</exdent>
+</quotation>
+
+<quotation>
+<exdent>exdented quotation line oidfjslsd aez a aze azaz aeae za eaz az azeaz
end line</exdent>
+<exdent>az az az az</exdent>
+</quotation>
+
+<quotation>
+<para>quotation line oidfjslsd aez a aze azaz aeae za eaz az zelef aaa
+</para><exdent>ezkfjklezf </exdent>
+</quotation>
+
+<quotation>
+<exdent>very loooooooooooooooooooooooooooooooooong exdented quotation line
oidfjslsd aez a aze azaz aeae za eaz az azeaz end line</exdent>
+<exdent>az az az az</exdent>
+</quotation>
+';
+
1;
Index: t/results/coverage/flushright_example_nested.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/flushright_example_nested.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/coverage/flushright_example_nested.pl 13 Aug 2011 15:33:05
-0000 1.8
+++ t/results/coverage/flushright_example_nested.pl 7 Sep 2011 23:17:45
-0000 1.9
@@ -378,4 +378,18 @@
</pre></div>
';
+
+$result_converted{'xml'}->{'flushright_example_nested'} = '<example>
+<flushright>
+<pre xml:space="preserve">in --- flushright
+</pre></flushright>
+</example>
+
+<flushright>
+<example>
+<pre xml:space="preserve">in --- example
+</pre></example>
+</flushright>
+';
+
1;
Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- t/results/coverage/preformatted.pl 3 Sep 2011 21:51:31 -0000 1.47
+++ t/results/coverage/preformatted.pl 7 Sep 2011 23:17:45 -0000 1.48
@@ -473,4 +473,21 @@
</div>
';
+
+$result_converted{'xml'}->{'preformatted'} = '
+<example>
+<pre xml:space="preserve">e--xample some
+
+ text
+</pre></example>
+
+<format>
+<vtable commandarg="@code">
+<tableentry><tableterm><item><itemformat command="@code"><indexterm
index="vr">item in table in format</indexterm>item in table in
format</itemformat></item>
+</tableterm><tableitem><pre xml:space="preserve">
+in table in format
+</pre></tableitem></tableentry></vtable>
+</format>
+';
+
1;
Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/coverage/punctuation_in_line_commands.pl 4 Sep 2011 12:14:03
-0000 1.17
+++ t/results/coverage/punctuation_in_line_commands.pl 7 Sep 2011 23:17:45
-0000 1.18
@@ -1499,4 +1499,48 @@
<hr>
';
+
+$result_converted{'xml'}->{'punctuation_in_line_commands'} = '
+<node name="node_0021-After-punc">
+<nodename>node! After punc</nodename>
+</node>
+<top>
+<sectiontitle>top! After punc</sectiontitle>
+
+<table commandarg="@asis">
+<tableentry><tableterm><item><itemformat command="@asis">item! After
punc</itemformat></item>
+</tableterm></tableentry></table>
+
+<quotation><quotationtype>quotation arg! After punc</quotationtype>
+<para>In quotation
+</para><exdent>exdent quotation! After punc</exdent>
+</quotation>
+
+<float name="float-label_0021-After-punc"
type="float-type_0021-After-punc"><floattype>float type! After
punc</floattype><floatname>float label! After punc</floatname>
+<para>In float
+</para><shortcaption><para>shortcaption! After punc</para></shortcaption>
+</float>
+
+<float name="label-with-caption"
type="float-type_0021-After-punc"><floattype>float type! After
punc</floattype><floatname>label with caption</floatname>
+<para>In float with caption.
+</para><caption><para>caption! After punc</para></caption>
+</float>
+
+<listoffloats type="float-type_0021-After-punc">float type! After
punc</listoffloats>
+
+<cindex index="cp"><indexterm index="cp">index! After punc</indexterm></cindex>
+
+<heading>heading! After punc</heading>
+
+<titlefont>titlefont! After punc</titlefont>
+
+<center>center! After punc</center>
+
+<printindex value="cp"></printindex>
+
+<contents></contents>
+
+</top>
+';
+
1;
Index: t/results/coverage/symbol_after_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/symbol_after_command.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/coverage/symbol_after_command.pl 3 Sep 2011 10:29:25 -0000
1.9
+++ t/results/coverage/symbol_after_command.pl 7 Sep 2011 23:17:45 -0000
1.10
@@ -658,4 +658,18 @@
<p>@. {, @@ ?, !: @{ @” @:
</p>';
+
+$result_converted{'xml'}->{'symbol_after_command'} = '<table
commandarg="@asis">
+<tableentry><tableterm><item><itemformat command="@asis">.
dot</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="@asis">, comma</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="@asis">&arobase; &arobase;</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="@asis">} }</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="@asis">! exclam</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="@asis">&textrdquo; quotes</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="@asis">: colon</itemformat></item>
+</tableterm></tableentry></table>
+
+<para>&arobase;. }, &arobase;&arobase; &eosquest;, &eosexcl;:
&arobase;} &arobase;&textrdquo; &arobase;:
+</para>';
+
1;
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/results/coverage/table.pl 4 Sep 2011 12:14:03 -0000 1.46
+++ t/results/coverage/table.pl 7 Sep 2011 23:17:45 -0000 1.47
@@ -817,4 +817,25 @@
</dl>
';
+
+$result_converted{'xml'}->{'table'} = '
+<table commandarg="@asis">
+<tableentry><tableterm><item><itemformat command="@asis">table
item</itemformat></item>
+<itemx><itemformat command="@asis">table itemx</itemformat></itemx>
+</tableterm><tableitem>
+<para>In table
+</para></tableitem></tableentry></table>
+
+<vtable commandarg="@samp"><!-- samp -->
+<!-- after vtable -->
+<cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>
+
+<tableentry><tableterm><item><itemformat command="@samp"><indexterm
index="vr">vtable item</indexterm>vtable item</itemformat></item>
+<!-- after item -->
+<kindex index="ky"><indexterm index="ky">key</indexterm></kindex>
+<itemx><itemformat command="@samp"><indexterm index="vr">itemx
vtable</indexterm>itemx vtable <!-- comment in itemx line
--></itemformat></itemx>
+</tableterm><tableitem>
+</tableitem></tableentry></vtable>
+';
+
1;
Index: t/results/coverage/table_command_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/coverage/table_command_comment.pl 3 Sep 2011 10:29:26 -0000
1.31
+++ t/results/coverage/table_command_comment.pl 7 Sep 2011 23:17:45 -0000
1.32
@@ -196,4 +196,10 @@
</dl>
';
+
+$result_converted{'xml'}->{'table_command_comment'} = '<table
commandarg="@code"><!-- in comment -->
+<tableentry><tableterm><item><itemformat
command="@code">item</itemformat></item>
+</tableterm></tableentry></table>
+';
+
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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/sectioning/chapter_node_before_and_after_part.pl 6 Sep 2011
20:32:40 -0000 1.16
+++ t/results/sectioning/chapter_node_before_and_after_part.pl 7 Sep 2011
23:17:46 -0000 1.17
@@ -794,8 +794,8 @@
<sectiontitle>chapter</sectiontitle>
<menu>
-<menuentry><menunode>after</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>after</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
</chapter>
<part>
Index: t/results/sectioning/double_part.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/double_part.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/double_part.pl 6 Sep 2011 20:32:40 -0000 1.11
+++ t/results/sectioning/double_part.pl 7 Sep 2011 23:17:46 -0000 1.12
@@ -997,8 +997,8 @@
<sectiontitle>top</sectiontitle>
<menu>
-<menuentry><menunode>node chapter</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>node chapter</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
</top>
<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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/sectioning/node_part_chapter_after_chapter.pl 6 Sep 2011
20:32:40 -0000 1.17
+++ t/results/sectioning/node_part_chapter_after_chapter.pl 7 Sep 2011
23:17:46 -0000 1.18
@@ -1266,9 +1266,9 @@
<sectiontitle>top</sectiontitle>
<menu>
-<menuentry><menunode>chapter node</menunode><menudescription>
-</menudescription></menuentry><menuentry><menunode>part chapter
node</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>chapter node</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>part chapter
node</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry></menu>
</top>
<node name="chapter-node">
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/sectioning/node_part_chapter_after_top.pl 6 Sep 2011 20:32:40
-0000 1.10
+++ t/results/sectioning/node_part_chapter_after_top.pl 7 Sep 2011 23:17:46
-0000 1.11
@@ -864,8 +864,8 @@
<sectiontitle>top</sectiontitle>
<menu>
-<menuentry><menunode>chapter node</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>chapter node</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
</top>
<node name="chapter-node">
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/sectioning/part_chapter_after_top.pl 6 Sep 2011 20:32:41
-0000 1.10
+++ t/results/sectioning/part_chapter_after_top.pl 7 Sep 2011 23:17:46
-0000 1.11
@@ -864,8 +864,8 @@
<sectiontitle>top</sectiontitle>
<menu>
-<menuentry><menunode>chapter</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>chapter</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
</top>
<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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/sectioning/part_node_chapter_after_top.pl 6 Sep 2011 20:32:41
-0000 1.18
+++ t/results/sectioning/part_node_chapter_after_top.pl 7 Sep 2011 23:17:46
-0000 1.19
@@ -1138,9 +1138,9 @@
<sectiontitle>top</sectiontitle>
<menu>
-<menuentry><menunode>a node after part</menunode><menudescription>
-</menudescription></menuentry><menuentry><menunode>chapter</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>a node after part</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>chapter</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
</top>
<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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/sectioning/section_before_top.pl 6 Sep 2011 20:32:41 -0000
1.15
+++ t/results/sectioning/section_before_top.pl 7 Sep 2011 23:17:46 -0000
1.16
@@ -688,8 +688,8 @@
<sectiontitle>top</sectiontitle>
<menu>
-<menuentry><menunode>section node</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>section node</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
</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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/sectioning/section_in_unnumbered_plaintext.pl 6 Sep 2011
20:32:41 -0000 1.16
+++ t/results/sectioning/section_in_unnumbered_plaintext.pl 7 Sep 2011
23:17:46 -0000 1.17
@@ -9478,12 +9478,12 @@
<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>
+<menuentry><menunode>chapter</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>unnumbered</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>chapter
2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>chapter
3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>unnumbered
4</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry></menu>
</top>
<node name="chapter">
@@ -9496,8 +9496,8 @@
<sectiontitle>chapter</sectiontitle>
<menu>
-<menuentry><menunode>section in chapter</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>section in chapter</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="section-in-chapter">
<nodename>section in chapter</nodename>
@@ -9518,8 +9518,8 @@
<sectiontitle>unnumbered</sectiontitle>
<menu>
-<menuentry><menunode>section in unnumbered</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>section in unnumbered</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="section-in-unnumbered">
<nodename>section in unnumbered</nodename>
@@ -9540,9 +9540,9 @@
<sectiontitle>chapter 2</sectiontitle>
<menu>
-<menuentry><menunode>unnumberedsec 2</menunode><menudescription>
-</menudescription></menuentry><menuentry><menunode>unnumberedsec
2-1</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>unnumberedsec 2</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>unnumberedsec
2-1</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="unnumberedsec-2">
<nodename>unnumberedsec 2</nodename>
@@ -9553,11 +9553,11 @@
<sectiontitle>unnumbered section 2</sectiontitle>
<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>
+<menuentry><menunode>unnumbered sub 2</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>numbered sub
2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>unnumbered sub2
2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>numbered sub2
2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="unnumbered-sub-2">
<nodename>unnumbered sub 2</nodename>
@@ -9607,8 +9607,8 @@
<sectiontitle>unnumberedsec 2-1</sectiontitle>
<menu>
-<menuentry><menunode>numbered sub 2-1</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>numbered sub 2-1</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="numbered-sub-2_002d1">
<nodename>numbered sub 2-1</nodename>
@@ -9631,12 +9631,12 @@
<sectiontitle>chapter 3</sectiontitle>
<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>
+<menuentry><menunode>unnumberedsec 3</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>section
3-1</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>unnumberedsec
3-2</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>section
3-3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>unnumberedsec
3-4</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="unnumberedsec-3">
<nodename>unnumberedsec 3</nodename>
@@ -9647,11 +9647,11 @@
<sectiontitle>unnumbered section 3</sectiontitle>
<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>
+<menuentry><menunode>unnumbered sub 3</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>numbered sub
3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>unnumbered sub2
3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>numbered sub2
3</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="unnumbered-sub-3">
<nodename>unnumbered sub 3</nodename>
@@ -9712,8 +9712,8 @@
<sectiontitle>unnumberedsec 3-2</sectiontitle>
<menu>
-<menuentry><menunode>numbered sub 3-2</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>numbered sub 3-2</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="numbered-sub-3_002d2">
<nodename>numbered sub 3-2</nodename>
@@ -9734,8 +9734,8 @@
<sectiontitle>section 3-3</sectiontitle>
<menu>
-<menuentry><menunode>subsection 3-3</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>subsection 3-3</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="subsection-3_002d3">
<nodename>subsection 3-3</nodename>
@@ -9755,8 +9755,8 @@
<sectiontitle>unnumberedsec 3-4</sectiontitle>
<menu>
-<menuentry><menunode>numbered sub 3-4</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>numbered sub 3-4</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="numbered-sub-3_002d4">
<nodename>numbered sub 3-4</nodename>
@@ -9777,8 +9777,8 @@
<sectiontitle>unnumbered 4</sectiontitle>
<menu>
-<menuentry><menunode>unnumberedsec 4</menunode><menudescription>
-</menudescription></menuentry></menu>
+<menuentry><menunode>unnumberedsec 4</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="unnumberedsec-4">
<nodename>unnumberedsec 4</nodename>
@@ -9788,11 +9788,11 @@
<sectiontitle>unnumbered section 4</sectiontitle>
<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>
+<menuentry><menunode>unnumbered sub 4</menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>numbered sub
4</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>unnumbered sub2
4</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode>numbered sub2
4</menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry></menu>
<node name="unnumbered-sub-4">
<nodename>unnumbered sub 4</nodename>
Index: t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/xml_tests/comments_on_block_command_lines.pl 7 Sep 2011
22:41:23 -0000 1.3
+++ t/results/xml_tests/comments_on_block_command_lines.pl 7 Sep 2011
23:17:46 -0000 1.4
@@ -2493,8 +2493,8 @@
</para></group>
<example><!-- comm -->
-in ex
-</example>
+<pre xml:space="preserve">in ex
+</pre></example>
<multitable><columnfractions><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions><!-- comm -->
<tbody><row><entry command="item"><para>a </para></entry><entry
command="tab"><para>b
Index: t/results/xml_tests/image_inline_or_not.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/xml_tests/image_inline_or_not.pl 6 Sep 2011 23:27:52 -0000
1.3
+++ t/results/xml_tests/image_inline_or_not.pl 7 Sep 2011 23:17:46 -0000
1.4
@@ -2236,12 +2236,12 @@
<para>Para <image where="inline"><imagefile>jj</imagefile><image>.
</para>
<example>
-
+<pre xml:space="preserve">
<image where="inline"><imagefile>in_example</imagefile><image>
T
<image where="inline"><imagefile>in example after text</imagefile><image>
-</example>
+</pre></example>
<quotation><quotationtype><image
where="inline"><imagefile>in_quotation_arg</imagefile><image></quotationtype>
<image><imagefile>in_quotation_content</imagefile><image>
@@ -2258,11 +2258,11 @@
</tableitem></tableentry></table>
<menu>
-<menuentry><menunode><image
where="inline"><imagefile>node_image</imagefile><image></menunode><menudescription><image
where="inline"><imagefile>image_in_description</imagefile><image>
-</menudescription></menuentry><menuentry><menutitle><image
where="inline"><imagefile>in_menu_entry_name</imagefile><image></menutitle><menunode>(somewhere)<image
where="inline"><imagefile>extnode</imagefile><image></menunode><menudescription>
-</menudescription></menuentry><menucomment>
+<menuentry><menunode><image
where="inline"><imagefile>node_image</imagefile><image></menunode><menudescription><pre
xml:space="preserve"><image
where="inline"><imagefile>image_in_description</imagefile><image>
+</pre></menudescription></menuentry><menuentry><menutitle><image
where="inline"><imagefile>in_menu_entry_name</imagefile><image></menutitle><menunode>(somewhere)<image
where="inline"><imagefile>extnode</imagefile><image></menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
<image where="inline"><imagefile>in_menu_comment</imagefile><image>
-</menucomment></menu>
+</pre></menucomment></menu>
<node name="node_005fimage">
<nodename><image
where="inline"><imagefile>node_image</imagefile><image></nodename>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Convert/XML.pm t/result...,
Patrice Dumas <=