[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): add spaces attribute for 'specific' line commands. |
Date: |
Sat, 01 Oct 2022 06:18:49 -0400 |
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 f341f2bca8 * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add
spaces attribute for 'specific' line commands.
f341f2bca8 is described below
commit f341f2bca809dfaf54589bba223ce8b88890c719
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 1 12:18:39 2022 +0200
* tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add spaces attribute
for 'specific' line commands.
---
ChangeLog | 5 ++
tp/Texinfo/Convert/TexinfoMarkup.pm | 2 +-
.../results/converters_tests/at_commands_in_raw.pl | 4 +-
.../converters_tests/frenchspacing_and_code.pl | 4 +-
.../printindex_merged_indices_code_style.pl | 14 ++--
tp/t/results/converters_tests/sp_in_example.pl | 10 +--
.../converters_tests/test_deftypefnnewline.pl | 4 +-
tp/t/results/converters_tests/test_sp.pl | 10 +--
.../converters_tests/things_before_setfilename.pl | 2 +-
.../things_before_setfilename_no_element.pl | 2 +-
.../coverage/punctuation_in_line_commands.pl | 2 +-
.../res_xml/char_latin1_latin1_in_refs.xml | 2 +-
tp/t/results/languages/multiple.pl | 2 +-
.../misc_commands/comment_space_command_on_line.pl | 6 +-
.../misc_commands/definfoenclose_with_empty_arg.pl | 2 +-
.../xml_tests/comments_on_misc_command_line.pl | 4 +-
.../results/xtable/definfoenclose_on_table_line.pl | 2 +-
.../res_parser/formatting_xml/formatting.xml | 90 +++++++++++-----------
18 files changed, 86 insertions(+), 81 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index beee1a61ca..25c0579c31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-10-01 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add spaces attribute
+ for 'specific' line commands.
+
2022-10-01 Patrice Dumas <pertusus@free.fr>
* util/txixml2texi.pl: output spaces explicitly. Output user-defined
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index d438788f3f..41b8165102 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -918,7 +918,7 @@ sub _convert($$;$)
} else {
$args_attributes = ['value'];
}
- my $attribute = [];
+ my $attribute = [_leading_spaces_arg($element)];
my $arg_index = 0;
if (defined($element->{'extra'})
and defined($element->{'extra'}->{'misc_args'})) {
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 5fbe418887..976ca53e69 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1519,8 +1519,8 @@ $result_converted{'xml'}->{'at_commands_in_raw'} = '<node
name="Top" spaces=" ">
</para>
<para> newidx entry
</para>
-<printindex value="cp" line="cp"></printindex>
-<printindex value="fn" line="fn"></printindex>
+<printindex spaces=" " value="cp" line="cp"></printindex>
+<printindex spaces=" " value="fn" line="fn"></printindex>
<listoffloats type="Figs" spaces=" ">Figs</listoffloats>
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 33ee3d90c3..58aceb7f9a 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -2399,7 +2399,7 @@
$result_converted{'html_text'}->{'frenchspacing_and_code'} = '
$result_converted{'xml'}->{'frenchspacing_and_code'} = '
-<frenchspacing value="on" line="on"></frenchspacing>
+<frenchspacing spaces=" " value="on" line="on"></frenchspacing>
<node name="Top" spaces=" "><nodename>Top</nodename><nodenext
automatic="on">chapter frenchspacing</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
@@ -2424,7 +2424,7 @@ $result_converted{'xml'}->{'frenchspacing_and_code'} = '
<definitionitem><para>defop
</para></definitionitem></defop>
-<frenchspacing value="off" line="off"></frenchspacing>
+<frenchspacing spaces=" " value="off" line="off"></frenchspacing>
</chapter>
<node name="chap-no" spaces=" "><nodename>chap no</nodename><nodeprev
automatic="on">chapter frenchspacing</nodeprev><nodeup
automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>Chap no</sectiontitle>
diff --git
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index 45d202b94a..ec9de43243 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -1073,9 +1073,9 @@
$result_converted{'xml'}->{'printindex_merged_indices_code_style'} = '<node name
<node name="chap" spaces=" "><nodename>chap</nodename><nodeprev
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>Chapter</sectiontitle>
-<synindex from="cp" to="fn" line="cp fn"></synindex>
+<synindex spaces=" " from="cp" to="fn" line="cp fn"></synindex>
-<synindex from="vr" to="fn" line="vr fn"></synindex>
+<synindex spaces=" " from="vr" to="fn" line="vr fn"></synindex>
<cindex index="cp" spaces=" "><indexterm index="cp" number="1"
mergedindex="fn">c&textldquo;b</indexterm></cindex>
@@ -1083,19 +1083,19 @@
$result_converted{'xml'}->{'printindex_merged_indices_code_style'} = '<node name
<findex index="fn" spaces=" "><indexterm index="fn"
number="1">f``g</indexterm></findex>
-<defcodeindex value="cdi" line="cdi"></defcodeindex>
+<defcodeindex spaces=" " value="cdi" line="cdi"></defcodeindex>
-<synindex from="cdi" to="fn" line="cdi fn"></synindex>
+<synindex spaces=" " from="cdi" to="fn" line="cdi fn"></synindex>
<indexcommand command="cdiindex" index="cdi" spaces=" "><indexterm index="cdi"
number="1" incode="0"
mergedindex="fn">cdi&textldquo;h</indexterm></indexcommand>
-<defindex value="ddi" line="ddi"></defindex>
+<defindex spaces=" " value="ddi" line="ddi"></defindex>
-<syncodeindex from="ddi" to="cp" line="ddi cp"></syncodeindex>
+<syncodeindex spaces=" " from="ddi" to="cp" line="ddi cp"></syncodeindex>
<indexcommand command="ddiindex" index="ddi" spaces=" "><indexterm index="ddi"
number="1" incode="1" mergedindex="fn">ddi``g</indexterm></indexcommand>
-<printindex value="fn" line="fn"></printindex>
+<printindex spaces=" " value="fn" line="fn"></printindex>
</chapter>
';
diff --git a/tp/t/results/converters_tests/sp_in_example.pl
b/tp/t/results/converters_tests/sp_in_example.pl
index 9b2499df67..d6cac5abc2 100644
--- a/tp/t/results/converters_tests/sp_in_example.pl
+++ b/tp/t/results/converters_tests/sp_in_example.pl
@@ -424,21 +424,21 @@ sp after para
$result_converted{'xml'}->{'sp_in_example'} = '<example endspaces=" ">
<pre xml:space="preserve">Para
-<sp value="1" line="1"></sp>
+<sp spaces=" " value="1" line="1"></sp>
other para
Now lone &arobase;sp:
-<sp value="1" line="1"></sp>
+<sp spaces=" " value="1" line="1"></sp>
-<sp value="2" line="2"></sp>
+<sp spaces=" " value="2" line="2"></sp>
Para after sp
A
-<sp value="2" line="2"></sp>
+<sp spaces=" " value="2" line="2"></sp>
B
sp after para
-<sp value="1" line="1"></sp>
+<sp spaces=" " value="1" line="1"></sp>
</pre></example>
';
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 4d00d5c58c..bc9e5e1582 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3454,7 +3454,7 @@ $result_converted{'html_text'}->{'test_deftypefnnewline'}
= '
$result_converted{'xml'}->{'test_deftypefnnewline'} = '<setfilename
file="test_deftypefnnewline.info" spaces="
">test_deftypefnnewline.info</setfilename>
-<deftypefnnewline value="on" line="on"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="on" line="on"></deftypefnnewline>
<node name="Top" spaces=" "><nodename>Top</nodename><nodenext
automatic="on">chapter</nodenext></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
@@ -3491,7 +3491,7 @@ $result_converted{'xml'}->{'test_deftypefnnewline'} =
'<setfilename file="test_d
<definitionitem><para>fff
</para></definitionitem></deffn>
-<deftypefnnewline value="off" line="off"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="off" line="off"></deftypefnnewline>
<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="6">name2</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>data-type2</deftype>
<deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
<definitionitem><para>aaa2
diff --git a/tp/t/results/converters_tests/test_sp.pl
b/tp/t/results/converters_tests/test_sp.pl
index 0af50ddaf7..628a316e8a 100644
--- a/tp/t/results/converters_tests/test_sp.pl
+++ b/tp/t/results/converters_tests/test_sp.pl
@@ -397,21 +397,21 @@ Now lone @sp:
$result_converted{'xml'}->{'test_sp'} = '<para>Para
-</para><sp value="1" line="1"></sp>
+</para><sp spaces=" " value="1" line="1"></sp>
<para>other para
Now lone &arobase;sp:
</para>
-<sp value="1" line="1"></sp>
+<sp spaces=" " value="1" line="1"></sp>
-<sp value="2" line="2"></sp>
+<sp spaces=" " value="2" line="2"></sp>
<para>Para after sp
</para>
<para>A
-</para><sp value="2" line="2"></sp>
+</para><sp spaces=" " value="2" line="2"></sp>
<para>B
</para>
<para>sp after para
-</para><sp value="1" line="1"></sp>
+</para><sp spaces=" " value="1" line="1"></sp>
';
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl
b/tp/t/results/converters_tests/things_before_setfilename.pl
index fb45caff85..f5bd8ae38f 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1708,7 +1708,7 @@ $result_converted{'xml'}->{'things_before_setfilename'} =
'<preamblebeforebeginn
<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index
entry</indexterm></cindex>
-<printindex value="cp" line="cp"></printindex>
+<printindex spaces=" " value="cp" line="cp"></printindex>
<listoffloats type="Text" spaces=" ">Text</listoffloats>
diff --git
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index 0cc8f6b548..4f5c0adc84 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -1406,7 +1406,7 @@
$result_converted{'xml'}->{'things_before_setfilename_no_element'} = '<preambleb
<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index
entry</indexterm></cindex>
-<printindex value="cp" line="cp"></printindex>
+<printindex spaces=" " value="cp" line="cp"></printindex>
<listoffloats type="Text" spaces=" ">Text</listoffloats>
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 427713f19d..0f5836a461 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1254,7 +1254,7 @@
$result_converted{'xml'}->{'punctuation_in_line_commands'} = '
<center spaces=" ">center! After punc</center>
-<printindex value="cp" line="cp"></printindex>
+<printindex spaces=" " value="cp" line="cp"></printindex>
<contents></contents>
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
index d0af3c40e3..d07cd0d230 100644
---
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
+++
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
@@ -23,7 +23,7 @@
<node name="_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
spaces=" "><nodename>� � � � � � � � � � �</nodename><nodenext
automatic="on">�</nodenext><nodeprev automatic="on">Top</nodeprev><nodeup
automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>� � � � � � � � � � �</sectiontitle>
-<printindex value="cp" line="cp"></printindex>
+<printindex spaces=" " value="cp" line="cp"></printindex>
</chapter>
<node name="_00e9" spaces=" "><nodename>�</nodename><nodenext automatic="on">�
� �</nodenext><nodeprev automatic="on">� � � � � � � � � � �</nodeprev><nodeup
automatic="on">Top</nodeup></node>
diff --git a/tp/t/results/languages/multiple.pl
b/tp/t/results/languages/multiple.pl
index 42fe06ab7f..bf23b3a58c 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -1525,7 +1525,7 @@ $result_converted{'xml'}->{'multiple'} =
'<documentlanguage xml:lang="fr" spaces
<insertcopying></insertcopying>
-<printindex value="vr" line="vr"></printindex>
+<printindex spaces=" " value="vr" line="vr"></printindex>
</chapter>
';
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index 36a89989a0..644325014f 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -1273,15 +1273,15 @@
$result_converted{'xml'}->{'comment_space_command_on_line'} = '<settitle spaces=
<node name="chap" spaces=" "><nodename trailingspaces="
">chap</nodename><nodeprev automatic="on">Top</nodeprev><nodeup
automatic="on">Top</nodeup></node><!-- comment @node chap -->
<chapter spaces=" "><sectiontitle>Chapter<spacecmd type="spc"/>
</sectiontitle><!-- comment @chapter -->
-<frenchspacing value="on" line="on @c comment
frenchspacing"></frenchspacing><!-- c comment frenchspacing -->
+<frenchspacing spaces=" " value="on" line="on @c comment
frenchspacing"></frenchspacing><!-- c comment frenchspacing -->
-<microtype value="off" line="off@c comment microtype"></microtype><!-- c
comment microtype -->
+<microtype spaces=" " value="off" line="off@c comment
microtype"></microtype><!-- c comment microtype -->
<cindex index="cp" spaces=" "><indexterm index="cp" number="1">index entry
<spacecmd type="spc"/></indexterm></cindex><!-- c index entry -->
<heading spaces=" ">Heading <spacecmd type="spc"/> </heading><!-- c heading
-->
-<printindex value="cp" line="cp @c printindex "></printindex><!-- c printindex
-->
+<printindex spaces=" " value="cp" line="cp @c printindex "></printindex><!-- c
printindex -->
<float name="label" type="Text" number="1.1" spaces=" " endspaces="
"><floattype>Text</floattype><floatname spaces=" ">label</floatname>
<para>float
diff --git a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
index 3f9f195754..02b85be18e 100644
--- a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
+++ b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
@@ -215,7 +215,7 @@ My something.
$result_converted{'xml'}->{'definfoenclose_with_empty_arg'} = '
-<definfoenclose command="headword" open="" close=":" line="headword, ,
:"></definfoenclose>
+<definfoenclose spaces=" " command="headword" open="" close=":"
line="headword, , :"></definfoenclose>
<para>My <infoenclose command="headword" begin=""
end=":">something</infoenclose>.
</para>
diff --git a/tp/t/results/xml_tests/comments_on_misc_command_line.pl
b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
index 06ebeb651e..a18a9e9d02 100644
--- a/tp/t/results/xml_tests/comments_on_misc_command_line.pl
+++ b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
@@ -419,8 +419,8 @@ $result_floats{'comments_on_misc_command_line'} = {};
$result_converted{'xml'}->{'comments_on_misc_command_line'} = '<setfilename
file="comments_on_misc_command_line.info" spaces="
">comments_on_misc_command_line.info </setfilename><!-- c setfilename (text)
-->
-<definfoenclose command="phoo" open=";" close=":" line="phoo,;,: @c
definfoenclose (number)"></definfoenclose><!-- c definfoenclose (number) -->
-<firstparagraphindent value="none" line="none @c c
(number)"></firstparagraphindent><!-- c c (number) -->
+<definfoenclose spaces=" " command="phoo" open=";" close=":" line="phoo,;,:
@c definfoenclose (number)"></definfoenclose><!-- c definfoenclose (number) -->
+<firstparagraphindent spaces=" " value="none" line="none @c c
(number)"></firstparagraphindent><!-- c c (number) -->
<raisesections line=" @c raisesections (skipline)"></raisesections>
<insertcopying line=" @comment (noarg)"></insertcopying>
<pagesizes spaces=" ">200mm </pagesizes><!-- c pagesizes (line) -->
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index e59bbd438d..993183e3a2 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -303,7 +303,7 @@
$result_converted{'html_text'}->{'definfoenclose_on_table_line'} = '
';
-$result_converted{'xml'}->{'definfoenclose_on_table_line'} = '<definfoenclose
command="phi" open=":" close=":" line="phi,:,:"></definfoenclose>
+$result_converted{'xml'}->{'definfoenclose_on_table_line'} = '<definfoenclose
spaces=" " command="phi" open=":" close=":" line="phi,:,:"></definfoenclose>
<table commandarg="phi" begin=":" end=":" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="phi" begin=":"
end=":">item</itemformat></item>
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 1117916b97..9c741d54b7 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -16,8 +16,8 @@
<command>cmd</command> <accent type="grave"
bracketed="off">a</accent>
</pre></menudescription></menuentry></direntry>
-<defindex value="truc" line="truc"></defindex>
-<defcodeindex value="codeidx" line="codeidx"></defcodeindex>
+<defindex spaces=" " value="truc" line="truc"></defindex>
+<defcodeindex spaces=" " value="codeidx" line="codeidx"></defcodeindex>
<macro name="mymacro" line=" mymacro" endspaces=" ">
<
@@ -1408,12 +1408,12 @@ but , ,&noeos;
<code>&arobase;footnote{in footnote2}</code> <footnote><para>in
footnote2</para></footnote>
</para>
<para><code>&arobase;sp 2</code>&linebreak;
-</para><sp value="2" line="2"></sp>
+</para><sp spaces=" " value="2" line="2"></sp>
<para><code>&arobase;page</code>&linebreak;
</para><page></page>
<para><code>need 1002</code>
-</para><need value="1002" line="1002"></need>
+</para><need spaces=" " value="1002" line="1002"></need>
<para><code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="arrow"/> A</clicksequence>
<clickstyle command="result" line=" @result">@result</clickstyle>
@@ -1486,7 +1486,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
-<kbdinputstyle value="code" line="code"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="code" line="code"></kbdinputstyle>
<para><kbd>code kbdinputstyle</kbd>
</para><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="3" mergedindex="cp">vtable i--tem code
kbdinputstyle</indexterm>vtable i--tem code kbdinputstyle</itemformat></item>
@@ -1499,7 +1499,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
-<kbdinputstyle value="example" line="example"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="example" line="example"></kbdinputstyle>
<para><kbd>example kbdinputstyle</kbd>
</para><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="5" mergedindex="cp">vtable i--tem example
kbdinputstyle</indexterm>vtable i--tem example kbdinputstyle</itemformat></item>
@@ -1512,7 +1512,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
-<kbdinputstyle value="distinct" line="distinct"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="distinct" line="distinct"></kbdinputstyle>
<para><kbd>distinct kbdinputstyle</kbd>
</para><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="7" mergedindex="cp">vtable i--tem distinct
kbdinputstyle</indexterm>vtable i--tem distinct
kbdinputstyle</itemformat></item>
@@ -1817,7 +1817,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="17">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
-<deftypefnnewline value="off" line="off"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="off" line="off"></deftypefnnewline>
<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="18">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
</deffn>
@@ -1943,7 +1943,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
-<deftypefnnewline value="on" line="on"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="on" line="on"></deftypefnnewline>
<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="37">name2</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>data-type2</deftype>
<deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
<definitionitem><para>aaa2
@@ -1973,7 +1973,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<definitionitem><para>fff2
</para></definitionitem></deffn>
-<deftypefnnewline value="off" line="off"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="off" line="off"></deftypefnnewline>
<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code> <xref
label="c_002d_002d_002dhapter_0040" manual="file
n---ame@"><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname
spaces=" ">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc
spaces=" ">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces="
">file n [...]
<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
@@ -2547,12 +2547,12 @@ but , ,&noeos;
<code>&arobase;footnote{in footnote2}</code> <footnote><para>in
footnote2</para></footnote>
</para>
<para><code>&arobase;sp 2</code>&linebreak;
-</para><sp value="2" line="2"></sp>
+</para><sp spaces=" " value="2" line="2"></sp>
<para><code>&arobase;page</code>&linebreak;
</para><page></page>
<para><code>need 1002</code>
-</para><need value="1002" line="1002"></need>
+</para><need spaces=" " value="1002" line="1002"></need>
<para><code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="arrow"/> A</clicksequence>
<clickstyle command="result" line=" @result">@result</clickstyle>
@@ -2625,7 +2625,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
-<kbdinputstyle value="code" line="code"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="code" line="code"></kbdinputstyle>
<para><kbd>code kbdinputstyle</kbd>
</para><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="27" mergedindex="cp">vtable i--tem code
kbdinputstyle</indexterm>vtable i--tem code kbdinputstyle</itemformat></item>
@@ -2638,7 +2638,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
-<kbdinputstyle value="example" line="example"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="example" line="example"></kbdinputstyle>
<para><kbd>example kbdinputstyle</kbd>
</para><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="29" mergedindex="cp">vtable i--tem example
kbdinputstyle</indexterm>vtable i--tem example kbdinputstyle</itemformat></item>
@@ -2651,7 +2651,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
-<kbdinputstyle value="distinct" line="distinct"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="distinct" line="distinct"></kbdinputstyle>
<para><kbd>distinct kbdinputstyle</kbd>
</para><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="31" mergedindex="cp">vtable i--tem distinct
kbdinputstyle</indexterm>vtable i--tem distinct
kbdinputstyle</itemformat></item>
@@ -2956,7 +2956,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="69">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
-<deftypefnnewline value="off" line="off"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="off" line="off"></deftypefnnewline>
<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="70">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
</deffn>
@@ -3082,7 +3082,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
-<deftypefnnewline value="on" line="on"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="on" line="on"></deftypefnnewline>
<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="89">name2</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>data-type2</deftype>
<deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
<definitionitem><para>aaa2
@@ -3112,7 +3112,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<definitionitem><para>fff2
</para></definitionitem></deffn>
-<deftypefnnewline value="off" line="off"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="off" line="off"></deftypefnnewline>
<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code> <xref
label="c_002d_002d_002dhapter_0040" manual="file
n---ame@"><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname
spaces=" ">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc
spaces=" ">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces="
">file n [...]
<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
@@ -3713,12 +3713,12 @@ but , ,&noeos;
<code>&arobase;footnote{in footnote2}</code> <footnote><para>in
footnote2</para></footnote>
</para>
<para><code>&arobase;sp 2</code>&linebreak;
-</para><sp value="2" line="2"></sp>
+</para><sp spaces=" " value="2" line="2"></sp>
<para><code>&arobase;page</code>&linebreak;
</para><page></page>
<para><code>need 1002</code>
-</para><need value="1002" line="1002"></need>
+</para><need spaces=" " value="1002" line="1002"></need>
<para><code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="arrow"/> A</clicksequence>
<clickstyle command="result" line=" @result">@result</clickstyle>
@@ -3791,7 +3791,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
-<kbdinputstyle value="code" line="code"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="code" line="code"></kbdinputstyle>
<para><kbd>code kbdinputstyle</kbd>
</para><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="51" mergedindex="cp">vtable i--tem code
kbdinputstyle</indexterm>vtable i--tem code kbdinputstyle</itemformat></item>
@@ -3804,7 +3804,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
-<kbdinputstyle value="example" line="example"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="example" line="example"></kbdinputstyle>
<para><kbd>example kbdinputstyle</kbd>
</para><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="53" mergedindex="cp">vtable i--tem example
kbdinputstyle</indexterm>vtable i--tem example kbdinputstyle</itemformat></item>
@@ -3817,7 +3817,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
-<kbdinputstyle value="distinct" line="distinct"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="distinct" line="distinct"></kbdinputstyle>
<para><kbd>distinct kbdinputstyle</kbd>
</para><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="55" mergedindex="cp">vtable i--tem distinct
kbdinputstyle</indexterm>vtable i--tem distinct
kbdinputstyle</itemformat></item>
@@ -4122,7 +4122,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="121">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
-<deftypefnnewline value="off" line="off"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="off" line="off"></deftypefnnewline>
<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="122">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
</deffn>
@@ -4248,7 +4248,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
-<deftypefnnewline value="on" line="on"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="on" line="on"></deftypefnnewline>
<deftypefun spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="141">name2</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>data-type2</deftype>
<deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
<definitionitem><para>aaa2
@@ -4278,7 +4278,7 @@ $ wget
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
<definitionitem><para>fff2
</para></definitionitem></deffn>
-<deftypefnnewline value="off" line="off"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="off" line="off"></deftypefnnewline>
<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code> <xref
label="c_002d_002d_002dhapter_0040" manual="file
n---ame@"><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname
spaces=" ">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc
spaces=" ">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces="
">file n [...]
<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
@@ -4847,12 +4847,12 @@ but , ,&noeos;
<code>&arobase;footnote{in footnote2}</code> <footnote><para>in
footnote2</para></footnote>
<code>&arobase;sp 2</code>&linebreak;
-<sp value="2" line="2"></sp>
+<sp spaces=" " value="2" line="2"></sp>
<code>&arobase;page</code>&linebreak;
</pre><page></page>
<pre xml:space="preserve">
<code>need 1002</code>
-</pre><need value="1002" line="1002"></need>
+</pre><need spaces=" " value="1002" line="1002"></need>
<pre xml:space="preserve">
<code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="arrow"/> A</clicksequence>
<clickstyle command="result" line=" @result">@result</clickstyle>
@@ -4925,7 +4925,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
<pre xml:space="preserve">
-<kbdinputstyle value="code" line="code"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="code" line="code"></kbdinputstyle>
<kbd>code kbdinputstyle</kbd>
</pre><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="75" mergedindex="cp">vtable i--tem code
kbdinputstyle</indexterm>vtable i--tem code kbdinputstyle</itemformat></item>
@@ -4938,7 +4938,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
<pre xml:space="preserve">
-<kbdinputstyle value="example" line="example"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="example" line="example"></kbdinputstyle>
<kbd>example kbdinputstyle</kbd>
</pre><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="77" mergedindex="cp">vtable i--tem example
kbdinputstyle</indexterm>vtable i--tem example kbdinputstyle</itemformat></item>
@@ -4951,7 +4951,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e<sup>-{1 \over
2}\left({x-\mu \over \sigma}\
</tableterm></tableentry></vtable>
</example>
<pre xml:space="preserve">
-<kbdinputstyle value="distinct" line="distinct"></kbdinputstyle>
+<kbdinputstyle spaces=" " value="distinct" line="distinct"></kbdinputstyle>
<kbd>distinct kbdinputstyle</kbd>
</pre><vtable commandarg="kbd" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="kbd"><indexterm
index="vr" number="79" mergedindex="cp">vtable i--tem distinct
kbdinputstyle</indexterm>vtable i--tem distinct
kbdinputstyle</itemformat></item>
@@ -5256,7 +5256,7 @@ Less recent versions are also present.
<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="173">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
<pre xml:space="preserve">
-<deftypefnnewline value="off" line="off"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="off" line="off"></deftypefnnewline>
</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="174">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
</deffn>
@@ -5382,7 +5382,7 @@ text in def item for second def item
<definitionitem><pre xml:space="preserve">d--eftypemethod
</pre></definitionitem></deftypemethod>
<pre xml:space="preserve">
-<deftypefnnewline value="on" line="on"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="on" line="on"></deftypefnnewline>
</pre><deftypefun spaces=" " endspaces=" "><definitionterm><indexterm
index="fn" number="193">name2</indexterm><defcategory automatic="on"
bracketed="on">Function</defcategory> <deftype>data-type2</deftype>
<deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
<definitionitem><pre xml:space="preserve">aaa2
@@ -5412,7 +5412,7 @@ text in def item for second def item
<definitionitem><pre xml:space="preserve">fff2
</pre></definitionitem></deffn>
<pre xml:space="preserve">
-<deftypefnnewline value="off" line="off"></deftypefnnewline>
+<deftypefnnewline spaces=" " value="off" line="off"></deftypefnnewline>
<code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code> <xref
label="c_002d_002d_002dhapter_0040" manual="file
n---ame@"><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname
spaces=" ">cross r---ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t---itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefi [...]
<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref label="chapter" manual="file
name"><xrefnodename>chapter</xrefnodename><xrefinfoname spaces=" ">cross ref
name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
@@ -5836,7 +5836,7 @@ Various deff lines
<findex index="fn" spaces=" "><indexterm index="fn"
number="222"><seealso>f---ccc</seealso> f---ddd</indexterm></findex>
-<syncodeindex from="vr" to="cp" line="vr cp"></syncodeindex>
+<syncodeindex spaces=" " from="vr" to="cp" line="vr cp"></syncodeindex>
<para>Text<footnote><para>in footnote
<cindex index="cp" spaces=" "><indexterm index="cp" number="42">index entry in
footnote</indexterm></cindex>
@@ -5850,29 +5850,29 @@ Various deff lines
</para>
<para>truc
</para>
-<printindex value="truc" line="truc"></printindex>
+<printindex spaces=" " value="truc" line="truc"></printindex>
<para>codeidx
</para>
-<printindex value="codeidx" line="codeidx"></printindex>
+<printindex spaces=" " value="codeidx" line="codeidx"></printindex>
<para>cp
-</para><printindex value="cp" line="cp"></printindex>
+</para><printindex spaces=" " value="cp" line="cp"></printindex>
<para>fn
-</para><printindex value="fn" line="fn"></printindex>
+</para><printindex spaces=" " value="fn" line="fn"></printindex>
<para>vr
-</para><printindex value="vr" line="vr"></printindex>
+</para><printindex spaces=" " value="vr" line="vr"></printindex>
<para>ky
-</para><printindex value="ky" line="ky"></printindex>
+</para><printindex spaces=" " value="ky" line="ky"></printindex>
<para>pg
-</para><printindex value="pg" line="pg"></printindex>
+</para><printindex spaces=" " value="pg" line="pg"></printindex>
<para>tp
-</para><printindex value="tp" line="tp"></printindex>
+</para><printindex spaces=" " value="tp" line="tp"></printindex>
@@ -5926,8 +5926,8 @@ Menu comment
<node name="chapter2" spaces=" "><nodename>chapter2</nodename><nodeprev
automatic="on">chapter</nodeprev><nodeup automatic="on">Top</nodeup></node>
<centerchap spaces=" "><sectiontitle>chapter 2</sectiontitle>
-<printindex value="cp" line="cp"></printindex>
-<printindex value="fn" line="fn"></printindex>
+<printindex spaces=" " value="cp" line="cp"></printindex>
+<printindex spaces=" " value="fn" line="fn"></printindex>
<contents></contents>
<shortcontents></shortcontents>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add spaces attribute for 'specific' line commands.,
Patrice Dumas <=