[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/NodeNameNormalizatio...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/NodeNameNormalizatio... |
|
Date: |
Fri, 30 Sep 2011 23:09:45 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/30 23:09:45
Modified files:
tp/Texinfo/Convert: NodeNameNormalization.pm Text.pm
tp/t : 30sectioning.t
Added files:
tp/t/results/sectioning: email_in_node.pl
Log message:
Remove _normalise_space, it is not useful.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/30sectioning.t?cvsroot=texinfo&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/email_in_node.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: Texinfo/Convert/NodeNameNormalization.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Texinfo/Convert/NodeNameNormalization.pm 29 Sep 2011 13:57:21 -0000
1.14
+++ Texinfo/Convert/NodeNameNormalization.pm 30 Sep 2011 23:09:44 -0000
1.15
@@ -115,16 +115,6 @@
my $result = _convert($root);
}
-sub _normalise_space($)
-{
- return undef unless (defined ($_[0]));
- my $text = shift;
- $text =~ s/\s+/ /go;
- $text =~ s/ $//;
- $text =~ s/^ //;
- return $text;
-}
-
sub _unicode_to_protected($)
{
my $text = shift;
@@ -234,8 +224,6 @@
or $root->{'args'}->[0]->{'type'} eq 'misc_arg')))));
my $result = '';
if (defined($root->{'text'})) {
- # FIXME the manual says that (in HTML Xref Command Expansion)
- # Quotation mark commands are likewise replaced by their Unicode values
$result = $root->{'text'};
$result =~ s/\s+/ /go;
$result = uc($result) if ($in_sc);
@@ -275,9 +263,9 @@
} elsif ($root->{'cmdname'} eq 'image') {
return _convert($root->{'args'}->[0]);
} elsif ($root->{'cmdname'} eq 'email') {
- my $mail = _normalise_space(_convert($root->{'args'}->[0]));
+ my $mail = _convert($root->{'args'}->[0]);
my $text;
- $text = _normalise_space(_convert($root->{'args'}->[1]))
+ $text = _convert($root->{'args'}->[1])
if (defined($root->{'args'}->[1]));
return $text if (defined($text) and ($text ne ''));
return $mail;
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- Texinfo/Convert/Text.pm 30 Sep 2011 22:31:31 -0000 1.72
+++ Texinfo/Convert/Text.pm 30 Sep 2011 23:09:44 -0000 1.73
@@ -283,16 +283,6 @@
return $result;
}
-sub _normalise_space($)
-{
- return undef unless (defined ($_[0]));
- my $text = shift;
- $text =~ s/\s+/ /go;
- $text =~ s/ $//;
- $text =~ s/^ //;
- return $text;
-}
-
sub _code_options($)
{
my $options = shift;
@@ -378,16 +368,15 @@
} elsif ($root->{'cmdname'} eq 'image') {
return convert($root->{'args'}->[0], _code_options($options));
} elsif ($root->{'cmdname'} eq 'email') {
- my $mail = _normalise_space(convert($root->{'args'}->[0],
- _code_options($options)));
+ my $mail = convert($root->{'args'}->[0], _code_options($options));
my $text;
- $text = _normalise_space(convert($root->{'args'}->[1], $options))
+ $text = convert($root->{'args'}->[1], $options)
if (defined($root->{'args'}->[1]));
return $text if (defined($text) and ($text ne ''));
return $mail;
} elsif ($root->{'cmdname'} eq 'uref' or $root->{'cmdname'} eq 'url') {
my $replacement;
- $replacement = _normalise_space(convert($root->{'args'}->[2], $options))
+ $replacement = convert($root->{'args'}->[2], $options)
if (defined($root->{'args'}->[2]));
return $replacement if (defined($replacement) and $replacement ne '');
my $text;
Index: t/30sectioning.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/30sectioning.t,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- t/30sectioning.t 17 Sep 2011 20:28:19 -0000 1.57
+++ t/30sectioning.t 30 Sep 2011 23:09:45 -0000 1.58
@@ -981,6 +981,9 @@
['at_commands_in_node',
'@node A @sc{sc} node @"i @"address@hidden @address@hidden @l{}
@,address@hidden'C} @exclamdown{}'
],
+['email_in_node',
+'@node @email{ a } @email{c , d} @email{ , e}
+'],
['sections',
'@chapter a chapter
'],
Index: t/results/sectioning/email_in_node.pl
===================================================================
RCS file: t/results/sectioning/email_in_node.pl
diff -N t/results/sectioning/email_in_node.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/sectioning/email_in_node.pl 30 Sep 2011 23:09:45 -0000
1.1
@@ -0,0 +1,256 @@
+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{'email_in_node'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'c'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'd'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'e'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'email',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ undef,
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [],
+ 'extra' => {
+ 'node_content' => [
+ {},
+ {},
+ {},
+ {},
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'a-d-e'
+ }
+ ],
+ 'normalized' => 'a-d-e'
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'email_in_node'}{'contents'}[0]{'parent'} =
$result_trees{'email_in_node'};
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'email_in_node'}{'contents'}[1];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[1]{'contents'}[1];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'}
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[1];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[1]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'args'}[1]{'contents'}[1];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'line_nr'}
=
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
= $result_trees{'email_in_node'}{'contents'}[1]{'args'}[0];
+$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'email_in_node'}{'contents'}[1];
+$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[1] =
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[2] =
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[3] =
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[4];
+$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'}[4] =
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[5];
+$result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'email_in_node'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'email_in_node'}{'contents'}[1]{'line_nr'} =
$result_trees{'email_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'email_in_node'}{'contents'}[1]{'parent'} =
$result_trees{'email_in_node'};
+
+$result_texis{'email_in_node'} = '@node @email{ a } @email{c , d} @email{ , e}
+';
+
+
+$result_texts{'email_in_node'} = '';
+
+$result_sectioning{'email_in_node'} = {};
+
+$result_nodes{'email_in_node'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'a-d-e'
+ }
+};
+
+$result_menus{'email_in_node'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'a-d-e'
+ }
+};
+
+$result_errors{'email_in_node'} = [];
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/NodeNameNormalizatio...,
Patrice Dumas <=