[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp/Texinfo Parser.pm Convert/NodeNameNo...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp/Texinfo Parser.pm Convert/NodeNameNo... |
|
Date: |
Fri, 29 Oct 2010 07:31:06 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/10/29 07:31:06
Modified files:
tp/Texinfo : Parser.pm
Added files:
tp/Texinfo/Convert: NodeNameNormalization.pm
Removed files:
tp/Texinfo/Convert: NormalizeNode.pm
Log message:
Rename NormalizeNode as NodeNameNormalization.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/NormalizeNode.pm?cvsroot=texinfo&r1=1.3&r2=0
Patches:
Index: Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- Parser.pm 28 Oct 2010 21:33:08 -0000 1.119
+++ Parser.pm 29 Oct 2010 07:31:05 -0000 1.120
@@ -34,7 +34,7 @@
# to expand file names in @include
use Texinfo::Convert::Text;
# to normalize node name, anchor, float arg, listoffloats and first *ref
argument.
-use Texinfo::Convert::NormalizeNode;
+use Texinfo::Convert::NodeNameNormalization;
# to detect if an encoding may be used to open the files
use Encode;
use strict;
@@ -1587,7 +1587,7 @@
if (@contents) {
$result->{'node_content'} = address@hidden;
$result->{'normalized'} =
- Texinfo::Convert::NormalizeNode::convert({'contents' => address@hidden);
+ Texinfo::Convert::NodeNameNormalization::convert({'contents' =>
address@hidden);
}
return $result;
}
Index: Convert/NodeNameNormalization.pm
===================================================================
RCS file: Convert/NodeNameNormalization.pm
diff -N Convert/NodeNameNormalization.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Convert/NodeNameNormalization.pm 29 Oct 2010 07:31:06 -0000 1.1
@@ -0,0 +1,205 @@
+# NodeNameNormalization.pm: output tree as normalized node name.
+#
+# Copyright 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Original author: Patrice Dumas <address@hidden>
+
+# the rules for conversion are decribed in the Texinfo manual, for
+# HTML crossrefs.
+
+package Texinfo::Convert::NodeNameNormalization;
+
+use 5.00405;
+use strict;
+
+use Texinfo::Convert::Text;
+use Unicode::Normalize;
+use Texinfo::Convert::Unicode;
+
+require Exporter;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
address@hidden = qw(Exporter);
+
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+
+# This allows declaration use Texinfo::Covert::Text ':all';
+# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
+# will save memory.
+%EXPORT_TAGS = ( 'all' => [ qw(
+ convert
+) ] );
+
address@hidden = ( @{ $EXPORT_TAGS{'all'} } );
+
address@hidden = qw(
+);
+
+$VERSION = '0.01';
+
+my %normalize_node_brace_no_arg_commands
+ = %Texinfo::Convert::Text::text_brace_no_arg_commands;
+foreach my $command
(keys(%Texinfo::Convert::Unicode::unicode_character_brace_no_arg_commands)) {
+ $normalize_node_brace_no_arg_commands{$command} =
+
$Texinfo::Convert::Unicode::unicode_character_brace_no_arg_commands{$command};
+}
+
+my %normalize_node_no_brace_commands
+ = %Texinfo::Convert::Text::text_no_brace_commands;
+$normalize_node_no_brace_commands{'*'} = ' ';
+
+my %accent_commands;
+foreach my $accent_command
(keys(%Texinfo::Convert::Unicode::unicode_accented_letters),
+ 'tieaccent', 'dotless') {
+ $accent_commands{$accent_command} = 1;
+}
+
+my %ignored_brace_commands;
+foreach my $ignored_brace_command ('xref','ref','pxref','inforef','anchor',
+ 'footnote', 'shortcaption', 'caption', 'hyphenation') {
+ $ignored_brace_commands{$ignored_brace_command} = 1;
+}
+
+my %ignored_types;
+foreach my $type ('empty_line_after_command',
+ 'empty_spaces_after_command', 'spaces_at_end',
+ 'empty_spaces_before_argument', 'space_at_end_menu_node') {
+ $ignored_types{$type} = 1;
+}
+
+sub _normalise_space($)
+{
+ return undef unless (defined ($_[0]));
+ my $text = shift;
+ $text =~ s/\s+/ /go;
+ $text =~ s/ $//;
+ $text =~ s/^ //;
+ return $text;
+}
+
+sub convert($)
+{
+ my $root = shift;
+ my $result = _convert($root);
+ $result = Unicode::Normalize::NFC($result);
+ $result = _unicode_to_protected($result);
+ $result = 'Top' if ($result =~ /^Top$/i);
+ return $result;
+}
+
+sub _unicode_to_protected($)
+{
+ my $text = shift;
+ my $result = '';
+ while ($text ne '') {
+ if ($text =~ s/^([A-Za-z0-9]+)//o) {
+ $result .= $1;
+ } elsif ($text =~ s/^ //o) {
+ $result .= '-';
+ } elsif ($text =~ s/^(.)//o) {
+ my $char = $1;
+ if
(exists($Texinfo::Convert::Unicode::unicode_simple_character_map{$char})) {
+ $result .= '_' .
lc($Texinfo::Convert::Unicode::unicode_simple_character_map{$char});
+ } else {
+ if (ord($char) <= hex(0xFFFF)) {
+ $result .= '_' . lc(sprintf("%04x",ord($char)));
+ } else {
+ $result .= '__' . lc(sprintf("%06x",ord($char)));
+ }
+ }
+ } else {
+ print STDERR "Bug: unknown character in a cross ref (likely in infinite
loop)\n";
+ print STDERR "Text: !!$text!!\n";
+ sleep 1;
+ }
+ }
+ return $result;
+}
+
+
+sub _convert($;$);
+
+sub _convert($;$)
+{
+ my $root = shift;
+ my $in_sc = shift;
+
+ if (0) {
+ print STDERR "root\n";
+ print STDERR " Command: $root->{'cmdname'}\n" if ($root->{'cmdname'});
+ print STDERR " Type: $root->{'type'}\n" if ($root->{'type'});
+ print STDERR " Text: $root->{'text'}\n" if (defined($root->{'text'}));
+ #print STDERR " Special def_command: $root->{'extra'}->{'def_command'}\n"
+ # if (defined($root->{'extra'}) and $root->{'extra'}->{'def_command'});
+ }
+
+ return '' if (($root->{'type'} and $ignored_types{$root->{'type'}})
+ or ($root->{'cmdname'}
+ and ($ignored_brace_commands{$root->{'cmdname'}}
+ # here ignore the misc commands
+ or ($root->{'args'} and $root->{'args'}->[0]
+ and $root->{'args'}->[0]->{'type'}
+ and ($root->{'args'}->[0]->{'type'} eq 'misc_line_arg'
+ or $root->{'args'}->[0]->{'type'} eq 'misc_arg')))));
+ my $result = '';
+ if (defined($root->{'text'})) {
+ $result = $root->{'text'};
+ $result =~ s/\s+/ /go;
+ $result = uc($result) if ($in_sc);
+ }
+ if ($root->{'cmdname'}) {
+ my $command = $root->{'cmdname'};
+ if (defined($normalize_node_no_brace_commands{$root->{'cmdname'}})) {
+ return $normalize_node_no_brace_commands{$root->{'cmdname'}};
+ } elsif
(defined($normalize_node_brace_no_arg_commands{$root->{'cmdname'}})) {
+ $command = $root->{'extra'}->{'clickstyle'}
+ if ($root->{'extra'}
+ and defined($root->{'extra'}->{'clickstyle'})
+ and
defined($normalize_node_brace_no_arg_commands{$root->{'extra'}->{'clickstyle'}}));
+ return $normalize_node_brace_no_arg_commands{$command};
+ # commands with braces
+ } elsif ($accent_commands{$root->{'cmdname'}}) {
+ return '' if (!$root->{'args'});
+ return
Texinfo::Convert::Unicode::unicode_accent(_convert($root->{'args'}->[0]),
$root);
+ } elsif ($root->{'cmdname'} eq 'image') {
+ return _convert($root->{'args'}->[0]);
+ } elsif ($root->{'cmdname'} eq 'email') {
+ my $mail = _normalise_space(_convert($root->{'args'}->[0]));
+ my $text;
+ $text = _normalise_space(_convert($root->{'args'}->[1]))
+ if (defined($root->{'args'}->[1]));
+ return $text if (defined($text) and ($text ne ''));
+ return $mail;
+ } elsif ($root->{'args'} and $root->{'args'}->[0]
+ and (($root->{'args'}->[0]->{'type'}
+ and $root->{'args'}->[0]->{'type'} eq 'brace_command_arg')
+ or $root->{'cmdname'} eq 'math')) {
+ my $sc = 1 if ($root->{'cmdname'} eq 'sc' or $in_sc);
+ return _convert($root->{'args'}->[0], $sc);
+ }
+ }
+ if ($root->{'contents'}) {
+ foreach my $content (@{$root->{'contents'}}) {
+ $result .= _convert($content, $in_sc);
+ }
+ }
+ $result = '{'.$result.'}'
+ if ($root->{'type'} and $root->{'type'} eq 'bracketed');
+ return $result;
+}
+
+1;
Index: Convert/NormalizeNode.pm
===================================================================
RCS file: Convert/NormalizeNode.pm
diff -N Convert/NormalizeNode.pm
--- Convert/NormalizeNode.pm 28 Oct 2010 21:33:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,205 +0,0 @@
-# NormalizeNode.pm: output tree as normalized node name.
-#
-# Copyright 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Original author: Patrice Dumas <address@hidden>
-
-# the rules for conversion are decribed in the Texinfo manual, for
-# HTML crossrefs.
-
-package Texinfo::Convert::NormalizeNode;
-
-use 5.00405;
-use strict;
-
-use Texinfo::Convert::Text;
-use Unicode::Normalize;
-use Texinfo::Convert::Unicode;
-
-require Exporter;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
address@hidden = qw(Exporter);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration use Texinfo::Covert::Text ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-%EXPORT_TAGS = ( 'all' => [ qw(
- convert
-) ] );
-
address@hidden = ( @{ $EXPORT_TAGS{'all'} } );
-
address@hidden = qw(
-);
-
-$VERSION = '0.01';
-
-my %normalize_node_brace_no_arg_commands
- = %Texinfo::Convert::Text::text_brace_no_arg_commands;
-foreach my $command
(keys(%Texinfo::Convert::Unicode::unicode_character_brace_no_arg_commands)) {
- $normalize_node_brace_no_arg_commands{$command} =
-
$Texinfo::Convert::Unicode::unicode_character_brace_no_arg_commands{$command};
-}
-
-my %normalize_node_no_brace_commands
- = %Texinfo::Convert::Text::text_no_brace_commands;
-$normalize_node_no_brace_commands{'*'} = ' ';
-
-my %accent_commands;
-foreach my $accent_command
(keys(%Texinfo::Convert::Unicode::unicode_accented_letters),
- 'tieaccent', 'dotless') {
- $accent_commands{$accent_command} = 1;
-}
-
-my %ignored_brace_commands;
-foreach my $ignored_brace_command ('xref','ref','pxref','inforef','anchor',
- 'footnote', 'shortcaption', 'caption', 'hyphenation') {
- $ignored_brace_commands{$ignored_brace_command} = 1;
-}
-
-my %ignored_types;
-foreach my $type ('empty_line_after_command',
- 'empty_spaces_after_command', 'spaces_at_end',
- 'empty_spaces_before_argument', 'space_at_end_menu_node') {
- $ignored_types{$type} = 1;
-}
-
-sub _normalise_space($)
-{
- return undef unless (defined ($_[0]));
- my $text = shift;
- $text =~ s/\s+/ /go;
- $text =~ s/ $//;
- $text =~ s/^ //;
- return $text;
-}
-
-sub convert($)
-{
- my $root = shift;
- my $result = _convert($root);
- $result = Unicode::Normalize::NFC($result);
- $result = _unicode_to_protected($result);
- $result = 'Top' if ($result =~ /^Top$/i);
- return $result;
-}
-
-sub _unicode_to_protected($)
-{
- my $text = shift;
- my $result = '';
- while ($text ne '') {
- if ($text =~ s/^([A-Za-z0-9]+)//o) {
- $result .= $1;
- } elsif ($text =~ s/^ //o) {
- $result .= '-';
- } elsif ($text =~ s/^(.)//o) {
- my $char = $1;
- if
(exists($Texinfo::Convert::Unicode::unicode_simple_character_map{$char})) {
- $result .= '_' .
lc($Texinfo::Convert::Unicode::unicode_simple_character_map{$char});
- } else {
- if (ord($char) <= hex(0xFFFF)) {
- $result .= '_' . lc(sprintf("%04x",ord($char)));
- } else {
- $result .= '__' . lc(sprintf("%06x",ord($char)));
- }
- }
- } else {
- print STDERR "Bug: unknown character in a cross ref (likely in infinite
loop)\n";
- print STDERR "Text: !!$text!!\n";
- sleep 1;
- }
- }
- return $result;
-}
-
-
-sub _convert($;$);
-
-sub _convert($;$)
-{
- my $root = shift;
- my $in_sc = shift;
-
- if (0) {
- print STDERR "root\n";
- print STDERR " Command: $root->{'cmdname'}\n" if ($root->{'cmdname'});
- print STDERR " Type: $root->{'type'}\n" if ($root->{'type'});
- print STDERR " Text: $root->{'text'}\n" if (defined($root->{'text'}));
- #print STDERR " Special def_command: $root->{'extra'}->{'def_command'}\n"
- # if (defined($root->{'extra'}) and $root->{'extra'}->{'def_command'});
- }
-
- return '' if (($root->{'type'} and $ignored_types{$root->{'type'}})
- or ($root->{'cmdname'}
- and ($ignored_brace_commands{$root->{'cmdname'}}
- # here ignore the misc commands
- or ($root->{'args'} and $root->{'args'}->[0]
- and $root->{'args'}->[0]->{'type'}
- and ($root->{'args'}->[0]->{'type'} eq 'misc_line_arg'
- or $root->{'args'}->[0]->{'type'} eq 'misc_arg')))));
- my $result = '';
- if (defined($root->{'text'})) {
- $result = $root->{'text'};
- $result =~ s/\s+/ /go;
- $result = uc($result) if ($in_sc);
- }
- if ($root->{'cmdname'}) {
- my $command = $root->{'cmdname'};
- if (defined($normalize_node_no_brace_commands{$root->{'cmdname'}})) {
- return $normalize_node_no_brace_commands{$root->{'cmdname'}};
- } elsif
(defined($normalize_node_brace_no_arg_commands{$root->{'cmdname'}})) {
- $command = $root->{'extra'}->{'clickstyle'}
- if ($root->{'extra'}
- and defined($root->{'extra'}->{'clickstyle'})
- and
defined($normalize_node_brace_no_arg_commands{$root->{'extra'}->{'clickstyle'}}));
- return $normalize_node_brace_no_arg_commands{$command};
- # commands with braces
- } elsif ($accent_commands{$root->{'cmdname'}}) {
- return '' if (!$root->{'args'});
- return
Texinfo::Convert::Unicode::unicode_accent(_convert($root->{'args'}->[0]),
$root);
- } elsif ($root->{'cmdname'} eq 'image') {
- return _convert($root->{'args'}->[0]);
- } elsif ($root->{'cmdname'} eq 'email') {
- my $mail = _normalise_space(_convert($root->{'args'}->[0]));
- my $text;
- $text = _normalise_space(_convert($root->{'args'}->[1]))
- if (defined($root->{'args'}->[1]));
- return $text if (defined($text) and ($text ne ''));
- return $mail;
- } elsif ($root->{'args'} and $root->{'args'}->[0]
- and (($root->{'args'}->[0]->{'type'}
- and $root->{'args'}->[0]->{'type'} eq 'brace_command_arg')
- or $root->{'cmdname'} eq 'math')) {
- my $sc = 1 if ($root->{'cmdname'} eq 'sc' or $in_sc);
- return _convert($root->{'args'}->[0], $sc);
- }
- }
- if ($root->{'contents'}) {
- foreach my $content (@{$root->{'contents'}}) {
- $result .= _convert($content, $in_sc);
- }
- }
- $result = '{'.$result.'}'
- if ($root->{'type'} and $root->{'type'} eq 'bracketed');
- return $result;
-}
-
-1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp/Texinfo Parser.pm Convert/NodeNameNo...,
Patrice Dumas <=