[Po4a-commits] "po4a/lib/Locale/Po4a Sgml.pm,1.85,1.86"
Nicolas FRANCOIS
nekral-guest at alioth.debian.org
Sun Nov 20 16:35:31 UTC 2005
Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv12099/lib/Locale/Po4a
Modified Files:
Sgml.pm
Log Message:
There can be spaces between the entity definition and '>'.
[Thomas Huriaux]
Index: Sgml.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Sgml.pm,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- Sgml.pm 20 Nov 2005 16:23:38 -0000 1.85
+++ Sgml.pm 20 Nov 2005 16:35:28 -0000 1.86
@@ -523,7 +523,7 @@
$prolog =~ s/{PO4A-percent}/%/sg;
print STDERR "prolog=>>>>$prolog<<<<\n"
if ($debug{'entities'});
- while ($prolog =~ /(.*?)<!ENTITY\s*%\s*(\S*)\s*SYSTEM\s*"([^>"]*)">(.*)$/is) { #})"{ (Stupid editor)
+ while ($prolog =~ /(.*?)<!ENTITY\s*%\s*(\S*)\s*SYSTEM\s*"([^>"]*)"\s*>(.*)$/is) { #})"{ (Stupid editor)
print STDERR "Seen the definition entity of prolog inclusion '$2' (=$3)\n"
if ($debug{'entities'});
# Preload the content of the entity.
@@ -550,7 +550,7 @@
$moretodo = 1;
next PROLOGENTITY;
}
- while ($prolog =~ /(.*?)<!ENTITY\s*%\s*(\S*)\s*"([^>"]*)">(.*)$/is) { #})"{ (Stupid editor)
+ while ($prolog =~ /(.*?)<!ENTITY\s*%\s*(\S*)\s*"([^>"]*)"\s>(.*)$/is) { #})"{ (Stupid editor)
print STDERR "Seen the definition entity of prolog definition '$2' (=$3)\n"
if ($debug{'entities'});
# Preload the content of the entity.
@@ -591,7 +591,7 @@
# search the file inclusion entities
my %entincl;
my $searchprolog=$prolog;
- while ($searchprolog =~ /(.*?)<!ENTITY\s(\S*)\s*SYSTEM\s*"([^>"]*)">(.*)$/is) { #})"{
+ while ($searchprolog =~ /(.*?)<!ENTITY\s(\S*)\s*SYSTEM\s*"([^>"]*)"\s*>(.*)$/is) { #})"{
print STDERR "Seen the entity of inclusion $2 (=$3)\n"
if ($debug{'entities'});
my $key = $2;
@@ -752,7 +752,7 @@
$self->pushline($1."\n") if (length($1));
$prolog=$2;
my ($post) = $3;
- while ($prolog =~ m/^(.*?)<!ENTITY\s+(\S*)\s+"([^"]*)">(.*)$/is) { #" ){
+ while ($prolog =~ m/^(.*?)<!ENTITY\s+(\S*)\s+"([^"]*)"\s*>(.*)$/is) { #" ){
$self->pushline($1) if length($1);
$self->pushline("<!ENTITY $2 \"".$self->translate($3,"","definition of entity \&$2;")."\">");
warn "Seen text entity $2\n" if ($debug{'entities'});
More information about the Po4a-commits
mailing list