[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/In...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/In... |
|
Date: |
Wed, 02 Mar 2011 22:26:35 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/03/02 22:26:34
Modified files:
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: Info.pm Plaintext.pm
tp/t/results/coverage: math.pl
tp/t/results/coverage_braces: footnote_ending_on_empty_line.pl
footnote_not_closed.pl
heading_in_footnote.pl
space_in_footnote.pl
tp/t/results/def: end_of_lines_protected_in_footnote.pl
tp/t/results/float: complex_float.pl
numbering_captions_listoffloats.pl
tp/t/results/indices:
printindex_index_entry_in_copying_in_footnote.pl
tp/t/results/info_tests: encoding_us_ascii.pl
tp/t/results/regions: anchor_in_copying_in_footnote.pl
Log message:
Add the coding: variable for us-ascii too.
Consider spaces following a context @-command opening (@footnote, @math
and @caption) to be ignorable.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.212&r2=1.213
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/math.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/footnote_not_closed.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected_in_footnote.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl?cvsroot=texinfo&r1=1.1&r2=1.2
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -b -r1.212 -r1.213
--- Texinfo/Parser.pm 27 Feb 2011 15:57:19 -0000 1.212
+++ Texinfo/Parser.pm 2 Mar 2011 22:26:32 -0000 1.213
@@ -3733,7 +3733,7 @@
push @{$self->{'context_stack'}},
$current->{'parent'}->{'cmdname'};
$line =~ s/([^\S\n]*)//;
$current->{'type'} = 'brace_command_context';
- push @{$current->{'contents'}}, { 'type' => 'empty_line',
+ push @{$current->{'contents'}}, { 'type' =>
'empty_spaces_before_argument',
'text' => $1,
'parent' => $current };
} else {
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- Texinfo/Convert/Info.pm 2 Mar 2011 01:04:15 -0000 1.43
+++ Texinfo/Convert/Info.pm 2 Mar 2011 22:26:33 -0000 1.44
@@ -257,7 +257,8 @@
}
$tag_text .= "\x{1F}\nEnd Tag Table\n";
my $coding = $self->{'encoding'};
- if ($coding and $coding ne 'us-ascii') {
+ #if ($coding and $coding ne 'us-ascii') {
+ if ($coding) {# and $coding ne 'us-ascii') {
$tag_text .= "\n\x{1F}\nLocal Variables:\ncoding: $coding\nEnd:\n";
}
if ($fh) {
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- Texinfo/Convert/Plaintext.pm 2 Mar 2011 01:04:15 -0000 1.105
+++ Texinfo/Convert/Plaintext.pm 2 Mar 2011 22:26:33 -0000 1.106
@@ -815,6 +815,7 @@
$self->{'text_element_context'}->[-1]->{'counter'} +=
Texinfo::Convert::Unicode::string_width($footnote_text);
$self->_add_text_count($footnote_text);
+ $self->{'empty_lines_count'} = 0;
$result .= $self->_convert($footnote->{'root'}->{'args'}->[0]);
$result .= $self->_add_newline_if_needed();
Index: t/results/coverage/math.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/math.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/coverage/math.pl 19 Feb 2011 02:26:39 -0000 1.18
+++ t/results/coverage/math.pl 2 Mar 2011 22:26:33 -0000 1.19
@@ -151,7 +151,12 @@
'contents' => [
{
'parent' => {},
- 'text' => ' \\underline'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => '\\underline'
},
{
'contents' => [
@@ -317,23 +322,24 @@
$result_trees{'math'}{'contents'}[3]{'parent'} = $result_trees{'math'};
$result_trees{'math'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'math'}{'contents'}[4];
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[5];
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
= $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[1];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6];
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
= $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[7];
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[7]{'contents'}[1];
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
=
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[7];
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[7]{'parent'}
= $result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0];
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'math'}{'contents'}[4]{'contents'}[1];
-$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'line_nr'} =
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'line_nr'} =
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'line_nr'};
$result_trees{'math'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'math'}{'contents'}[4];
$result_trees{'math'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'math'}{'contents'}[4];
$result_trees{'math'}{'contents'}[4]{'parent'} = $result_trees{'math'};
@@ -367,7 +373,7 @@
math code a < b
Complex
- \\underline{math \\hbox{ code }} \\i \\sum_{i}{\\underline{f}}
+\\underline{math \\hbox{ code }} \\i \\sum_{i}{\\underline{f}}
@\\ outside of math
\\
Index: t/results/coverage_braces/footnote_ending_on_empty_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/coverage_braces/footnote_ending_on_empty_line.pl 7 Dec 2010
20:34:28 -0000 1.14
+++ t/results/coverage_braces/footnote_ending_on_empty_line.pl 2 Mar 2011
22:26:33 -0000 1.15
@@ -17,7 +17,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
Index: t/results/coverage_braces/footnote_not_closed.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/footnote_not_closed.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/coverage_braces/footnote_not_closed.pl 7 Dec 2010 20:34:28
-0000 1.11
+++ t/results/coverage_braces/footnote_not_closed.pl 2 Mar 2011 22:26:33
-0000 1.12
@@ -17,7 +17,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
Index: t/results/coverage_braces/heading_in_footnote.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage_braces/heading_in_footnote.pl 20 Feb 2011 14:47:08
-0000 1.2
+++ t/results/coverage_braces/heading_in_footnote.pl 2 Mar 2011 22:26:33
-0000 1.3
@@ -18,7 +18,7 @@
'parent' => {},
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
Index: t/results/coverage_braces/space_in_footnote.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/space_in_footnote.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/coverage_braces/space_in_footnote.pl 7 Dec 2010 20:34:28
-0000 1.14
+++ t/results/coverage_braces/space_in_footnote.pl 2 Mar 2011 22:26:33
-0000 1.15
@@ -17,7 +17,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
Index: t/results/def/end_of_lines_protected_in_footnote.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/end_of_lines_protected_in_footnote.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/def/end_of_lines_protected_in_footnote.pl 20 Feb 2011 14:47:08
-0000 1.19
+++ t/results/def/end_of_lines_protected_in_footnote.pl 2 Mar 2011 22:26:33
-0000 1.20
@@ -14,7 +14,7 @@
'parent' => {},
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_spaces_before_argument'
},
{
'cmdname' => 'deffn',
@@ -355,9 +355,9 @@
---------- Footnotes ----------
- (1) -- category: deffn_name arguments arg2 more args with end of line
- within with 3 @ @ one last arg
- deffn
+ (1) -- category: deffn_name arguments arg2 more args with end of
+ line within with 3 @ @ one last arg
+deffn
';
Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/float/complex_float.pl 20 Feb 2011 12:18:35 -0000 1.10
+++ t/results/float/complex_float.pl 2 Mar 2011 22:26:33 -0000 1.11
@@ -934,7 +934,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
@@ -2330,7 +2330,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
Index: t/results/float/numbering_captions_listoffloats.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/float/numbering_captions_listoffloats.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/float/numbering_captions_listoffloats.pl 27 Feb 2011 20:15:27
-0000 1.16
+++ t/results/float/numbering_captions_listoffloats.pl 2 Mar 2011 22:26:34
-0000 1.17
@@ -139,7 +139,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
@@ -1744,7 +1744,7 @@
{
'parent' => {},
'text' => ' ',
- 'type' => 'empty_spaces_before_paragraph'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
Index: t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 22 Feb
2011 19:46:22 -0000 1.1
+++ t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 2 Mar
2011 22:26:34 -0000 1.2
@@ -35,7 +35,7 @@
'parent' => {},
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
Index: t/results/info_tests/encoding_us_ascii.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/encoding_us_ascii.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/info_tests/encoding_us_ascii.pl 19 Feb 2011 12:21:49 -0000
1.1
+++ t/results/info_tests/encoding_us_ascii.pl 2 Mar 2011 22:26:34 -0000
1.2
@@ -183,6 +183,11 @@
Node: Top52
End Tag Table
+
+
+Local Variables:
+coding: us-ascii
+End:
';
1;
Index: t/results/regions/anchor_in_copying_in_footnote.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/regions/anchor_in_copying_in_footnote.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/regions/anchor_in_copying_in_footnote.pl 22 Feb 2011 19:46:22
-0000 1.1
+++ t/results/regions/anchor_in_copying_in_footnote.pl 2 Mar 2011 22:26:34
-0000 1.2
@@ -35,7 +35,7 @@
'parent' => {},
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'empty_spaces_before_argument'
},
{
'contents' => [
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm Texinfo/Convert/In...,
Patrice Dumas <=