[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * doc/texinfo.texi (@code{@@caption @@shortcaptio
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * doc/texinfo.texi (@code{@@caption @@shortcaption}): no multiple paragraph in @shortcaption, and document error in LaTeX with multi-paragraph @caption when there is no @shortcaption. |
|
Date: |
Tue, 30 Aug 2022 10:52:52 -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 adf11332c7 * doc/texinfo.texi (@code{@@caption @@shortcaption}): no
multiple paragraph in @shortcaption, and document error in LaTeX with
multi-paragraph @caption when there is no @shortcaption.
adf11332c7 is described below
commit adf11332c7fd3ebef2d5abe642a847c1e59e020b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Aug 30 16:51:53 2022 +0200
* doc/texinfo.texi (@code{@@caption @@shortcaption}): no multiple
paragraph in @shortcaption, and document error in LaTeX with
multi-paragraph @caption when there is no @shortcaption.
---
ChangeLog | 6 ++
doc/texinfo.texi | 8 +-
tp/t/converters_tests.t | 1 +
tp/t/results/converters_tests/form_feeds.pl | 110 +++++++++++++++++++++++++++-
4 files changed, 119 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d76e883ef4..e5f9f10d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-08-30 Patrice Dumas <pertusus@free.fr>
+
+ * doc/texinfo.texi (@code{@@caption @@shortcaption}): no multiple
+ paragraph in @shortcaption, and document error in LaTeX with
+ multi-paragraph @caption when there is no @shortcaption.
+
2022-08-30 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/Plaintext.pm (_convert),
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 5c61ab39d2..4ad7d09242 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -8035,9 +8035,11 @@ example:
The text for @code{@@shortcaption} may not contain comments
(@code{@@c}), verbatim text (@code{@@verb}), environments such as
-@code{@@example}, footnotes (@code{@@footnote}) or other complex
-constructs. The same constraints apply to @code{@@caption} unless
-there is a @code{@@shortcaption}.
+@code{@@example}, footnotes (@code{@@footnote}), multiple paragraphs
+or other complex constructs. The same constraints apply to
+@code{@@caption} unless there is a @code{@@shortcaption}. In
+@LaTeX{} a multi-paragraph @code{@@caption} will lead to an error
+when formatted, unless there is a @code{@@shortcaption}.
@node @code{@@listoffloats}
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index f9118fa44a..2b8caeaaa4 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -179,6 +179,7 @@ T
@float
a float
@caption{'."\f".' within '."\f".' cation '."\f".'} '."\f".' Toto
+@shortcaption{'."\f".' shc within '."\f".' shortcaption '."\f".'} '."\f".'
After shc
@end float '."\f".'
'],
diff --git a/tp/t/results/converters_tests/form_feeds.pl
b/tp/t/results/converters_tests/form_feeds.pl
index 7830ca7b44..07f5dce920 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -845,6 +845,79 @@ $result_trees{'form_feeds'} = {
{
'parent' => {},
'text' => 'Toto
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'shc within '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_paragraph'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'shortcaption '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'shortcaption',
+ 'contents' => [],
+ 'extra' => {
+ 'float' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 35,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_close_brace'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'After shc
'
}
],
@@ -877,7 +950,7 @@ $result_trees{'form_feeds'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 35,
+ 'line_nr' => 36,
'macro' => ''
}
}
@@ -885,6 +958,7 @@ $result_trees{'form_feeds'} = {
'extra' => {
'caption' => {},
'end_command' => {},
+ 'shortcaption' => {},
'type' => {
'normalized' => ''
}
@@ -1051,11 +1125,25 @@
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[2]{'paren
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[3]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[4];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[4]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'contents'}[0];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'contents'}[3];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'extra'}{'float'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[6]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[7]{'contents'}[0]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[7];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[7]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[8]{'args'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[8]{'args'}[0]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[8];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[8]{'parent'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'caption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'end_command'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'end_command'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[8];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'shortcaption'}
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[5];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[2];
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[30]{'parent'} =
$result_trees{'form_feeds'}{'contents'}[2];
$result_trees{'form_feeds'}{'contents'}[2]{'extra'}{'node_content'}[0] =
$result_trees{'form_feeds'}{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -1096,6 +1184,7 @@ T
@float
a float
@caption{ within cation } Toto
+@shortcaption{ shc within shortcaption } After shc
@end float
';
@@ -1129,6 +1218,7 @@ T
a float
Toto
+After shc
';
@@ -1173,6 +1263,12 @@ $result_floats{'form_feeds'} = {
'float' => {}
}
},
+ 'shortcaption' => {
+ 'cmdname' => 'shortcaption',
+ 'extra' => {
+ 'float' => {}
+ }
+ },
'type' => {
'normalized' => ''
}
@@ -1182,6 +1278,7 @@ $result_floats{'form_feeds'} = {
]
};
$result_floats{'form_feeds'}{''}[0]{'extra'}{'caption'}{'extra'}{'float'} =
$result_floats{'form_feeds'}{''}[0];
+$result_floats{'form_feeds'}{''}[0]{'extra'}{'shortcaption'}{'extra'}{'float'}
= $result_floats{'form_feeds'}{''}[0];
$result_indices_sort_strings{'form_feeds'} = {
@@ -1220,6 +1317,7 @@ $result_converted{'plaintext'}->{'form_feeds'} = 'aa
a float
Toto
+ After shc
within
@@ -1272,6 +1370,7 @@ $result_converted{'html_text'}->{'form_feeds'} = '<a
class="node-id" id="Top"></
<div class="float">
<p>a float
</p><p>Toto
+</p><p>After shc
</p><div class="caption"><p>within </p><p>cation </p></div></div>
';
@@ -1310,6 +1409,7 @@ $result_converted{'xml'}->{'form_feeds'} = '<node
name="Top" spaces=" "><nodenam
<float type="" endspaces=" ">
<para>a float
</para><caption spaces="\\f "><para>within </para>&formfeed; <para>cation
</para>&formfeed;</caption> &formfeed; <para>Toto
+</para><shortcaption spaces="\\f "><para>shc within </para>&formfeed;
<para>shortcaption </para>&formfeed;</shortcaption> &formfeed; <para>After shc
</para></float> &formfeed;
';
@@ -1343,6 +1443,7 @@ $result_converted{'docbook'}->{'form_feeds'} = '<anchor
id="first-node"/>
</para></blockquote>
<para>a float
</para><para>Toto
+</para><para>After shc
</para>
';
@@ -1396,10 +1497,13 @@ T
\\begin{TexinfoFloat}
a float
-\\caption{within \\par{}
+\\caption[shc within \\par{}
+ shortcaption \\par{}
+]{within \\par{}
cation \\par{}
}
\\par{}Toto
+\\par{}After shc
\\end{TexinfoFloat}
';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * doc/texinfo.texi (@code{@@caption @@shortcaption}): no multiple paragraph in @shortcaption, and document error in LaTeX with multi-paragraph @caption when there is no @shortcaption.,
Patrice Dumas <=