[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Gavin D. Smith |
Date: |
Mon, 22 Jan 2024 12:58:41 -0500 (EST) |
branch: master
commit d95e7cfad5d5775bff29f6e50ecce35feeab6e34
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Jan 22 17:41:00 2024 +0000
* tp/Texinfo/Convert/Plaintext.pm (_convert) <empty_line>:
Unconditionally call _get_form_feeds to propagate form feeds in
the input to the output regardsless of 'empty_lines_count'.
---
ChangeLog | 6 ++++++
tp/Texinfo/Convert/Plaintext.pm | 9 +++------
tp/t/results/converters_tests/form_feeds.pl | 4 +++-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9e618d9625..1765665162 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-01-22 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/Convert/Plaintext.pm (_convert) <empty_line>:
+ Unconditionally call _get_form_feeds to propagate form feeds in
+ the input to the output regardsless of 'empty_lines_count'.
+
2024-01-21 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Transformations.pm (_new_node): call confess if _new_node
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 29bc5299fc..81aed3860f 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1969,12 +1969,9 @@ sub _convert($$)
if ($type and ($type eq 'empty_line'
or $type eq 'after_menu_description_line')) {
delete $self->{'text_element_context'}->[-1]->{'counter'};
- if ($self->{'empty_lines_count'} == 0
- or
$self->{'preformatted_context_commands'}->{$self->{'context'}->[-1]}) {
- if ($element->{'text'} =~ /\f/) {
- my $result = _get_form_feeds($element->{'text'});
- _stream_output($self, undef, $result);
- }
+ if ($element->{'text'} =~ /\f/) {
+ my $result = _get_form_feeds($element->{'text'});
+ _stream_output($self, undef, $result);
}
if ($self->{'preformatted_context_commands'}->{$self->{'context'}->[-1]}) {
_stream_output($self, $formatter->{'container'},
diff --git a/tp/t/results/converters_tests/form_feeds.pl
b/tp/t/results/converters_tests/form_feeds.pl
index 4a3d87f8a7..b185ec7fd5 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -1336,7 +1336,9 @@ $result_indices_sort_strings{'form_feeds'} = {
-$result_converted{'plaintext'}->{'form_feeds'} = 'aa
+$result_converted{'plaintext'}->{'form_feeds'} = '
+
+aa
bb