[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/DocBook.pm Texinfo/C...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/DocBook.pm Texinfo/C... |
|
Date: |
Sun, 11 Sep 2011 19:05:11 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/11 19:05:10
Modified files:
tp/Texinfo/Convert: DocBook.pm XML.pm
tp/t/results/coverage: item_container.pl preformatted.pl
punctuation_in_line_commands.pl
symbol_after_command.pl table.pl
table_command_comment.pl
tp/t/results/xml_tests: comments_on_block_command_lines.pl
image_inline_or_not.pl
tp/t/results/xtable: accent_on_table_line.pl
definfoenclose_on_table_line.pl
empty_item_itemx.pl
inter_item_commands_in_table.pl
long_item.pl table_nested.pl
Log message:
XML: no @ in attribute with command names.
DocBook: handle preformatted environments.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_command.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/image_inline_or_not.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/accent_on_table_line.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/empty_item_itemx.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/long_item.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/table_nested.pl?cvsroot=texinfo&r1=1.13&r2=1.14
Patches:
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Texinfo/Convert/DocBook.pm 11 Sep 2011 17:32:49 -0000 1.2
+++ Texinfo/Convert/DocBook.pm 11 Sep 2011 19:05:09 -0000 1.3
@@ -80,6 +80,11 @@
my @docbook_image_extensions
= ('eps', 'gif', 'jpg', 'jpeg', 'pdf', 'png', 'svg');
+my %docbook_special_quotations;
+foreach my $special_quotation ('note', 'caution', 'important', 'tip',
'warning') {
+ $docbook_special_quotations{$special_quotation} = 1;
+}
+
my %docbook_specific_formatting = (
'TeX' => '&tex;',
'LaTeX' => '&latex;',
@@ -181,25 +186,8 @@
= %Texinfo::Convert::Converter::default_args_code_style;
my %commands_args_elements = (
- 'inforef' => ['inforefnodename', 'inforefrefname', 'inforefinfoname'],
- 'image' => ['imagefile', 'imagewidth', 'imageheight',
- 'alttext', 'imageextension'],
- 'quotation' => ['quotationtype'],
- 'float' => ['floattype', 'floatname'],
- 'itemize' => ['itemfunction'],
);
-foreach my $ref_cmd ('pxref', 'xref', 'ref') {
- $commands_args_elements{$ref_cmd}
- = ['xrefnodename', 'xrefinfoname', 'xrefprinteddesc', 'xrefinfofile',
- 'xrefprintedname'];
-}
-
-foreach my $explained_command (keys(%Texinfo::Common::explained_commands)) {
- $commands_args_elements{$explained_command} = ["${explained_command}word",
- "${explained_command}desc"];
-}
-
my %commands_elements;
foreach my $command (keys(%Texinfo::Common::brace_commands)) {
$commands_elements{$command} = [$command];
@@ -250,6 +238,17 @@
'float' => 1,
);
+my %docbook_preformatted_formats = (
+ 'example' => 'screen',
+ 'smallexample' => 'screen',
+ 'display' => 'literallayout',
+ 'smalldisplay' => 'literallayout',
+ 'lisp' => 'programlisting',
+ 'smalllisp' => 'programlisting',
+ 'format' => 'abstract',
+ 'smallformat' => 'screen'
+);
+
sub _defaults($)
{
return %defaults;
@@ -474,8 +473,6 @@
sub _convert($$;$);
-
-
sub _convert($$;$)
{
my $self = shift;
@@ -509,7 +506,7 @@
}
return $result;
}
- my $close_element;
+ my @close_elements;
if ($root->{'cmdname'}) {
if (defined($docbook_commands_formatting{$root->{'cmdname'}})) {
my $command;
@@ -531,7 +528,7 @@
and ($root->{'parent'}->{'cmdname'} eq 'itemize'
or $root->{'parent'}->{'cmdname'} eq 'enumerate')) {
$result .= "<listitem>";
- $close_element = 'listitem';
+ push @close_elements, 'listitem';
} elsif (($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx')
and $root->{'parent'}->{'type'}
and $root->{'parent'}->{'type'} eq 'table_term') {
@@ -572,7 +569,7 @@
}
$result .= "<entry>";
- $close_element = 'entry';
+ push @close_elements, 'entry';
}
} elsif ($root->{'type'} and $root->{'type'} eq 'index_entry_command') {
my $end_line;
@@ -960,7 +957,10 @@
}
my $attribute = '';
my $element;
- if ($root->{'cmdname'} eq 'enumerate') {
+ if (exists($docbook_preformatted_formats{$root->{'cmdname'}})) {
+ push @{$self->{'document_context'}->[-1]->{'preformatted_stack'}},
+ $docbook_preformatted_formats{$root->{'cmdname'}};
+ } elsif ($root->{'cmdname'} eq 'enumerate') {
$element = 'orderedlist';
my $numeration;
if ($root->{'extra'}
@@ -981,41 +981,8 @@
} elsif ($root->{'cmdname'} eq 'itemize') {
$element = 'itemizedlist';
} elsif ($root->{'cmdname'} eq 'multitable') {
- }
- 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'}) {
- if ($commands_args_elements{$root->{'cmdname'}}) {
- my $arg_index = 0;
- foreach my $element (@{$commands_args_elements{$root->{'cmdname'}}})
{
- if (defined($root->{'args'}->[$arg_index])) {
- my $in_code;
- $in_code = 1
- if (defined($default_args_code_style{$root->{'cmdname'}})
- and
defined($default_args_code_style{$root->{'cmdname'}}->[$arg_index]));
- $self->{'document_context'}->[-1]->{'code'}++ if ($in_code);
- my $arg = $self->_convert($root->{'args'}->[$arg_index]);
- chomp($arg);
- if ($arg ne '') {
- $result .= "<$element>$arg</$element>\n";
- }
- $self->{'document_context'}->[-1]->{'code'}-- if ($in_code);
- } else {
- last;
- }
- $arg_index++;
- }
- } elsif ($root->{'cmdname'} eq 'multitable' and $root->{'extra'}) {
+ $element = "informaltable";
+ if ($root->{'extra'}) {
if ($root->{'extra'}->{'prototypes'}) {
$result .= "<columnprototypes>";
foreach my $prototype (@{$root->{'extra'}->{'prototypes'}}) {
@@ -1031,17 +998,31 @@
$result .= "</columnfractions>";
}
}
+ } elsif ($root->{'cmdname'} eq 'float') {
+ if ($root->{'extra'} and defined($root->{'extra'}->{'normalized'})) {
+ $result .= "<anchor id=\"$root->{'extra'}->{'normalized'}\">\n";
+ }
+ } elsif ($root->{'cmdname'} eq 'verbatim') {
+ $element = 'screen';
+ } elsif ($root->{'cmdname'} eq 'quotation') {
+ # docbook_special_quotations
+ $element = 'blockquote';
+ }
+ if (defined($element)) {
+ $result .= "<$element${attribute}>";
+ push @close_elements, $element;
+ if ($root->{'cmdname'} eq 'multitable') {
+ push @close_elements, 'tgroup';
+ }
}
- #chomp($result);
- #$result .= "\n";
- $close_element = $root->{'cmdname'};
}
}
if ($root->{'type'}) {
if (defined($type_elements{$root->{'type'}})) {
$result .= "<$type_elements{$root->{'type'}}>";
- }
- if ($root->{'type'} eq 'def_line') {
+ } elsif ($root->{'type'} eq 'preformatted') {
+ $result .=
"<$self->{'document_context'}->[-1]->{'preformatted_stack'}->[-1]>";
+ } elsif ($root->{'type'} eq 'def_line') {
if ($root->{'cmdname'}) {
$result .= "<$root->{'cmdname'}>";
}
@@ -1111,6 +1092,8 @@
if ($root->{'type'}) {
if (defined($type_elements{$root->{'type'}})) {
$result .= "</$type_elements{$root->{'type'}}>";
+ } elsif ($root->{'type'} eq 'preformatted') {
+ $result .=
"</$self->{'document_context'}->[-1]->{'preformatted_stack'}->[-1]>";
}
}
$result = '{'.$result.'}'
@@ -1118,13 +1101,18 @@
and (!$root->{'parent'}->{'type'} or
($root->{'parent'}->{'type'} ne 'block_line_arg'
and $root->{'parent'}->{'type'} ne 'misc_line_arg')));
- if ($close_element) {
- $result .= "</$close_element>";
+ foreach my $element (@close_elements) {
+ $result .= "</$element>";
}
if ($root->{'cmdname'}
and exists($Texinfo::Common::block_commands{$root->{'cmdname'}})) {
#$result .= "</$root->{'cmdname'}>\n";
$result .= "\n";
+ if (exists($docbook_preformatted_formats{$root->{'cmdname'}})) {
+ my $format = pop
@{$self->{'document_context'}->[-1]->{'preformatted_stack'}};
+ die "BUG $format ne $docbook_preformatted_formats{$root->{'cmdname'}}"
+ if ($format ne $docbook_preformatted_formats{$root->{'cmdname'}});
+ }
if ($context_block_commands{$root->{'cmdname'}}) {
pop @{$self->{'document_context'}};
}
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- Texinfo/Convert/XML.pm 11 Sep 2011 17:32:49 -0000 1.30
+++ Texinfo/Convert/XML.pm 11 Sep 2011 19:05:09 -0000 1.31
@@ -17,10 +17,6 @@
#
# Original author: Patrice Dumas <address@hidden>
-# msg Karl:
-# consistently use command="@$command"
-
-
package Texinfo::Convert::XML;
use 5.00405;
@@ -456,7 +452,7 @@
}
$result .= "<$root->{'cmdname'}>";
if ($format_item_command) {
- $result .= "<itemformat command=\"address@hidden"${attribute}>";
+ $result .= "<itemformat
command=\"$format_item_command\"${attribute}>";
}
$result .= $self->_index_entry($root);
# FIXME
@@ -723,7 +719,7 @@
if ($root->{'extra'} and $root->{'extra'}->{'command_as_argument'}) {
my $command_as_arg = $root->{'extra'}->{'command_as_argument'};
$attribute
- .= " commandarg=\"address@hidden>{'cmdname'}\""
+ .= " commandarg=\"$command_as_arg->{'cmdname'}\""
.$self->_infoenclose_attribute($command_as_arg);
} elsif ($root->{'extra'}
and $root->{'extra'}->{'enumerate_specification'}) {
Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- t/results/coverage/item_container.pl 8 Sep 2011 22:25:46 -0000
1.41
+++ t/results/coverage/item_container.pl 11 Sep 2011 19:05:09 -0000
1.42
@@ -497,12 +497,12 @@
<item><prepend>+</prepend><para>i&textndash;tem +
</para></item></itemize>
-<itemize commandarg="@bullet"><itemprepend>•</itemprepend>
+<itemize commandarg="bullet"><itemprepend>•</itemprepend>
<item><prepend>•</prepend>
<para>b&textndash;ullet
</para></item></itemize>
-<itemize commandarg="@bullet">
+<itemize commandarg="bullet">
<item><prepend>•</prepend><para>no itemize argument
</para></item></itemize>
';
Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- t/results/coverage/preformatted.pl 7 Sep 2011 23:17:45 -0000 1.48
+++ t/results/coverage/preformatted.pl 11 Sep 2011 19:05:09 -0000 1.49
@@ -482,8 +482,8 @@
</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>
+<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>
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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/coverage/punctuation_in_line_commands.pl 10 Sep 2011 13:12:37
-0000 1.20
+++ t/results/coverage/punctuation_in_line_commands.pl 11 Sep 2011 19:05:09
-0000 1.21
@@ -1504,8 +1504,8 @@
<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>
+<table commandarg="asis">
+<tableentry><tableterm><item><itemformat command="asis">item! After
punc</itemformat></item>
</tableterm></tableentry></table>
<quotation><quotationtype>quotation arg! After punc</quotationtype>
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/coverage/symbol_after_command.pl 7 Sep 2011 23:17:45 -0000
1.10
+++ t/results/coverage/symbol_after_command.pl 11 Sep 2011 19:05:09 -0000
1.11
@@ -659,14 +659,14 @@
</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>
+$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;:
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- t/results/coverage/table.pl 7 Sep 2011 23:17:45 -0000 1.47
+++ t/results/coverage/table.pl 11 Sep 2011 19:05:09 -0000 1.48
@@ -819,21 +819,21 @@
$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>
+<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 -->
+<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>
+<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>
+<itemx><itemformat command="samp"><indexterm index="vr">itemx
vtable</indexterm>itemx vtable <!-- comment in itemx line
--></itemformat></itemx>
</tableterm><tableitem>
</tableitem></tableentry></vtable>
';
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.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/coverage/table_command_comment.pl 10 Sep 2011 11:17:27 -0000
1.33
+++ t/results/coverage/table_command_comment.pl 11 Sep 2011 19:05:09 -0000
1.34
@@ -197,8 +197,8 @@
';
-$result_converted{'xml'}->{'table_command_comment'} = '<table
commandarg="@code"><!-- in comment -->
-<tableentry><tableterm><item><itemformat
command="@code">item</itemformat></item>
+$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/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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/xml_tests/comments_on_block_command_lines.pl 8 Sep 2011
22:25:46 -0000 1.5
+++ t/results/xml_tests/comments_on_block_command_lines.pl 11 Sep 2011
19:05:10 -0000 1.6
@@ -2456,7 +2456,7 @@
-$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize
commandarg="@bullet"><!-- comm -->
+$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize
commandarg="bullet"><!-- comm -->
<item><prepend>•</prepend><para>itemize it
</para></item></itemize>
@@ -2464,7 +2464,7 @@
<item><prepend>x</prepend><para>itemize xit
</para></item></itemize>
-<itemize commandarg="@bullet"><itemprepend>• </itemprepend><!-- comm
-->
+<itemize commandarg="bullet"><itemprepend>• </itemprepend><!-- comm -->
<item><prepend>•</prepend><para>itemize bulletit
</para></item></itemize>
@@ -2476,8 +2476,8 @@
<item><para>aen
</para></item></enumerate>
-<table commandarg="@asis"><!-- table -->
-<tableentry><tableterm><item><itemformat command="@asis">it</itemformat></item>
+<table commandarg="asis"><!-- table -->
+<tableentry><tableterm><item><itemformat command="asis">it</itemformat></item>
</tableterm></tableentry></table>
<quotation><!-- quot no arg -->
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/xml_tests/image_inline_or_not.pl 10 Sep 2011 13:12:39 -0000
1.6
+++ t/results/xml_tests/image_inline_or_not.pl 11 Sep 2011 19:05:10 -0000
1.7
@@ -2243,8 +2243,8 @@
<image><imagefile>in_quotation_content</imagefile><image>
</quotation>
-<table commandarg="@asis">
-<tableentry><tableterm><item><itemformat command="@asis"><image
where="inline"><imagefile>in_table_item</imagefile><image></itemformat></item>
+<table commandarg="asis">
+<tableentry><tableterm><item><itemformat command="asis"><image
where="inline"><imagefile>in_table_item</imagefile><image></itemformat></item>
</tableterm><tableitem>
<image><imagefile>in_table_def</imagefile><image>
Index: t/results/xtable/accent_on_table_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/accent_on_table_line.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/xtable/accent_on_table_line.pl 8 Sep 2011 22:53:10 -0000
1.13
+++ t/results/xtable/accent_on_table_line.pl 11 Sep 2011 19:05:10 -0000
1.14
@@ -301,9 +301,9 @@
';
-$result_converted{'xml'}->{'accent_on_table_line'} = '<table
commandarg="@asis">
-<tableentry><tableterm><item><itemformat command="@asis">first
item</itemformat></item>
-</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="@asis">no at-command <code>code</code></itemformat></item>
+$result_converted{'xml'}->{'accent_on_table_line'} = '<table commandarg="asis">
+<tableentry><tableterm><item><itemformat command="asis">first
item</itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis">no at-command <code>code</code></itemformat></item>
</tableterm></tableentry></table>
';
Index: t/results/xtable/definfoenclose_on_table_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/xtable/definfoenclose_on_table_line.pl 8 Sep 2011 22:53:10
-0000 1.12
+++ t/results/xtable/definfoenclose_on_table_line.pl 11 Sep 2011 19:05:10
-0000 1.13
@@ -359,9 +359,9 @@
$result_converted{'xml'}->{'definfoenclose_on_table_line'} = '<definfoenclose
command="phi" open=":" close=":"></definfoenclose>
-<table commandarg="@phi" begin=":" end=":">
-<tableentry><tableterm><item><itemformat command="@phi" begin=":"
end=":">item</itemformat></item>
-<itemx><itemformat command="@phi" begin=":" end=":">item
x</itemformat></itemx>
+<table commandarg="phi" begin=":" end=":">
+<tableentry><tableterm><item><itemformat command="phi" begin=":"
end=":">item</itemformat></item>
+<itemx><itemformat command="phi" begin=":" end=":">item x</itemformat></itemx>
</tableterm><tableitem>
<para>table content.
</para></tableitem></tableentry></table>
Index: t/results/xtable/empty_item_itemx.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/empty_item_itemx.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/xtable/empty_item_itemx.pl 8 Sep 2011 22:53:11 -0000
1.16
+++ t/results/xtable/empty_item_itemx.pl 11 Sep 2011 19:05:10 -0000
1.17
@@ -538,15 +538,15 @@
';
-$result_converted{'xml'}->{'empty_item_itemx'} = '<vtable commandarg="@asis">
+$result_converted{'xml'}->{'empty_item_itemx'} = '<vtable commandarg="asis">
<para>VTable
</para>
-<tableentry><tableterm><item><itemformat command="@asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx><itemformat command="@asis"></itemformat></itemx>
-<itemx><itemformat command="@asis"><indexterm index="vr">after an empty itemx,
before an empty item</indexterm>after an empty itemx, before an empty
item</itemformat></itemx>
-</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="@asis"> </itemformat></item>
-</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="@asis"><indexterm index="vr">in item before end table</indexterm>in
item before end table</itemformat></item>
+<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
+<itemx><itemformat command="asis"></itemformat></itemx>
+<itemx><itemformat command="asis"><indexterm index="vr">after an empty itemx,
before an empty item</indexterm>after an empty itemx, before an empty
item</itemformat></itemx>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis"> </itemformat></item>
+</tableterm></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">in item before end table</indexterm>in
item before end table</itemformat></item>
</tableterm></tableentry></vtable>
';
Index: t/results/xtable/inter_item_commands_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/xtable/inter_item_commands_in_table.pl 8 Sep 2011 22:53:11
-0000 1.14
+++ t/results/xtable/inter_item_commands_in_table.pl 11 Sep 2011 19:05:10
-0000 1.15
@@ -1845,46 +1845,46 @@
';
-$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<vtable
commandarg="@code">
+$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<vtable
commandarg="code">
<!-- comment in table -->
-<tableentry><tableterm><item><itemformat command="@code"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<tableentry><tableterm><item><itemformat command="code"><indexterm
index="vr">a</indexterm>a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
-<vtable commandarg="@asis">
-<tableentry><tableterm><item><itemformat command="@asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
+<vtable commandarg="asis">
+<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">a</indexterm>a</itemformat></item>
<!-- comment between item and itemx -->
-<itemx><itemformat command="@asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
+<itemx><itemformat command="asis"><indexterm
index="vr">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></vtable>
-<ftable commandarg="@var">
-<tableentry><tableterm><item><itemformat command="@var"><indexterm
index="fn">a</indexterm>a</itemformat></item>
+<ftable commandarg="var">
+<tableentry><tableterm><item><itemformat command="var"><indexterm
index="fn">a</indexterm>a</itemformat></item>
<cindex index="cp"><indexterm index="cp">index entry between item and
itemx</indexterm></cindex>
<!-- and a comment -->
<!-- and another comment -->
-<itemx><itemformat command="@var"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
+<itemx><itemformat command="var"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
-</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@var"><indexterm index="fn">c</indexterm>c</itemformat></item>
+</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="var"><indexterm index="fn">c</indexterm>c</itemformat></item>
<!-- comment between lines -->
-<itemx><itemformat command="@var"><indexterm
index="fn">d</indexterm>d</itemformat></itemx>
+<itemx><itemformat command="var"><indexterm
index="fn">d</indexterm>d</itemformat></itemx>
</tableterm><tableitem>
<!-- comment at end -->
</tableitem></tableentry></ftable>
-<table commandarg="@code">
+<table commandarg="code">
<cindex index="cp"><indexterm index="cp">cindex in table</indexterm></cindex>
<!-- comment in table -->
-<tableentry><tableterm><item><itemformat
command="@code">abb</itemformat></item>
+<tableentry><tableterm><item><itemformat command="code">abb</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
-<table commandarg="@code">
+<table commandarg="code">
<cindex index="cp"><indexterm index="cp">cindex in table</indexterm></cindex>
<para>Texte before first item.
-</para><tableentry><tableterm><item><itemformat
command="@code">abb</itemformat></item>
+</para><tableentry><tableterm><item><itemformat
command="code">abb</itemformat></item>
</tableterm></tableentry></table>
';
Index: t/results/xtable/long_item.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/long_item.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/xtable/long_item.pl 8 Sep 2011 22:53:11 -0000 1.11
+++ t/results/xtable/long_item.pl 11 Sep 2011 19:05:10 -0000 1.12
@@ -246,9 +246,9 @@
';
-$result_converted{'xml'}->{'long_item'} = '<table commandarg="@emph">
-<tableentry><tableterm><item><itemformat command="@emph">first item
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa</itemformat></item>
-<itemx><itemformat command="@emph">second itemx bbbbbbbbbbbbbbbbbbbbbbbbbbbbb
b b b b b b b b b b b b b</itemformat></itemx>
+$result_converted{'xml'}->{'long_item'} = '<table commandarg="emph">
+<tableentry><tableterm><item><itemformat command="emph">first item
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa</itemformat></item>
+<itemx><itemformat command="emph">second itemx bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b
b b b b b b b b b b b b</itemformat></itemx>
</tableterm><tableitem>
<para>Text.
</para></tableitem></tableentry></table>
Index: t/results/xtable/table_nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/table_nested.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/xtable/table_nested.pl 10 Sep 2011 11:17:27 -0000 1.13
+++ t/results/xtable/table_nested.pl 11 Sep 2011 19:05:10 -0000 1.14
@@ -3311,24 +3311,24 @@
<para>Quotation
</para><quotation>
-<vtable commandarg="@asis">
-<tableentry><tableterm><item><itemformat command="@asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx><itemformat command="@asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
+<vtable commandarg="asis">
+<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
+<itemx><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
</tableterm><tableitem>
<para>Text.
</para>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
</tableterm><tableitem>
<para>Text 2
</para>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
</tableterm></tableentry></vtable>
<para>Something.
-</para><table commandarg="@emph">
-<tableentry><tableterm><item><itemformat command="@emph">in
item</itemformat></item>
+</para><table commandarg="emph">
+<tableentry><tableterm><item><itemformat command="emph">in
item</itemformat></item>
</tableterm><tableitem><para>Text without blank line
-</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@emph">second item</itemformat></item>
+</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">second item</itemformat></item>
</tableterm><tableitem><para>Text without blank line 2
</para></tableitem></tableentry></table>
<para>After table.
@@ -3336,24 +3336,24 @@
<para>Example
</para><example>
-<vtable commandarg="@asis">
-<tableentry><tableterm><item><itemformat command="@asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx><itemformat command="@asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
+<vtable commandarg="asis">
+<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
+<itemx><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
</tableterm><tableitem><pre xml:space="preserve">
Text.
-</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">
Text 2
-</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
</tableterm></tableentry></vtable>
<pre xml:space="preserve">
Something.
-</pre><table commandarg="@emph">
-<tableentry><tableterm><item><itemformat command="@emph">in
item</itemformat></item>
+</pre><table commandarg="emph">
+<tableentry><tableterm><item><itemformat command="emph">in
item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">Text without blank line
-</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@emph">second item</itemformat></item>
+</pre></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">second item</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">Text without blank line 2
</pre></tableitem></tableentry></table>
<pre xml:space="preserve">After table.
@@ -3362,24 +3362,24 @@
<para>Double quotation
</para><quotation>
<quotation>
-<vtable commandarg="@asis">
-<tableentry><tableterm><item><itemformat command="@asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
-<itemx><itemformat command="@asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
+<vtable commandarg="asis">
+<tableentry><tableterm><item><itemformat command="asis"><indexterm
index="vr">first item</indexterm>first item</itemformat></item>
+<itemx><itemformat command="asis"><indexterm index="vr">second
itemx</indexterm>second itemx</itemformat></itemx>
</tableterm><tableitem>
<para>Text.
</para>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">second item</indexterm>second
item</itemformat></item>
</tableterm><tableitem>
<para>Text 2
</para>
-</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
+</tableitem></tableentry><tableentry><tableterm><item><itemformat
command="asis"><indexterm index="vr">last</indexterm>last</itemformat></item>
</tableterm></tableentry></vtable>
<para>Something.
-</para><table commandarg="@emph">
-<tableentry><tableterm><item><itemformat command="@emph">in
item</itemformat></item>
+</para><table commandarg="emph">
+<tableentry><tableterm><item><itemformat command="emph">in
item</itemformat></item>
</tableterm><tableitem><para>Text without blank line
-</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="@emph">second item</itemformat></item>
+</para></tableitem></tableentry><tableentry><tableterm><item><itemformat
command="emph">second item</itemformat></item>
</tableterm><tableitem><para>Text without blank line 2
</para></tableitem></tableentry></table>
<para>After table.
- texinfo/tp Texinfo/Convert/DocBook.pm Texinfo/C...,
Patrice Dumas <=