More maneuvering closer to proposed POSIX classes

mapping to Unicode: (1) The definitions of "graph" and
"print" are still in flux: move closer back to how Perl
5.8.0 defined it (though drop Co, that did not make sense)
(2) Add U+0085 (NEL) to "space".

p4raw-id: //depot/perl@19244

diff --git a/lib/unicore/lib/Graph.pl b/lib/unicore/lib/Graph.pl
index 1eff89d..25739cb 100644 (file)
--- a/lib/unicore/lib/Graph.pl
+++ b/lib/unicore/lib/Graph.pl
@@ -277,7 +277,7 @@ return <<'END';
 1FDD   1FEF    
 1FF2   1FF4    
 1FF6   1FFE    
-2010   2029    
+2010   2027    
 2030   2052    
 2057           
 2070   2071    

diff --git a/lib/unicore/lib/Print.pl b/lib/unicore/lib/Print.pl
index ea9c553..3458b77 100644 (file)
--- a/lib/unicore/lib/Print.pl
+++ b/lib/unicore/lib/Print.pl
@@ -278,7 +278,7 @@ return <<'END';
 1FF2   1FF4    
 1FF6   1FFE    
 2000   200B    
-2010   2029    
+2010   2027    
 202F   2052    
 2057           
 205F           

diff --git a/lib/unicore/lib/Space.pl b/lib/unicore/lib/Space.pl
index 868c88c..830c960 100644 (file)
--- a/lib/unicore/lib/Space.pl
+++ b/lib/unicore/lib/Space.pl
@@ -11,6 +11,7 @@
 return <<'END';
 0009   000D    
 0020           
+0085           
 00A0           
 1680           
 2000   200B    

diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index 4c56b0f..0dff509 100644 (file)
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -638,7 +638,8 @@ sub UnicodeData_Txt()
                                 || $code == 0x000A  # 000A: LINE FEED
                                 || $code == 0x000B  # 000B: VERTICAL TAB
                                 || $code == 0x000C  # 000C: FORM FEED
-                                || $code == 0x000D; # 000D: CARRIAGE RETURN
+                                || $code == 0x000D  # 000D: CARRIAGE RETURN
+                                || $code == 0x0085; # 0085: NEL
 
 
         $Cat{SpacePerl}->$op($code) if $cat =~ /^Z/
@@ -659,9 +660,10 @@ 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 =~ /^[^C]/
+        $Cat{Graph}->$op($code) if $cat =~ /^[LMNPS]/
                                 && $cat ne "Zs";
-        $Cat{Print}->$op($code) if $cat =~ /^[^C]/;
+        $Cat{Print}->$op($code) if $cat =~ /^[LMNPS]/
+                                || $cat eq "Zs";
         $Cat{Punct}->$op($code) if $cat =~ /^P/;
 
         $Cat{XDigit}->$op($code) if ($code >= 0x30 && $code <= 0x39)  ## 0..9