[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Whitespace after @image
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Whitespace after @image |
|
Date: |
Sun, 25 Apr 2021 15:46:37 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 894cf6b Whitespace after @image
894cf6b is described below
commit 894cf6b1f49cd77a2c0e1a8ef8efc8960502268b
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Apr 25 20:46:26 2021 +0100
Whitespace after @image
* tp/Texinfo/Convert/Plaintext.pm (_convert): Output any
top-level whitespace element. This allows a blank line
of whitespace to appear after an @image that is not part
of a paragraph.
* tp/t/05paragraph.t (sole_image): New test.
Report from Werner Lemberg.
---
ChangeLog | 13 +++
tp/Texinfo/Convert/Plaintext.pm | 4 +
tp/t/05paragraph.t | 5 +
tp/t/results/converters_tests/image_extension.pl | 4 +-
tp/t/results/converters_tests/image_formatting.pl | 2 +
tp/t/results/coverage/block_commands.pl | 1 +
.../coverage/punctuation_in_line_commands.pl | 5 +-
tp/t/results/coverage_braces/empty_commands.pl | 3 +-
.../coverage_braces/space_command_in_image.pl | 2 +-
tp/t/results/coverage_braces/test_image.pl | 4 +
tp/t/results/float/anchor_in_caption.pl | 4 +-
tp/t/results/float/cindex_in_caption.pl | 6 +-
tp/t/results/float/complex_float.pl | 3 +
.../float/empty_listoffloats_with_floats.pl | 2 +
tp/t/results/float/float_with_at_commands.pl | 1 +
tp/t/results/float/footnote_in_caption.pl | 4 +-
.../results/float/footnote_in_caption_and_error.pl | 1 +
.../float/numbering_captions_listoffloats.pl | 33 +++++++
tp/t/results/float/simple.pl | 1 +
tp/t/results/indices/image_lines_count.pl | 6 +-
tp/t/results/indices/image_text_lines_count.pl | 6 +-
tp/t/results/info_tests/error_in_footnote.pl | 3 +-
tp/t/results/info_tests/float_long_captions.pl | 4 +-
.../info_tests/image_and_spaces_formatting.pl | 3 +-
tp/t/results/info_tests/image_extension.pl | 3 +
tp/t/results/info_tests/image_not_found.pl | 1 +
tp/t/results/info_tests/image_quotes.pl | Bin 5375 -> 5376 bytes
tp/t/results/info_tests/image_text_encoded.pl | 1 +
tp/t/results/invalid_nestings/table_in_code.pl | 1 +
tp/t/results/paragraph/commands_in_flushright.pl | 1 +
tp/t/results/paragraph/no_paragraph_commands.pl | 5 +-
tp/t/results/paragraph/sole_image.pl | 110 +++++++++++++++++++++
tp/t/results/raw/verbatim_in_brace_command.pl | 1 +
.../sectioning/unnumbered_before_top_node.pl | 1 +
34 files changed, 228 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a7cd66c..d984cfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2021-04-25 Gavin Smith <gavinsmith0123@gmail.com>
+ Whitespace after @image
+
+ * tp/Texinfo/Convert/Plaintext.pm (_convert): Output any
+ top-level whitespace element. This allows a blank line
+ of whitespace to appear after an @image that is not part
+ of a paragraph.
+
+ * tp/t/05paragraph.t (sole_image): New test.
+
+ Report from Werner Lemberg.
+
+2021-04-25 Gavin Smith <gavinsmith0123@gmail.com>
+
* info/nodes.c (get_tags_of_indirect_tags_table):
Free arrays in case of malformed Info file.
Report from Vitezslav Crhonek.
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 4a1df04..14c6f5c 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1574,6 +1574,10 @@ sub _convert($$)
} elsif ($root->{'text'} =~ /\S/) {
$self->_bug_message("ignored text not empty `$root->{'text'}'", $root);
return '';
+ } else {
+ # miscellaneous top-level whitespace - possibly after an @image
+ return _count_added($self, $formatter->{'container'},
+ add_text($formatter->{'container'}, $root->{'text'}));
}
} else {
my $tree = $self->gdt($root->{'text'});
diff --git a/tp/t/05paragraph.t b/tp/t/05paragraph.t
index 59a7f89..239bc67 100644
--- a/tp/t/05paragraph.t
+++ b/tp/t/05paragraph.t
@@ -23,6 +23,11 @@ text l 2
@titlefont{title font}
@image{aa,bb,cc,dd,.ee}
'],
+[ 'sole_image',
+'@image{aa}
+
+next para
+'],
[ 'paragraph_command','@@
@b{aaa}.
diff --git a/tp/t/results/converters_tests/image_extension.pl
b/tp/t/results/converters_tests/image_extension.pl
index 44b8c3e..ef3d8f2 100644
--- a/tp/t/results/converters_tests/image_extension.pl
+++ b/tp/t/results/converters_tests/image_extension.pl
@@ -89,7 +89,8 @@ $result_floats{'image_extension'} = {};
-$result_converted{'plaintext'}->{'image_extension'} = '[f---ile]';
+$result_converted{'plaintext'}->{'image_extension'} = '[f---ile]
+';
$result_converted_errors{'plaintext'}->{'image_extension'} = [
{
@@ -146,6 +147,7 @@ $result_converted_errors{'docbook'}->{'image_extension'} = [
$result_converted{'info'}->{'image_extension'} = 'This is , produced from .
[f---ile]
+
Tag Table:
diff --git a/tp/t/results/converters_tests/image_formatting.pl
b/tp/t/results/converters_tests/image_formatting.pl
index 7483937..0e250f5 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2570,6 +2570,7 @@ bbb
ccc
Image description""\\.
+
in para Image description""\\..
';
@@ -2819,6 +2820,7 @@ ccc
[image src="f--ile.png" alt="a very long alt argument that could span more
than one line who knows" text="Image description\\"\\"\\\\." ]
+
in para [image src="f--ile.png" alt="a very long alt argument that could
span more than one line who knows" text="Image description\\"\\"\\\\." ].
diff --git a/tp/t/results/coverage/block_commands.pl
b/tp/t/results/coverage/block_commands.pl
index b432bce..313824b 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -451,6 +451,7 @@ $result_converted{'plaintext'}->{'block_commands'} = 'in
group
In float
+
a float 1: in caption
in caption
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 6794d43..b90dbce 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1173,10 +1173,12 @@ exdent quotation! After punc
In float
+
float type! After punc 1: shortcaption! After punc
In float with caption.
+
float type! After punc 2: caption! After punc
* Menu:
@@ -1192,11 +1194,12 @@ heading! After punc
titlefont! After punc
*********************
+
center! After punc
* Menu:
-* index! After punc: node! After punc. (line 23)
+* index! After punc: node! After punc. (line 25)
top! After punc
';
diff --git a/tp/t/results/coverage_braces/empty_commands.pl
b/tp/t/results/coverage_braces/empty_commands.pl
index 4c452f1..14e4bd2 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -272,7 +272,8 @@ $result_floats{'empty_commands'} = {};
-$result_converted{'plaintext'}->{'empty_commands'} = '\'\'(1) ̃
+$result_converted{'plaintext'}->{'empty_commands'} = '
+\'\'(1) ̃
---------- Footnotes ----------
diff --git a/tp/t/results/coverage_braces/space_command_in_image.pl
b/tp/t/results/coverage_braces/space_command_in_image.pl
index f50a9aa..af2fda0 100644
--- a/tp/t/results/coverage_braces/space_command_in_image.pl
+++ b/tp/t/results/coverage_braces/space_command_in_image.pl
@@ -132,7 +132,7 @@ $result_floats{'space_command_in_image'} = {};
-$result_converted{'plaintext'}->{'space_command_in_image'} = 'Image
description""\\.Image description""\\.';
+$result_converted{'plaintext'}->{'space_command_in_image'} = 'Image
description""\\. Image description""\\.';
$result_converted{'html_text'}->{'space_command_in_image'} = '<img
src="f--ile.png" alt=" "> <img src="f--ile.png" alt="f--ile">';
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index 898161d..5698a4f 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -4097,6 +4097,7 @@ $result_converted_errors{'html'}->{'test_image'} = [
$result_converted{'plaintext'}->{'test_image'} = '[f@i--le.. a@<"%@ < & @ %
" ]
+
In text [alt î-le.. a
<"%@ < & @ % " ].
@@ -4112,10 +4113,13 @@ In text [alt î-le.. a
<"%@ < & @ % " ].
[f@i--le.. a@<"%@ < & @ % " ]
+
In text [alt î-le.. a
<"%@ < & @ % " ].
+
Image 1: [f@i--le.. a@<"%@ < & @ % " ]
+
In text [alt î-le.. a
<"%@ < & @ % " ].
diff --git a/tp/t/results/float/anchor_in_caption.pl
b/tp/t/results/float/anchor_in_caption.pl
index aaf38ed..d2989c2 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -382,6 +382,7 @@ $result_converted{'plaintext'}->{'anchor_in_caption'} = '*
Menu:
In float.
+
fl 1: in caption
';
@@ -397,13 +398,14 @@ File: , Node: Top, Up: (dir)
In float.
+
fl 1: in caption
Tag Table:
Node: Top27
Ref: label123
-Ref: in anchor150
+Ref: in anchor151
End Tag Table
diff --git a/tp/t/results/float/cindex_in_caption.pl
b/tp/t/results/float/cindex_in_caption.pl
index 46c857f..444b3d3 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -457,11 +457,12 @@ $result_converted{'plaintext'}->{'cindex_in_caption'} =
'* Menu:
In float.
+
fl 1: in caption
* Menu:
-* index entry: Top. (line 6)
+* index entry: Top. (line 7)
';
@@ -477,12 +478,13 @@ File: , Node: Top, Up: (dir)
In float.
+
fl 1: in caption
[index ]
* Menu:
-* index entry: Top. (line 9)
+* index entry: Top. (line 10)
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index e556843..235ee20 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -4802,6 +4802,8 @@ A ref. *Note xref Text with features: Top. A footnote.
(1).
TeX and _téî<an_url>_ AND it is @verb a word !@ Æ.
+
+
Text 1: An example of float caption... An example.
example
@@ -4832,6 +4834,7 @@ TeX and _téî<an_url>_ AND it is @verb a word !@ Æ.
Float text of a float with a lot of features.
+
Text 1.1: An example of float caption... 2 An example 2.
example 2
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index 550d4b3..9450cf4 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -645,12 +645,14 @@
$result_converted{'plaintext'}->{'empty_listoffloats_with_floats'} = 'Label no c
Label and caption.
+
2: caption with label
no label no caption
no label caption
+
caption no label
* Menu:
diff --git a/tp/t/results/float/float_with_at_commands.pl
b/tp/t/results/float/float_with_at_commands.pl
index 4d64e3c..b2a2cf4 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -554,6 +554,7 @@
$result_floats{'float_with_at_commands'}{'entr@\'ee'}[0]{'extra'}{'caption'}{'ex
$result_converted{'plaintext'}->{'float_with_at_commands'} = 'Ceci est notre
première entrée.
+
entrée 1: La première entrée est importante
* Menu:
diff --git a/tp/t/results/float/footnote_in_caption.pl
b/tp/t/results/float/footnote_in_caption.pl
index 77f6b5f..b79cddb 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -382,6 +382,7 @@ $result_converted{'plaintext'}->{'footnote_in_caption'} =
'* Menu:
In float.
+
fl 1: in caption(1)
---------- Footnotes ----------
@@ -402,6 +403,7 @@ File: , Node: Top, Up: (dir)
In float.
+
fl 1: in caption(1)
---------- Footnotes ----------
@@ -413,7 +415,7 @@ fl 1: in caption(1)
Tag Table:
Node: Top27
Ref: label126
-Ref: Top-Footnote-1194
+Ref: Top-Footnote-1195
End Tag Table
diff --git a/tp/t/results/float/footnote_in_caption_and_error.pl
b/tp/t/results/float/footnote_in_caption_and_error.pl
index b72f8c1..74c664a 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -403,6 +403,7 @@
$result_converted{'plaintext'}->{'footnote_in_caption_and_error'} = '* Menu:
In float.
+
fl 1: in caption(1)
---------- Footnotes ----------
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 0f20f7a..a73a23f 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -8065,14 +8065,20 @@
$result_floats{'numbering_captions_listoffloats'}{'th@\'eor@`eme'}[0]{'extra'}{'
$result_converted{'plaintext'}->{'numbering_captions_listoffloats'} = 'Test
floats
***********
+
+
Text 1: An example of float caption...
No label but caption and shortcaption.
+
+
Text: C No label
No type but caption and shortcaption.
+
+
1: C No type
No type but label and no caption nor shortcaption.
@@ -8083,14 +8089,20 @@ No label, no type, no caption no shortcaption.
No label, no type, but caption and shortcaption.
+
+
C No label, no type, but caption and shortcaption.
Second float with no type.
+
+
3: C No type 2
A warning
+
+
Warning 1: C A warning
1 A chapter
@@ -8098,20 +8110,27 @@ Warning 1: C A warning
Text in chapter
+
Text 1.1: C Text in chapter
+
Text 1.2: An example of float caption, no shortcaption...
A théorème
+
théorème 1.1: C A théorème
float with no type.
+
+
1.1: C No type in chapter
A warning
+
+
Warning 1.1: C A warning in chapter
1.1 A section
@@ -8126,10 +8145,14 @@ Unnumbered
unnum
+
+
Text 5: C unnumbered float
float with no type.
+
+
5: C No type in unnumbered
Section within unnumbered
@@ -8137,6 +8160,8 @@ Section within unnumbered
Section within unnumbered
+
+
Text 6: C Section within unnumbered
2 Chapter with unnumbsubsec
@@ -8144,6 +8169,8 @@ Text 6: C Section within unnumbered
Chap
+
+
Text 2.1: C Chapter with subsec
unnumbered sec
@@ -8151,10 +8178,14 @@ unnumbered sec
Chap
+
+
Text 2.2: C unnumbered sec float
float with no type.
+
+
2.1: C No type in unnumbered subsec in chapter
Appendix A Appendix for float
@@ -8162,6 +8193,8 @@ Appendix A Appendix for float
Appendix
+
+
Text A.1: C appendix sec float
list of floats
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index 818b087..6fdee26 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -221,6 +221,7 @@
$result_floats{'simple'}{'Type'}[0]{'extra'}{'caption'}{'extra'}{'float'} = $res
$result_converted{'plaintext'}->{'simple'} = 'In float.
+
Type 1: Caption.
';
diff --git a/tp/t/results/indices/image_lines_count.pl
b/tp/t/results/indices/image_lines_count.pl
index 2308d51..15ad495 100644
--- a/tp/t/results/indices/image_lines_count.pl
+++ b/tp/t/results/indices/image_lines_count.pl
@@ -258,10 +258,11 @@ ff
" ]
+
[index ]
* Menu:
-* index entry: Top. (line 4)
+* index entry: Top. (line 5)
@@ -284,9 +285,10 @@ cc
ff
+
* Menu:
-* index entry: Top. (line 7)
+* index entry: Top. (line 8)
';
diff --git a/tp/t/results/indices/image_text_lines_count.pl
b/tp/t/results/indices/image_text_lines_count.pl
index 7cc8e74..2bf5a72 100644
--- a/tp/t/results/indices/image_text_lines_count.pl
+++ b/tp/t/results/indices/image_text_lines_count.pl
@@ -257,10 +257,11 @@ cc
ff
+
[index ]
* Menu:
-* index entry: Top. (line 10)
+* index entry: Top. (line 11)
@@ -283,9 +284,10 @@ cc
ff
+
* Menu:
-* index entry: Top. (line 7)
+* index entry: Top. (line 8)
';
diff --git a/tp/t/results/info_tests/error_in_footnote.pl
b/tp/t/results/info_tests/error_in_footnote.pl
index 08a028d..2a3ecee 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -586,6 +586,7 @@ File: , Node: Top, Up: (dir)
Float text1
+
Text 1: Caption. TeX. In caption *note caption*. Now footnote(1)
* Menu:
@@ -605,7 +606,7 @@ Text 1: Caption. TeX. In caption *note caption*. Now
footnote(1)
Tag Table:
Node: Top27
Ref: label61
-Ref: Top-Footnote-1343
+Ref: Top-Footnote-1344
End Tag Table
diff --git a/tp/t/results/info_tests/float_long_captions.pl
b/tp/t/results/info_tests/float_long_captions.pl
index 321fe61..d0e20e2 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -517,8 +517,10 @@ $result_converted{'info'}->{'float_long_captions'} = 'This
is , produced from .
File: , Node: Top, Up: (dir)
+
Text 1: AAAAAAAAAAAAAAAA BBBBB CCCCCCCCCCC
+
Text 2: AAAAAAAAAAAAAAAA BBBBBB CCCCCCCCCCC
* Menu:
@@ -531,7 +533,7 @@ Text 2: AAAAAAAAAAAAAAAA BBBBBB CCCCCCCCCCC
Tag Table:
Node: Top27
Ref: text161
-Ref: text2105
+Ref: text2106
End Tag Table
diff --git a/tp/t/results/info_tests/image_and_spaces_formatting.pl
b/tp/t/results/info_tests/image_and_spaces_formatting.pl
index 19d4ed9..5306df1 100644
--- a/tp/t/results/info_tests/image_and_spaces_formatting.pl
+++ b/tp/t/results/info_tests/image_and_spaces_formatting.pl
@@ -1066,7 +1066,8 @@
$result_converted{'info'}->{'image_and_spaces_formatting'} = 'This is , produced
File: , Node: Top, Up: (dir)
-This is an image words.This is an image words.This is an image words.This is
an image words.This is an image words.This is an image words.This is an image
words.
+This is an image words. This is an image words. This is an image words. This
is an image words. This is an image words. This is an image words. This is an
image words.
+
Some text This is an image words. This is an image words. This is an image
words. This is an image words. This is an image words. This is an image words.
This is an image words..
Some text This is an image words. text aaaaaaaaa This is an image words.
text bbbbbbbbbbb This is an image words. text ccccccccccccc This is an image
words. text
diff --git a/tp/t/results/info_tests/image_extension.pl
b/tp/t/results/info_tests/image_extension.pl
index 4af4391..2690b29 100644
--- a/tp/t/results/info_tests/image_extension.pl
+++ b/tp/t/results/info_tests/image_extension.pl
@@ -308,9 +308,12 @@ $result_converted{'info'}->{'image_extension'} = 'This is
, produced from .
File: , Node: Top, Up: (dir)
[image src="fextext" text="t" ]
+
[image src="fdotext.ext" text="t" ]
+
[image src="f--ile.png" text="Image description\\"\\"\\\\." ]
+
Tag Table:
Node: Top27
diff --git a/tp/t/results/info_tests/image_not_found.pl
b/tp/t/results/info_tests/image_not_found.pl
index 2ed0d96..a36814d 100644
--- a/tp/t/results/info_tests/image_not_found.pl
+++ b/tp/t/results/info_tests/image_not_found.pl
@@ -137,6 +137,7 @@ $result_converted{'info'}->{'image_not_found'} = 'This is ,
produced from .
File: , Node: Top, Up: (dir)
[n_f_image]
+
Tag Table:
Node: Top27
diff --git a/tp/t/results/info_tests/image_quotes.pl
b/tp/t/results/info_tests/image_quotes.pl
index d6911ad..ccda106 100644
Binary files a/tp/t/results/info_tests/image_quotes.pl and
b/tp/t/results/info_tests/image_quotes.pl differ
diff --git a/tp/t/results/info_tests/image_text_encoded.pl
b/tp/t/results/info_tests/image_text_encoded.pl
index bc1c140..f6da6a6 100644
--- a/tp/t/results/info_tests/image_text_encoded.pl
+++ b/tp/t/results/info_tests/image_text_encoded.pl
@@ -106,6 +106,7 @@ $result_floats{'image_text_encoded'} = {};
$result_converted{'info'}->{'image_text_encoded'} = 'This is , produced from .
îmage encodée
+
Tag Table:
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl
b/tp/t/results/invalid_nestings/table_in_code.pl
index 78f0d85..4e67d10 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -253,6 +253,7 @@ $result_floats{'table_in_code'} = {};
$result_converted{'plaintext'}->{'table_in_code'} = '\' in code \'
_line_
text
+
';
1;
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl
b/tp/t/results/paragraph/commands_in_flushright.pl
index 9dc87f0..d8312e7 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -1533,6 +1533,7 @@ _table itemx_
in float
+
label 1: in caption
Sp:
diff --git a/tp/t/results/paragraph/no_paragraph_commands.pl
b/tp/t/results/paragraph/no_paragraph_commands.pl
index 68ce50b..246776d 100644
--- a/tp/t/results/paragraph/no_paragraph_commands.pl
+++ b/tp/t/results/paragraph/no_paragraph_commands.pl
@@ -155,9 +155,12 @@ $result_floats{'no_paragraph_commands'} = {};
$result_converted{'plaintext'}->{'no_paragraph_commands'} = '
+
title font
**********
-Text for image out of paragraph.';
+
+Text for image out of paragraph.
+';
$result_converted{'html_text'}->{'no_paragraph_commands'} = '<br>
diff --git a/tp/t/results/paragraph/sole_image.pl
b/tp/t/results/paragraph/sole_image.pl
new file mode 100644
index 0000000..84f01e2
--- /dev/null
+++ b/tp/t/results/paragraph/sole_image.pl
@@ -0,0 +1,110 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'sole_image'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aa'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'image',
+ 'contents' => [],
+ 'extra' => {
+ 'input_perl_encoding' => 'utf-8'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'next para
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'sole_image'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'sole_image'}{'contents'}[0]{'args'}[0];
+$result_trees{'sole_image'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'sole_image'}{'contents'}[0];
+$result_trees{'sole_image'}{'contents'}[0]{'parent'} =
$result_trees{'sole_image'};
+$result_trees{'sole_image'}{'contents'}[1]{'parent'} =
$result_trees{'sole_image'};
+$result_trees{'sole_image'}{'contents'}[2]{'parent'} =
$result_trees{'sole_image'};
+$result_trees{'sole_image'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'sole_image'}{'contents'}[3];
+$result_trees{'sole_image'}{'contents'}[3]{'parent'} =
$result_trees{'sole_image'};
+
+$result_texis{'sole_image'} = '@image{aa}
+
+next para
+';
+
+
+$result_texts{'sole_image'} = 'aa
+
+next para
+';
+
+$result_errors{'sole_image'} = [];
+
+
+$result_floats{'sole_image'} = {};
+
+
+
+$result_converted{'plaintext'}->{'sole_image'} = 'Text for image out of
paragraph.
+
+next para
+';
+
+
+$result_converted{'html_text'}->{'sole_image'} = '<img src="aa.jpg" alt="aa">
+
+<p>next para
+</p>';
+
+$result_converted_errors{'html_text'}->{'sole_image'} = [
+ {
+ 'error_line' => ':1: warning: @image file `aa\' (for HTML) not found,
using `aa.jpg\'
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => '@image file `aa\' (for HTML) not found, using `aa.jpg\'',
+ 'type' => 'warning'
+ }
+];
+
+
+1;
diff --git a/tp/t/results/raw/verbatim_in_brace_command.pl
b/tp/t/results/raw/verbatim_in_brace_command.pl
index 606db94..c247d2d 100644
--- a/tp/t/results/raw/verbatim_in_brace_command.pl
+++ b/tp/t/results/raw/verbatim_in_brace_command.pl
@@ -137,6 +137,7 @@ $result_floats{'verbatim_in_brace_command'} = {};
$result_converted{'plaintext'}->{'verbatim_in_brace_command'} = '\' \'
in verbatim
+
';
1;
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index eaae38a..7b6c67e 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -259,6 +259,7 @@ Top node
Title titlefont
***************
+
Tag Table:
Node: Top54
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Whitespace after @image,
Gavin D. Smith <=