Align the 'graph' property definition with the proposed

Unicode UTS #18 update (v7).

p4raw-id: //depot/perl@19685

diff --git a/lib/unicore/lib/Graph.pl b/lib/unicore/lib/Graph.pl
index 779fd0b..943056c 100644 (file)
--- a/lib/unicore/lib/Graph.pl
+++ b/lib/unicore/lib/Graph.pl
@@ -10,8 +10,7 @@
 #
 return <<'END';
 0021   007E    
-00A1   00AC    
-00AE   0236    
+00A1   0236    
 0250   0357    
 035D   036F    
 0374   0375    
@@ -36,14 +35,14 @@ return <<'END';
 05BB   05C4    
 05D0   05EA    
 05F0   05F4    
+0600   0603    
 060C   0615    
 061B           
 061F           
 0621   063A    
 0640   0658    
-0660   06DC    
-06DE   070D    
-0710   074A    
+0660   070D    
+070F   074A    
 074D   074F    
 0780   07B1    
 0901   0939    
@@ -246,8 +245,7 @@ return <<'END';
 1760   176C    
 176E   1770    
 1772   1773    
-1780   17B3    
-17B6   17DD    
+1780   17DD    
 17E0   17E9    
 17F0   17F9    
 1800   180D    
@@ -280,10 +278,11 @@ return <<'END';
 1FDD   1FEF    
 1FF2   1FF4    
 1FF6   1FFE    
-2010   2027    
+200C   202E    
 2030   2054    
 2057           
-2070   2071    
+2060   2063    
+206A   2071    
 2074   208E    
 20A0   20B1    
 20D0   20EA    
@@ -329,7 +328,7 @@ return <<'END';
 A000   A48C    
 A490   A4C6    
 AC00   D7A3    
-F900   FA2D    
+E000   FA2D    
 FA30   FA6A    
 FB00   FB06    
 FB13   FB17    
@@ -350,6 +349,7 @@ FE54        FE66
 FE68   FE6B    
 FE70   FE74    
 FE76   FEFC    
+FEFF           
 FF01   FFBE    
 FFC2   FFC7    
 FFCA   FFCF    
@@ -357,7 +357,7 @@ FFD2        FFD7
 FFDA   FFDC    
 FFE0   FFE6    
 FFE8   FFEE    
-FFFC   FFFD    
+FFF9   FFFD    
 10000  1000B   
 1000D  10026   
 10028  1003A   
@@ -383,8 +383,7 @@ FFFC        FFFD
 1083F          
 1D000  1D0F5   
 1D100  1D126   
-1D12A  1D172   
-1D17B  1D1DD   
+1D12A  1D1DD   
 1D300  1D356   
 1D400  1D454   
 1D456  1D49C   
@@ -409,5 +408,9 @@ FFFC        FFFD
 1D7CE  1D7FF   
 20000  2A6D6   
 2F800  2FA1D   
+E0001          
+E0020  E007F   
 E0100  E01EF   
+F0000  FFFFD   
+100000 10FFFD  
 END

diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index 0dff509..083bc58 100644 (file)
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -660,8 +660,7 @@ sub UnicodeData_Txt()
         $Cat{Title}->$op($code) if $cat eq "Lt";
         $Cat{ASCII}->$op($code) if $code <= 0x007F;
         $Cat{Cntrl}->$op($code) if $cat =~ /^C/;
-        $Cat{Graph}->$op($code) if $cat =~ /^[LMNPS]/
-                                && $cat ne "Zs";
+        $Cat{Graph}->$op($code) if $cat !~ /Zs|Cc|Cs|Cn/;
         $Cat{Print}->$op($code) if $cat =~ /^[LMNPS]/
                                 || $cat eq "Zs";
         $Cat{Punct}->$op($code) if $cat =~ /^P/;