[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/Paragraph.pm Texinfo...
From: |
Patrice Dumas |
Subject: |
texinfo/tp Texinfo/Convert/Paragraph.pm Texinfo... |
Date: |
Mon, 07 Nov 2011 22:20:18 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/11/07 22:20:18
Modified files:
tp/Texinfo/Convert: Paragraph.pm Plaintext.pm
tp/t/results/coverage_braces: raw_expanded_in_style.pl
tp/t/results/plaintext_tests: expanded_tex.pl html_expanded.pl
tp/t/results/test_count: expanded_tex.pl
Log message:
Correctly use second line indenting after an end of line in add_next.
Pass a line before the raw output format in Plaintext.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Paragraph.pm?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.187&r2=1.188
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/raw_expanded_in_style.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/expanded_tex.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/html_expanded.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/expanded_tex.pl?cvsroot=texinfo&r1=1.1&r2=1.2
Patches:
Index: Texinfo/Convert/Paragraph.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Paragraph.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- Texinfo/Convert/Paragraph.pm 6 Nov 2011 21:09:29 -0000 1.27
+++ Texinfo/Convert/Paragraph.pm 7 Nov 2011 22:20:17 -0000 1.28
@@ -212,11 +212,9 @@
$paragraph->{'word'} .= $word;
$paragraph->{'underlying_word'} .= $underlying_word unless($transparent);
if ($word =~ /\n/) {
- $paragraph->{'lines_counter'}++;
- $paragraph->{'end_line_count'}++;
- $paragraph->{'counter'} = 0;
- $paragraph->{'word_counter'} = 0;
$result .= $paragraph->{'word'};
+ $paragraph->_end_line();
+ $paragraph->{'word_counter'} = 0;
$paragraph->{'word'} = undef;
$paragraph->{'underlying_word'} = undef;
} else {
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- Texinfo/Convert/Plaintext.pm 6 Nov 2011 00:55:28 -0000 1.187
+++ Texinfo/Convert/Plaintext.pm 7 Nov 2011 22:20:17 -0000 1.188
@@ -1642,6 +1642,8 @@
# reuse the current formatter if not in top level
$result .= $self->_count_added($formatter->{'container'},
$formatter->{'container'}->add_pending_word(1));
+ $result .= $self->_count_added($formatter->{'container'},
+ $formatter->{'container'}->end_line());
} else {
# if in top level, the raw block command is turned into a
# simple preformatted command (alike @verbatim), to have a
Index: t/results/coverage_braces/raw_expanded_in_style.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/raw_expanded_in_style.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage_braces/raw_expanded_in_style.pl 26 Sep 2011 17:15:47
-0000 1.7
+++ t/results/coverage_braces/raw_expanded_in_style.pl 7 Nov 2011 22:20:18
-0000 1.8
@@ -105,7 +105,8 @@
-$result_converted{'plaintext'}->{'raw_expanded_in_style'} = '` in html
+$result_converted{'plaintext'}->{'raw_expanded_in_style'} = '`
+in html
\'
';
Index: t/results/plaintext_tests/expanded_tex.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/expanded_tex.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/expanded_tex.pl 6 Nov 2011 21:09:30 -0000
1.1
+++ t/results/plaintext_tests/expanded_tex.pl 7 Nov 2011 22:20:18 -0000
1.2
@@ -109,7 +109,8 @@
-$result_converted{'plaintext'}->{'expanded_tex'} =
'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa TTT
+$result_converted{'plaintext'}->{'expanded_tex'} =
'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+TTT
GGG
HHH
bbbbbbbbb1 bbbbbbbbbbb2 bbbbbbbbbb3 bbbbbbbbbbbbbb4.
Index: t/results/plaintext_tests/html_expanded.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/html_expanded.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/plaintext_tests/html_expanded.pl 26 Sep 2011 17:15:53 -0000
1.7
+++ t/results/plaintext_tests/html_expanded.pl 7 Nov 2011 22:20:18 -0000
1.8
@@ -93,7 +93,8 @@
-$result_converted{'plaintext'}->{'html_expanded'} = 'Before html
+$result_converted{'plaintext'}->{'html_expanded'} = 'Before
+html
after.
';
Index: t/results/test_count/expanded_tex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/expanded_tex.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/test_count/expanded_tex.pl 6 Nov 2011 21:09:30 -0000
1.1
+++ t/results/test_count/expanded_tex.pl 7 Nov 2011 22:20:18 -0000
1.2
@@ -196,45 +196,47 @@
[3] (0,0) :text|AAA\\n|
[3] (3,0)
[4] (3,0) @tex
- [5] (4,0) :empty_line_after_command:text|\\n|
- [5] (4,0)
- [6] (4,0) :raw:text|TTT\\n|
- [6] (8,1)
- [7] (8,1) :raw:text|GGG|
- [7] (8,1)
- [8] (8,1) :last_raw_newline:text|\\n|
- [8] (12,2)
- [4] (12,2)
- [9] (12,2) :empty_line_after_command:text|\\n|
- [9] (12,2)
- [10] (12,2) :text|After\\n|
- [10] (17,2)
- [2] (18,3)
- [11] (18,3) :empty_line:text|\\n|
- [11] (19,4)
- [12] (19,4) :paragraph
- [13] (19,4) :text|second\\n|
- [13] (28,4)
- [14] (28,4) @tex
- [15] (29,4) :empty_line_after_command:text| |
- [15] (29,4)
- [16] (29,4) :raw:text|FFF\\n|
- [16] (33,5)
- [17] (33,5) :raw:text|GGG |
- [17] (33,5)
- [14] (33,5)
- [18] (33,5) :empty_line_after_command:text|\\n|
- [18] (33,5)
- [19] (33,5) :text|After2.\\n|
- [19] (47,5)
- [12] (48,6)
- [1] (48,6)
-AAA TTT
+ [5] (5,1) :empty_line_after_command:text|\\n|
+ [5] (5,1)
+ [6] (5,1) :raw:text|TTT\\n|
+ [6] (9,2)
+ [7] (9,2) :raw:text|GGG|
+ [7] (9,2)
+ [8] (9,2) :last_raw_newline:text|\\n|
+ [8] (13,3)
+ [4] (13,3)
+ [9] (13,3) :empty_line_after_command:text|\\n|
+ [9] (13,3)
+ [10] (13,3) :text|After\\n|
+ [10] (18,3)
+ [2] (19,4)
+ [11] (19,4) :empty_line:text|\\n|
+ [11] (20,5)
+ [12] (20,5) :paragraph
+ [13] (20,5) :text|second\\n|
+ [13] (29,5)
+ [14] (29,5) @tex
+ [15] (31,6) :empty_line_after_command:text| |
+ [15] (31,6)
+ [16] (31,6) :raw:text|FFF\\n|
+ [16] (35,7)
+ [17] (35,7) :raw:text|GGG |
+ [17] (35,7)
+ [14] (35,7)
+ [18] (35,7) :empty_line_after_command:text|\\n|
+ [18] (35,7)
+ [19] (35,7) :text|After2.\\n|
+ [19] (46,7)
+ [12] (47,8)
+ [1] (47,8)
+AAA
+TTT
GGG
After
- second FFF
- GGG After2.
+ second
+FFF
+GGG After2.
';
1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/Paragraph.pm Texinfo...,
Patrice Dumas <=