[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): set leading spaces for columnfraction. |
|
Date: |
Sat, 01 Oct 2022 09:47:54 -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 bdfde13b83 * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): set
leading spaces for columnfraction.
bdfde13b83 is described below
commit bdfde13b8307a69d16c39091dedf4ff7f92b3d58
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 1 15:47:44 2022 +0200
* tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): set leading spaces
for columnfraction.
---
ChangeLog | 5 +++++
tp/Texinfo/Convert/TexinfoMarkup.pm | 3 ++-
tp/t/results/coverage/multitable.pl | 2 +-
tp/t/results/multitable/empty_headitem.pl | 2 +-
tp/t/results/multitable/empty_item_tab.pl | 4 ++--
tp/t/results/multitable/inter_item_commands_in_multitable.pl | 2 +-
tp/t/results/multitable/multitable_with_empty_item_tab.pl | 2 +-
tp/t/results/multitable/ref_in_multitable.pl | 2 +-
tp/t/results/xml_tests/commands_and_spaces.pl | 2 +-
tp/t/results/xml_tests/comments_end_lines.pl | 2 +-
tp/t/results/xml_tests/comments_on_block_command_lines.pl | 2 +-
tp/tests/layout/res_parser/formatting_xml/formatting.xml | 8 ++++----
12 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c8ad73fd9a..e50b8def35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-10-01 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): set leading spaces
+ for columnfraction.
+
2022-10-01 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): collect index
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 4228cb088a..bedc4ce2ba 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1345,7 +1345,8 @@ sub _convert($$;$)
last;
}
}
- my $attribute = [$self->_texinfo_line($cmd)];
+ my $attribute = [_leading_spaces_arg($cmd),
+ $self->_texinfo_line($cmd)];
$result .= $self->txi_markup_open_element('columnfractions',
$attribute);
foreach my $fraction
(@{$element->{'extra'}->{'columnfractions'}
->{'extra'}->{'misc_args'}}) {
diff --git a/tp/t/results/coverage/multitable.pl
b/tp/t/results/coverage/multitable.pl
index e9738f5887..eaca6e6713 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -748,7 +748,7 @@ $result_converted{'html_text'}->{'multitable'} = '
$result_converted{'xml'}->{'multitable'} = '
-<multitable spaces=" " endspaces=" "><columnfractions line="0.6
0.4"><columnfraction value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.6
0.4"><columnfraction value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
<thead><row><entry command="headitem"> <para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"> <para>another tab
</para></entry></row></thead><tbody><row><entry command="item">
<para>mu&textndash;ltitable item </para></entry><entry command="tab">
<para>multitable tab
<!-- c comment in multitable -->
diff --git a/tp/t/results/multitable/empty_headitem.pl
b/tp/t/results/multitable/empty_headitem.pl
index 54edfb8861..196f412a83 100644
--- a/tp/t/results/multitable/empty_headitem.pl
+++ b/tp/t/results/multitable/empty_headitem.pl
@@ -403,7 +403,7 @@ $result_converted{'html_text'}->{'empty_headitem'} =
'<table class="multitable">
';
-$result_converted{'xml'}->{'empty_headitem'} = '<multitable spaces=" "
endspaces=" "><columnfractions line=".1 .1 .1"><columnfraction
value=".1"></columnfraction><columnfraction
value=".1"></columnfraction><columnfraction
value=".1"></columnfraction></columnfractions>
+$result_converted{'xml'}->{'empty_headitem'} = '<multitable spaces=" "
endspaces=" "><columnfractions spaces=" " line=".1 .1 .1"><columnfraction
value=".1"></columnfraction><columnfraction
value=".1"></columnfraction><columnfraction
value=".1"></columnfraction></columnfractions>
<thead><row><entry command="headitem"> </entry><entry command="tab">
<para>Index </para></entry><entry command="tab"> <para>Value
</para></entry></row></thead><tbody><row><entry command="item"> </entry><entry
command="tab"> <para><code>3</code> </para></entry><entry command="tab">
<para><code>30</code>
</para></entry></row></tbody></multitable>
diff --git a/tp/t/results/multitable/empty_item_tab.pl
b/tp/t/results/multitable/empty_item_tab.pl
index 5deecc427e..8632fd967a 100644
--- a/tp/t/results/multitable/empty_item_tab.pl
+++ b/tp/t/results/multitable/empty_item_tab.pl
@@ -903,7 +903,7 @@ $result_converted{'html_text'}->{'empty_item_tab'} =
'<table class="multitable">
';
-$result_converted{'xml'}->{'empty_item_tab'} = '<multitable spaces=" "
endspaces=" "><columnfractions line="1.0"><columnfraction
value="1.0"></columnfraction></columnfractions>
+$result_converted{'xml'}->{'empty_item_tab'} = '<multitable spaces=" "
endspaces=" "><columnfractions spaces=" " line="1.0"><columnfraction
value="1.0"></columnfraction></columnfractions>
<tbody><row><entry command="item">
</entry></row><row><entry command="item">
@@ -911,7 +911,7 @@ $result_converted{'xml'}->{'empty_item_tab'} = '<multitable
spaces=" " endspaces
</para></entry></row><row><entry command="item">
</entry></row></tbody></multitable>
-<multitable spaces=" " endspaces=" "><columnfractions line="0.5
0.5"><columnfraction value="0.5"></columnfraction><columnfraction
value="0.5"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.5
0.5"><columnfraction value="0.5"></columnfraction><columnfraction
value="0.5"></columnfraction></columnfractions>
<tbody><row><entry command="item">
</entry></row><row><entry command="item">
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index 8e523aeb88..021f68ce3c 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -1121,7 +1121,7 @@
$result_converted{'xml'}->{'inter_item_commands_in_multitable'} = '<multitable s
<!-- c last comment -->
</para></entry></row></tbody></multitable>
-<multitable spaces=" " endspaces=" "><columnfractions line="0.6
0.4"><columnfraction value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.6
0.4"><columnfraction value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
<thead><row><entry command="headitem"> <para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"> <para>another tab
</para></entry></row></thead><tbody><row><entry command="item">
<para>mu&textndash;ltitable item </para></entry><entry command="tab">
<para>multitable tab
<!-- c comment in multitable -->
diff --git a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
index 2ee95519d0..fca6d50829 100644
--- a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
+++ b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
@@ -338,7 +338,7 @@
$result_converted{'html_text'}->{'multitable_with_empty_item_tab'} = '<table cla
';
-$result_converted{'xml'}->{'multitable_with_empty_item_tab'} = '<multitable
spaces=" " endspaces=" "><columnfractions line="0.3 0.7"><columnfraction
value="0.3"></columnfraction><columnfraction
value="0.7"></columnfraction></columnfractions>
+$result_converted{'xml'}->{'multitable_with_empty_item_tab'} = '<multitable
spaces=" " endspaces=" "><columnfractions spaces=" " line="0.3
0.7"><columnfraction value="0.3"></columnfraction><columnfraction
value="0.7"></columnfraction></columnfractions>
<tbody><row><entry command="item"> <para>1-1 </para></entry><entry
command="tab"> <para>1-2 </para></entry></row><row><entry
command="item"></entry><entry command="tab"></entry></row><row><entry
command="item"> <para>3-1 </para></entry><entry command="tab"> <para>3-2
</para></entry></row></tbody></multitable>
';
diff --git a/tp/t/results/multitable/ref_in_multitable.pl
b/tp/t/results/multitable/ref_in_multitable.pl
index ba5948a7cd..c0894f3d12 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -741,7 +741,7 @@ $result_converted{'xml'}->{'ref_in_multitable'} =
'<novalidate></novalidate>
<para><ref
label="XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XXX-XX"><xrefnodename>XXX
XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XX XXX XXX XXX XXX
XXX XXX XXX XXX XXX XXX XXX XXX XX</xrefnodename></ref>.
</para>
-<multitable spaces=" " endspaces=" "><columnfractions line=".35
.65"><columnfraction value=".35"></columnfraction><columnfraction
value=".65"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line=".35
.65"><columnfraction value=".35"></columnfraction><columnfraction
value=".65"></columnfraction></columnfractions>
<tbody><row><entry command="item"> <para>XXX XXX XXX XXX XXX XXX XXX XXX XXX
XXX XXX XXX XX
</para></entry><entry command="tab"> <para>See <ref
label="RRR-RRR-RRR-RRR-RRR-RRR-RRR-RRR-RRR-RRRR"><xrefnodename>RRR RRR RRR RRR
RRR RRR RRR RRR RRR RRRR</xrefnodename></ref>.
</para></entry></row><row><entry command="item"> <para>XXX XXX XXX XXX XXX XXX
XXX XXX XXX XXX XXX XXX XX
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 21a1c3317f..5486987888 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -2272,7 +2272,7 @@ $result_converted{'xml'}->{'commands_and_spaces'} = '<set
name="foo" line=" foo
</para><shortcaption><para>Short</para></shortcaption><para> g.
</para></float>
-<multitable spaces=" " endspaces=" "><columnfractions line="0.4 0.6
"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.4
0.6 "><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
</multitable>
<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype
bracketed="on">aa b</columnprototype> <columnprototype bracketed="on" spaces="
">r </columnprototype>
<columnprototype><var>cmd</var></columnprototype><columnprototype>gg</columnprototype>
<columnprototype>hh</columnprototype>
<columnprototype>j</columnprototype></columnprototypes>
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl
b/tp/t/results/xml_tests/comments_end_lines.pl
index e9ae4a6720..57061c9228 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -1280,7 +1280,7 @@ $result_converted{'xml'}->{'comments_end_lines'} =
'<itemize commandarg="bullet"
<pre xml:space="preserve">in ex
</pre></example> <!-- c comm -->
-<multitable spaces=" " endspaces=" "><columnfractions line="0.4
0.6"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.4
0.6"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
<tbody><row><entry command="item"> <para>a </para></entry><entry
command="tab"> <para>b
</para></entry></row></tbody></multitable> <!-- c comm -->
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 40a8252137..1b4ac37b8e 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
@@ -2795,7 +2795,7 @@
$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize comman
<pre xml:space="preserve">in display
</pre></display>
-<multitable spaces=" " endspaces=" "><columnfractions line="0.4 0.6 @c
comm"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions><!-- c comm -->
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.4 0.6
@c comm"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions><!-- c comm -->
<tbody><row><entry command="item"> <para>a </para></entry><entry
command="tab"> <para>b
</para></entry></row></tbody></multitable>
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 9fd52e7687..934ec39188 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -1678,7 +1678,7 @@ quotation
</para></listitem><listitem> <para>second c
</para></listitem></enumerate>
-<multitable spaces=" " endspaces=" "><columnfractions line="0.4 0.6
"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.4 0.6
"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
<thead><row><entry command="headitem"> <para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"> <para>another tab
</para></entry></row></thead><tbody><row><entry command="item">
<para>mu&textndash;ltitable item </para></entry><entry command="tab">
<para>multitable tab
<!-- c comment in multitable -->
@@ -2817,7 +2817,7 @@ quotation
</para></listitem><listitem> <para>second c
</para></listitem></enumerate>
-<multitable spaces=" " endspaces=" "><columnfractions line="0.4 0.6
"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.4 0.6
"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
<thead><row><entry command="headitem"> <para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"> <para>another tab
</para></entry></row></thead><tbody><row><entry command="item">
<para>mu&textndash;ltitable item </para></entry><entry command="tab">
<para>multitable tab
<!-- c comment in multitable -->
@@ -3983,7 +3983,7 @@ quotation
</para></listitem><listitem> <para>second c
</para></listitem></enumerate>
-<multitable spaces=" " endspaces=" "><columnfractions line="0.4 0.6
"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.4 0.6
"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
<thead><row><entry command="headitem"> <para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"> <para>another tab
</para></entry></row></thead><tbody><row><entry command="item">
<para>mu&textndash;ltitable item </para></entry><entry command="tab">
<para>multitable tab
<!-- c comment in multitable -->
@@ -5117,7 +5117,7 @@ indent in quotation
</pre></listitem><listitem><pre xml:space="preserve"> second c
</pre></listitem></enumerate>
<pre xml:space="preserve">
-</pre><multitable spaces=" " endspaces=" "><columnfractions line="0.4 0.6
"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+</pre><multitable spaces=" " endspaces=" "><columnfractions spaces=" "
line="0.4 0.6 "><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
<thead><row><entry command="headitem"><pre xml:space="preserve"> mu--ltitable
headitem </pre></entry><entry command="tab"><pre xml:space="preserve"> another
tab
</pre></entry></row></thead><tbody><row><entry command="item"><pre
xml:space="preserve"> mu--ltitable item </pre></entry><entry command="tab"><pre
xml:space="preserve"> multitable tab
<!-- c comment in multitable -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): set leading spaces for columnfraction.,
Patrice Dumas <=