[Po4a-commits] "po4a/lib/Locale/Po4a Sgml.pm,1.96,1.97"

Nicolas FRANCOIS nekral-guest at alioth.debian.org
Sun Nov 27 19:29:57 UTC 2005


Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv14784/lib/Locale/Po4a

Modified Files:
	Sgml.pm 
Log Message:
$end was not always $2.


Index: Sgml.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Sgml.pm,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- Sgml.pm	27 Nov 2005 16:10:11 -0000	1.96
+++ Sgml.pm	27 Nov 2005 19:29:44 -0000	1.97
@@ -661,9 +661,10 @@
     foreach my $key (keys %entincl) {
         # The external entity can be referenced as &key; or &key
         # In the second case, we must differentiate &key and &key2
-        while ($origfile =~/^(.*?)&$key(?:;(.*)$|([^-_:.A-Za-z0-9].*)$|$)/s) {
+        while ($origfile =~/^(.*?)&$key(;.*$|[^-_:.A-Za-z0-9].*$|$)/s) {
 	    my ($begin,$end)=($1,$2);
 	    $end = "" unless (defined $end);
+	    $end =~ s/^;//s;
 
 	    if ($begin =~ m/.*<!--(.*?)$/s and $1 !~ m/-->/s) {
 		# This entity is commented. Just remove it.




More information about the Po4a-commits mailing list