[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5878] * tp/Texinfo/Convert/Plaintext.pm (_convert): with @w and @ tie,
From: |
Patrice Dumas |
Subject: |
[5878] * tp/Texinfo/Convert/Plaintext.pm (_convert): with @w and @ tie, |
Date: |
Wed, 15 Oct 2014 22:28:02 +0000 |
Revision: 5878
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5878
Author: pertusus
Date: 2014-10-15 22:28:00 +0000 (Wed, 15 Oct 2014)
Log Message:
-----------
* tp/Texinfo/Convert/Plaintext.pm (_convert): with @w and @tie,
do not set set_space_protection ignore_column argument, such
that the whole block goes to the next line. Report from
Werner LEMBERG (http://savannah.gnu.org/bugs/?43407) and Mahlon
Smith.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/MANIFEST
trunk/tp/TODO
trunk/tp/Texinfo/Convert/Plaintext.pm
trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
trunk/tp/t/results/coverage_braces/test_w.pl
trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-10-15 16:03:53 UTC (rev 5877)
+++ trunk/ChangeLog 2014-10-15 22:28:00 UTC (rev 5878)
@@ -1,3 +1,11 @@
+2014-10-16 Patrice Dumas <address@hidden>
+
+ * tp/Texinfo/Convert/Plaintext.pm (_convert): with @w and @tie,
+ do not set set_space_protection ignore_column argument, such
+ that the whole block goes to the next line. Report from
+ Werner LEMBERG (http://savannah.gnu.org/bugs/?43407) and Mahlon
+ Smith.
+
2014-10-15 Gavin Smith <address@hidden>
* info/t/empty.sh: New test.
Modified: trunk/tp/MANIFEST
===================================================================
--- trunk/tp/MANIFEST 2014-10-15 16:03:53 UTC (rev 5877)
+++ trunk/tp/MANIFEST 2014-10-15 22:28:00 UTC (rev 5878)
@@ -1368,6 +1368,7 @@
t/test_brace_count.t
t/test_count.t
t/test_fill_gaps_in_sectioning.t
+t/test_is_content_empty.t
t/test_protect_hashchar_at_line_beginning.t
t/test_sort.t
t/test_tree_copy.t
Modified: trunk/tp/TODO
===================================================================
--- trunk/tp/TODO 2014-10-15 16:03:53 UTC (rev 5877)
+++ trunk/tp/TODO 2014-10-15 22:28:00 UTC (rev 5878)
@@ -75,7 +75,22 @@
@end example
Example in heading/heading_in_example.
+Similar, but not exactly the same issue, there is no warning with a
+block command between @def* and @def*x, only for paragraph.
+ @defun a b c d e f
+
+ @itemize @minus
+ truc
+ @item t
+ @end itemize
+
+ @defunx g h j k l m
+
+ @end defun
+
+
+
Punctuation and spaces before @image do not lead to a doubling of space.
In fact @image is completly formatted outside of usual formatting containers.
Not sure what should be the right way?
Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm 2014-10-15 16:03:53 UTC (rev
5877)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm 2014-10-15 22:28:00 UTC (rev
5878)
@@ -1719,14 +1719,14 @@
} elsif ($command eq 'tie') {
$formatter->{'w'}++;
$result .= $self->_count_added($formatter->{'container'},
- $formatter->{'container'}->set_space_protection(1,1))
+ $formatter->{'container'}->set_space_protection(1,undef))
if ($formatter->{'w'} == 1);
$result .= $self->_count_added($formatter->{'container'},
$formatter->{'container'}->add_text($text,
$lower_case_text));
$formatter->{'w'}--;
$result .= $self->_count_added($formatter->{'container'},
- $formatter->{'container'}->set_space_protection(0,0))
+ $formatter->{'container'}->set_space_protection(0,undef))
if ($formatter->{'w'} == 0);
} else {
# This is to have @TeX{}, for example, be considered as tex
@@ -1801,7 +1801,7 @@
if ($command eq 'w') {
$formatter->{'w'}++;
$result .= $self->_count_added($formatter->{'container'},
- $formatter->{'container'}->set_space_protection(1,1))
+ $formatter->{'container'}->set_space_protection(1,undef))
if ($formatter->{'w'} == 1);
}
my ($text_before, $text_after);
@@ -1847,7 +1847,7 @@
if ($command eq 'w') {
$formatter->{'w'}--;
$result .= $self->_count_added($formatter->{'container'},
- $formatter->{'container'}->set_space_protection(0,0))
+ $formatter->{'container'}->set_space_protection(0,undef))
if ($formatter->{'w'} == 0);
}
if ($code_style_commands{$command}) {
@@ -3228,6 +3228,7 @@
}
}
+# FIXME document
sub indent_menu_descriptions($;$)
{
my $self = shift;
Modified: trunk/tp/t/results/converters_tests/at_commands_in_refs.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_refs.pl 2014-10-15
16:03:53 UTC (rev 5877)
+++ trunk/tp/t/results/converters_tests/at_commands_in_refs.pl 2014-10-15
22:28:00 UTC (rev 5878)
@@ -22216,8 +22216,8 @@
e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <address@hidden>
-<address@hidden>:: *note [f--ile1] Image description""\\.:: *note @ {} . ::
*note \'cite asis\' in @w b
-in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\'
+<address@hidden>:: *note [f--ile1] Image description""\\.:: *note @ {} . ::
*note \'cite asis\'
+in @w b in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\'
\'samp\'
\'command\' \'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
*note \'indicateurl\':: *note <http://somewhere_aaa> text (url) ls::
@@ -23225,8 +23225,8 @@
e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <address@hidden>
-<address@hidden>:: *note [f--ile1] [image src="f--ile.png" alt="alt"
text="Image description\\"\\"\\\\."