[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), util/texinfo.dtd: if the @itemize or @*table command as argument was added, add a automaticcommandarg attribute set to on. |
|
Date: |
Sun, 11 Dec 2022 19:01:02 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 52df8e2b3a * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
util/texinfo.dtd: if the @itemize or @*table command as argument was added, add
a automaticcommandarg attribute set to on.
52df8e2b3a is described below
commit 52df8e2b3aa11b67c8fbe87d132b29428d9ef9c0
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Dec 12 01:00:50 2022 +0100
* tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), util/texinfo.dtd: if
the @itemize or @*table command as argument was added, add a
automaticcommandarg attribute set to on.
* util/txixml2texi.pl: add a space after @*table and before the
formatting command if there is not already one.
---
ChangeLog | 9 ++++++
tp/Texinfo/Convert/TexinfoMarkup.pm | 4 +++
tp/t/results/coverage/item_container.pl | 2 +-
.../itemx_in_itemize_enumerate_in_table.pl | 2 +-
.../invalid_nestings/section_on_itemize_line.pl | 2 +-
.../invalid_nestings/section_on_xtable_line.pl | 6 ++--
.../itemize/comment_first_on_itemize_line.pl | 2 +-
tp/t/results/itemize/itemize_and_empty_lines.pl | 2 +-
.../menu/block_commands_in_menu_description.pl | 2 +-
tp/t/results/xml_tests/comments_end_lines.pl | 2 +-
.../xml_tests/comments_on_block_command_lines.pl | 2 +-
tp/t/results/xtable/accent_on_table_line.pl | 14 +++++-----
.../res_parser/formatting_xml/formatting.xml | 32 +++++++++++-----------
util/texinfo.dtd | 2 ++
util/txixml2texi.pl | 3 ++
15 files changed, 52 insertions(+), 34 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fb07e97b3d..53102f616e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-12-11 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), util/texinfo.dtd: if
+ the @itemize or @*table command as argument was added, add a
+ automaticcommandarg attribute set to on.
+
+ * util/txixml2texi.pl: add a space after @*table and before the
+ formatting command if there is not already one.
+
2022-12-11 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): do not add an
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index ce8ee35005..938dc8c44c 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1265,6 +1265,10 @@ sub _convert($$;$)
push @$attribute,
(['commandarg', $command_as_arg->{'cmdname'}],
$self->_infoenclose_attribute($command_as_arg));
+ if ($command_as_arg->{'type'}
+ and $command_as_arg->{'type'} eq 'command_as_argument_inserted') {
+ push @$attribute, ['automaticcommandarg', 'on'];
+ }
} elsif ($element->{'extra'}
and $element->{'extra'}->{'enumerate_specification'}) {
push @$attribute, ['first',
diff --git a/tp/t/results/coverage/item_container.pl
b/tp/t/results/coverage/item_container.pl
index 294acb2880..872a19b712 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -355,7 +355,7 @@ $result_converted{'xml'}->{'item_container'} = '
<para>b&textndash;ullet
</para></listitem></itemize>
-<itemize commandarg="bullet" endspaces=" "><itemprepend><formattingcommand
command="bullet" automatic="on"/></itemprepend>
+<itemize commandarg="bullet" automaticcommandarg="on" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
<listitem><prepend>•</prepend> <para>no itemize argument
</para></listitem></itemize>
';
diff --git
a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
index 9483bcd284..4e4e19890b 100644
--- a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
+++ b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
@@ -395,7 +395,7 @@
$result_converted{'xml'}->{'itemx_in_itemize_enumerate_in_table'} = '<table comm
<tableentry><tableterm><item spaces=" "><itemformat
command="strong">item</itemformat></item>
</tableterm><tableitem>
<para>In item, nested itemize
-</para><itemize commandarg="bullet" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
+</para><itemize commandarg="bullet" automaticcommandarg="on" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
<beforefirstitem></beforefirstitem></itemize>
<enumerate first="1" endspaces=" ">
diff --git a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
index e4383bb1cc..d361ff9e1e 100644
--- a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -491,7 +491,7 @@ $result_converted{'xml'}->{'section_on_itemize_line'} =
'<itemize commandarg="mi
</section>
<section spaces=" "><sectiontitle>second</sectiontitle>
-<itemize commandarg="bullet" spaces=" "><itemprepend><formattingcommand
command="bullet" automatic="on"/></itemprepend>
+<itemize commandarg="bullet" automaticcommandarg="on" spaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
</itemize>
</section>
<section spaces=" "><sectiontitle>third</sectiontitle>
diff --git a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
index 654a34333c..b21ddcfb60 100644
--- a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
@@ -511,10 +511,10 @@
$result_converted{'plaintext'}->{'section_on_xtable_line'} = '1 first
';
-$result_converted{'xml'}->{'section_on_xtable_line'} = '<vtable
commandarg="asis" spaces=" "></vtable>
+$result_converted{'xml'}->{'section_on_xtable_line'} = '<vtable
commandarg="asis" automaticcommandarg="on" spaces=" "></vtable>
<section spaces=" "><sectiontitle>first</sectiontitle>
-<table commandarg="asis" spaces=" "> </table>
+<table commandarg="asis" automaticcommandarg="on" spaces=" "> </table>
</section>
<section spaces=" "><sectiontitle>second</sectiontitle>
@@ -522,7 +522,7 @@ $result_converted{'xml'}->{'section_on_xtable_line'} =
'<vtable commandarg="asis
</section>
<section spaces=" "><sectiontitle>third</sectiontitle>
-<ftable commandarg="asis" spaces=" "></ftable>
+<ftable commandarg="asis" automaticcommandarg="on" spaces=" "></ftable>
</section>
<section spaces=" "><sectiontitle>fourth</sectiontitle>
</section>
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index cc191e98e1..44ca1e0d09 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -142,7 +142,7 @@
$result_converted{'html_text'}->{'comment_first_on_itemize_line'} = '<ul class="
';
-$result_converted{'xml'}->{'comment_first_on_itemize_line'} = '<itemize
commandarg="bullet" spaces=" " endspaces=" "><itemprepend><formattingcommand
command="bullet" automatic="on"/></itemprepend><!-- c comment on itemize line
-->
+$result_converted{'xml'}->{'comment_first_on_itemize_line'} = '<itemize
commandarg="bullet" automaticcommandarg="on" spaces=" " endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend><!-- c comment on itemize line -->
<listitem><prepend>•</prepend> <para>first
</para></listitem></itemize>
';
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index 1efb7dc8f3..ecdefc364c 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -1644,7 +1644,7 @@ end example.
</para></quotation>
</listitem></itemize>
-<itemize commandarg="bullet" endspaces=" "><itemprepend><formattingcommand
command="bullet" automatic="on"/></itemprepend>
+<itemize commandarg="bullet" automaticcommandarg="on" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
<listitem><prepend>•</prepend> <para>first item
</para></listitem><listitem><prepend>•</prepend>
<example endspaces=" ">
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl
b/tp/t/results/menu/block_commands_in_menu_description.pl
index f328aa136a..51c31a916d 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -772,7 +772,7 @@
$result_converted{'xml'}->{'block_commands_in_menu_description'} = '<node name="
<menu endspaces=" ">
<menuentry><menuleadingtext>*
</menuleadingtext><menunode>(manual)</menunode><menuseparator>::</menuseparator><menudescription><pre
xml:space="preserve">
-</pre><itemize commandarg="bullet" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
+</pre><itemize commandarg="bullet" automaticcommandarg="on" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
<beforefirstitem><pre xml:space="preserve">
</pre></beforefirstitem><listitem><prepend>•</prepend><pre
xml:space="preserve"> in item
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl
b/tp/t/results/xml_tests/comments_end_lines.pl
index 43a05ad5c5..8a000bab90 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -1048,7 +1048,7 @@ $result_floats{'comments_end_lines'} = {
-$result_converted{'xml'}->{'comments_end_lines'} = '<itemize
commandarg="bullet" endspaces=" "><itemprepend><formattingcommand
command="bullet" automatic="on"/></itemprepend>
+$result_converted{'xml'}->{'comments_end_lines'} = '<itemize
commandarg="bullet" automaticcommandarg="on" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
<listitem><prepend>•</prepend> <para>itemize it
</para></listitem></itemize> <!-- c comment itemize -->
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index 1c343895b6..6314911305 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -2256,7 +2256,7 @@ $result_floats{'comments_on_block_command_lines'} = {
-$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize
commandarg="bullet" spaces=" " endspaces=" "><itemprepend><formattingcommand
command="bullet" automatic="on"/></itemprepend><!-- c comm -->
+$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize
commandarg="bullet" automaticcommandarg="on" spaces=" " endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend><!-- c comm -->
<listitem><prepend>•</prepend> <para>itemize it
</para></listitem></itemize>
diff --git a/tp/t/results/xtable/accent_on_table_line.pl
b/tp/t/results/xtable/accent_on_table_line.pl
index b800f6056d..be1be6caad 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -1115,33 +1115,33 @@
$result_converted{'html_text'}->{'accent_on_table_line'} = '<dl class="table">
';
-$result_converted{'xml'}->{'accent_on_table_line'} = '<table commandarg="asis"
spaces=" " endspaces=" ">
+$result_converted{'xml'}->{'accent_on_table_line'} = '<table commandarg="asis"
automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis">first
item</itemformat></item>
</tableterm></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis">no at-command <code>code</code></itemformat></item>
</tableterm></tableentry></table>
-<table commandarg="asis" spaces=" " endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis">acc brace
first item</itemformat></item>
</tableterm></tableentry><tableentry><tableterm><item spaces=" "><itemformat
command="asis">no at-command <code>code acc brace</code></itemformat></item>
</tableterm></tableentry></table>
-<table commandarg="asis" spaces=" " endspaces=" "><!-- comment -->
+<table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces="
"><!-- comment -->
<tableentry><tableterm><item spaces=" "><itemformat command="asis">acc comment
first item</itemformat></item>
</tableterm></tableentry></table>
-<table commandarg="asis" spaces=" " endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis">acc space
first item</itemformat></item>
</tableterm></tableentry></table>
-<table commandarg="asis" spaces=" " endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis">cmdacc
first item</itemformat></item>
</tableterm></tableentry></table>
-<table commandarg="asis" spaces=" " endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis">cmdacc
braces first item</itemformat></item>
</tableterm></tableentry></table>
-<table commandarg="asis" spaces=" " endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis">cmdacc
braces arg first item</itemformat></item>
</tableterm></tableentry></table>
';
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index f550b395ec..24721d4502 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -1645,7 +1645,7 @@ quotation
<para>something, other thing
</para></smallquotation>
-<itemize commandarg="bullet" endspaces=" "><itemprepend><formattingcommand
command="bullet" automatic="on"/></itemprepend>
+<itemize commandarg="bullet" automaticcommandarg="on" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
<listitem><prepend>•</prepend> <para>i&textndash;temize
</para></listitem></itemize>
@@ -2283,21 +2283,21 @@ in verbatim ''
</para></listitem></itemize>
<!-- c not style formatting -->
-<table commandarg="asis" spaces=" " endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><!-- c comment in table -->
<item spaces=" "><itemformat command="asis">a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<!-- c missing style formatting -->
-<table commandarg="asis" endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" endspaces=" ">
<tableentry><tableterm><!-- c comment in table -->
<item spaces=" "><itemformat command="asis">a&textndash;missing style
formatting</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<!-- c not style formatting -->
-<ftable commandarg="asis" spaces=" " endspaces=" ">
+<ftable commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn" number="44">a</indexterm>a</itemformat></item>
<cindex index="cp" spaces=" "><indexterm index="cp" number="7">index entry
between item and itemx</indexterm></cindex>
<itemx spaces=" "><itemformat command="asis"><indexterm index="fn"
number="45">b</indexterm>b</itemformat></itemx>
@@ -2797,7 +2797,7 @@ quotation
<para>something, other thing
</para></smallquotation>
-<itemize commandarg="bullet" endspaces=" "><itemprepend><formattingcommand
command="bullet" automatic="on"/></itemprepend>
+<itemize commandarg="bullet" automaticcommandarg="on" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
<listitem><prepend>•</prepend> <para>i&textndash;temize
</para></listitem></itemize>
@@ -3435,21 +3435,21 @@ in verbatim ''
</para></listitem></itemize>
<!-- c not style formatting -->
-<table commandarg="asis" spaces=" " endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><!-- c comment in table -->
<item spaces=" "><itemformat command="asis">a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<!-- c missing style formatting -->
-<table commandarg="asis" endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" endspaces=" ">
<tableentry><tableterm><!-- c comment in table -->
<item spaces=" "><itemformat command="asis">a&textndash;missing style
formatting</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<!-- c not style formatting -->
-<ftable commandarg="asis" spaces=" " endspaces=" ">
+<ftable commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn" number="96">a</indexterm>a</itemformat></item>
<cindex index="cp" spaces=" "><indexterm index="cp" number="14">index entry
between item and itemx</indexterm></cindex>
<itemx spaces=" "><itemformat command="asis"><indexterm index="fn"
number="97">b</indexterm>b</itemformat></itemx>
@@ -3979,7 +3979,7 @@ quotation
<para>something, other thing
</para></smallquotation>
-<itemize commandarg="bullet" endspaces=" "><itemprepend><formattingcommand
command="bullet" automatic="on"/></itemprepend>
+<itemize commandarg="bullet" automaticcommandarg="on" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
<listitem><prepend>•</prepend> <para>i&textndash;temize
</para></listitem></itemize>
@@ -4617,21 +4617,21 @@ in verbatim ''
</para></listitem></itemize>
<!-- c not style formatting -->
-<table commandarg="asis" spaces=" " endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><!-- c comment in table -->
<item spaces=" "><itemformat command="asis">a</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<!-- c missing style formatting -->
-<table commandarg="asis" endspaces=" ">
+<table commandarg="asis" automaticcommandarg="on" endspaces=" ">
<tableentry><tableterm><!-- c comment in table -->
<item spaces=" "><itemformat command="asis">a&textndash;missing style
formatting</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<!-- c not style formatting -->
-<ftable commandarg="asis" spaces=" " endspaces=" ">
+<ftable commandarg="asis" automaticcommandarg="on" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn" number="148">a</indexterm>a</itemformat></item>
<cindex index="cp" spaces=" "><indexterm index="cp" number="21">index entry
between item and itemx</indexterm></cindex>
<itemx spaces=" "><itemformat command="asis"><indexterm index="fn"
number="149">b</indexterm>b</itemformat></itemx>
@@ -5126,7 +5126,7 @@ indent in quotation
<pre xml:space="preserve">something, other thing
</pre></smallquotation>
<pre xml:space="preserve">
-</pre><itemize commandarg="bullet" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
+</pre><itemize commandarg="bullet" automaticcommandarg="on" endspaces="
"><itemprepend><formattingcommand command="bullet"
automatic="on"/></itemprepend>
<listitem><prepend>•</prepend><pre xml:space="preserve"> i--temize
</pre></listitem></itemize>
<pre xml:space="preserve">
@@ -5764,21 +5764,21 @@ Invalid use of &arobase;':&linebreak;
</pre></listitem></itemize>
<pre xml:space="preserve">
<!-- c not style formatting -->
-</pre><table commandarg="asis" spaces=" " endspaces=" ">
+</pre><table commandarg="asis" automaticcommandarg="on" spaces=" " endspaces="
">
<beforefirstitem><pre xml:space="preserve"><!-- c comment in table -->
</pre></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">l--ine
</pre></tableitem></tableentry></table>
<pre xml:space="preserve">
<!-- c missing style formatting -->
-</pre><table commandarg="asis" endspaces=" ">
+</pre><table commandarg="asis" automaticcommandarg="on" endspaces=" ">
<beforefirstitem><pre xml:space="preserve"><!-- c comment in table -->
</pre></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="asis">a--missing style formatting</itemformat></item>
</tableterm><tableitem><pre xml:space="preserve">l--ine
</pre></tableitem></tableentry></table>
<pre xml:space="preserve">
<!-- c not style formatting -->
-</pre><ftable commandarg="asis" spaces=" " endspaces=" ">
+</pre><ftable commandarg="asis" automaticcommandarg="on" spaces=" "
endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn" number="200">a</indexterm>a</itemformat></item>
<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm index="cp"
number="28">index entry between item and itemx</indexterm></cindex>
</pre><itemx spaces=" "><itemformat command="asis"><indexterm index="fn"
number="201">b</indexterm>b</itemformat></itemx>
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 8e5f60f2cd..f97369103a 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -817,6 +817,7 @@
(listitem | %indexentry.cmds;)*)>
<!ATTLIST itemize
%spacesblockattr;
+ automaticcommandarg CDATA #IMPLIED
commandarg CDATA #IMPLIED>
<!ELEMENT enumerate (enumeratefirst?, beforefirstitem?,
(listitem | %indexentry.cmds;)*)>
@@ -842,6 +843,7 @@
<!ENTITY % blocktablearg
"%spacesblockattr;
+ automaticcommandarg CDATA #IMPLIED
commandarg CDATA #IMPLIED
begin CDATA #IMPLIED
end CDATA #IMPLIED">
diff --git a/util/txixml2texi.pl b/util/txixml2texi.pl
index bbc5bdd2af..a8b4f3c7d2 100755
--- a/util/txixml2texi.pl
+++ b/util/txixml2texi.pl
@@ -494,6 +494,9 @@ while ($reader->read) {
and $Texinfo::Commands::block_commands{$name} eq 'item_line'
and $reader->hasAttributes()
and defined($reader->getAttribute('commandarg'))) {
+ # happens when formatting command argument is missing and there
+ # are no spaces.
+ print ' ' if ($spaces eq '');
print '@'.$reader->getAttribute('commandarg');
}
} elsif ($reader->nodeType() eq XML_READER_TYPE_END_ELEMENT) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), util/texinfo.dtd: if the @itemize or @*table command as argument was added, add a automaticcommandarg attribute set to on.,
Patrice Dumas <=