Integrate Mainline

p4raw-id: //depot/perlio@12731

3 files changed, 58 insertions, 72 deletions

diff --git a/lib/ExtUtils/xsubpp b/lib/ExtUtils/xsubpp
index 77e6dba3ad..d242ff13fc 100755
--- a/lib/ExtUtils/xsubpp
+++ b/lib/ExtUtils/xsubpp
@@ -124,7 +124,7 @@ $FH = 'File0000' ;
 
 $usage = "Usage: xsubpp [-v] [-C++] [-except] [-prototypes] [-noversioncheck] [-nolinenumbers] [-nooptimize] [-noinout] [-noargtypes] [-s pattern] [-typemap typemap]... file.xs\n";
 
-$proto_re = "[" . quotemeta('\$%&*@;') . "]" ;
+$proto_re = "[" . quotemeta('\$%&*@;[]') . "]" ;
 
 $except = "";
 $WantPrototypes = -1 ;
diff --git a/lib/unicore/Is.pl b/lib/unicore/Is.pl
index 6ee87e3e91..86e5926127 100644
--- a/lib/unicore/Is.pl
+++ b/lib/unicore/Is.pl
@@ -3,48 +3,43 @@
 # Any changes made here will be lost!
 %utf8::Is =
 (
-'Close Punctuation'                           => 'Pe',
-'Connector Punctuation'                       => 'Pc',
+'Close_Punctuation'                           => 'Pe',
+'Connector_Punctuation'                       => 'Pc',
 'Control'                                     => 'Cc',
-'Currency Symbol'                             => 'Sc',
-'Dash Punctuation'                            => 'Pd',
-'Decimal Digit Number'                        => 'Nd',
-'Enclosing Mark'                              => 'Me',
-'Final Punctuation'                           => 'Pf',
+'Currency_Symbol'                             => 'Sc',
+'Dash_Punctuation'                            => 'Pd',
+'Decimal_Number'                              => 'Nd',
+'Enclosing_Mark'                              => 'Me',
+'Final_Punctuation'                           => 'Pf',
 'Format'                                      => 'Cf',
-'Initial Punctuation'                         => 'Pi',
+'Initial_Punctuation'                         => 'Pi',
 'Letter'                                      => 'L',
-'Letter Number'                               => 'Nl',
-'Line Separator'                              => 'Zl',
-'Lowercase Letter'                            => 'Ll',
+'Letter_Number'                               => 'Nl',
+'Line_Separator'                              => 'Zl',
+'Lowercase_Letter'                            => 'Ll',
 'Mark'                                        => 'M',
-'Math Symbol'                                 => 'Sm',
-'Modifier Letter'                             => 'Lm',
-'Modifier Symbol'                             => 'Sk',
-'Non-Spacing Mark'                            => 'Mn',
-'Not Assigned'                                => 'Cn',
+'Math_Symbol'                                 => 'Sm',
+'Modifier_Letter'                             => 'Lm',
+'Modifier_Symbol'                             => 'Sk',
+'Non_Spacing_Mark'                            => 'Mn',
 'Number'                                      => 'N',
-'Open Punctuation'                            => 'Ps',
+'Open_Punctuation'                            => 'Ps',
 'Other'                                       => 'C',
-'Other Control'                               => 'Cc',
-'Other Format'                                => 'Cf',
-'Other Letter'                                => 'Lo',
-'Other Not Assigned'                          => 'Cn',
-'Other Number'                                => 'No',
-'Other Private Use'                           => 'Co',
-'Other Punctuation'                           => 'Po',
-'Other Surrogate'                             => 'Cs',
-'Other Symbol'                                => 'So',
-'Paragraph Separator'                         => 'Zp',
+'Other_Letter'                                => 'Lo',
+'Other_Number'                                => 'No',
+'Other_Punctuation'                           => 'Po',
+'Other_Symbol'                                => 'So',
+'Paragraph_Separator'                         => 'Zp',
 'Private Use'                                 => 'Co',
 'Punctuation'                                 => 'P',
 'Separator'                                   => 'Z',
-'Space Separator'                             => 'Zs',
-'Spacing Combining Mark'                      => 'Mc',
+'Space_Separator'                             => 'Zs',
+'Spacing_Mark'                                => 'Mc',
 'Surrogate'                                   => 'Cs',
 'Symbol'                                      => 'S',
-'Titlecase Letter'                            => 'Lt',
-'Uppercase Letter'                            => 'Lu',
+'Titlecase_Letter'                            => 'Lt',
+'Unassigned'                                  => 'Cn',
+'Uppercase_Letter'                            => 'Lu',
 );
 %utf8::IsPat =
 (
@@ -62,7 +57,7 @@
 	'Dash(?:[-_]|\s+)?Punctuation' => 'Pd',
 },
 'de' => {
-	'Decimal(?:[-_]|\s+)?Digit(?:[-_]|\s+)?Number' => 'Nd',
+	'Decimal(?:[-_]|\s+)?Number' => 'Nd',
 },
 'en' => {
 	'Enclosing(?:[-_]|\s+)?Mark' => 'Me',
@@ -96,7 +91,6 @@
 },
 'no' => {
 	'Non(?:[-_]|\s+)?Spacing(?:[-_]|\s+)?Mark' => 'Mn',
-	'Not(?:[-_]|\s+)?Assigned' => 'Cn',
 },
 'nu' => {
 	'Number' => 'N',
@@ -106,14 +100,9 @@
 },
 'ot' => {
 	'Other' => 'C',
-	'Other(?:[-_]|\s+)?Control' => 'Cc',
-	'Other(?:[-_]|\s+)?Format' => 'Cf',
 	'Other(?:[-_]|\s+)?Letter' => 'Lo',
-	'Other(?:[-_]|\s+)?Not(?:[-_]|\s+)?Assigned' => 'Cn',
 	'Other(?:[-_]|\s+)?Number' => 'No',
-	'Other(?:[-_]|\s+)?Private(?:[-_]|\s+)?Use' => 'Co',
 	'Other(?:[-_]|\s+)?Punctuation' => 'Po',
-	'Other(?:[-_]|\s+)?Surrogate' => 'Cs',
 	'Other(?:[-_]|\s+)?Symbol' => 'So',
 },
 'pa' => {
@@ -130,7 +119,7 @@
 },
 'sp' => {
 	'Space(?:[-_]|\s+)?Separator' => 'Zs',
-	'Spacing(?:[-_]|\s+)?Combining(?:[-_]|\s+)?Mark' => 'Mc',
+	'Spacing(?:[-_]|\s+)?Mark' => 'Mc',
 },
 'su' => {
 	'Surrogate' => 'Cs',
@@ -141,6 +130,9 @@
 'ti' => {
 	'Titlecase(?:[-_]|\s+)?Letter' => 'Lt',
 },
+'un' => {
+	'Unassigned' => 'Cn',
+},
 'up' => {
 	'Uppercase(?:[-_]|\s+)?Letter' => 'Lu',
 },
diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index 66027a5492..676e189527 100644
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -658,54 +658,48 @@ foreach my $in (sort { $In{$a} <=> $In{$b} } keys %In) {
 
 my %Is = (
 	'Letter'			=>	'L',
-	'Uppercase Letter'		=>	'Lu',
-	'Lowercase Letter'		=>	'Ll',
-	'Titlecase Letter'		=>	'Lt',
-	'Modifier Letter'		=>	'Lm',
-	'Other Letter'			=>	'Lo',
+	'Uppercase_Letter'		=>	'Lu',
+	'Lowercase_Letter'		=>	'Ll',
+	'Titlecase_Letter'		=>	'Lt',
+	'Modifier_Letter'		=>	'Lm',
+	'Other_Letter'			=>	'Lo',
 
 	'Mark'				=>	'M',
-	'Non-Spacing Mark'		=>	'Mn',
-	'Spacing Combining Mark'	=>	'Mc',
-	'Enclosing Mark'		=>	'Me',
+	'Non_Spacing_Mark'		=>	'Mn',
+	'Spacing_Mark'			=>	'Mc',
+	'Enclosing_Mark'		=>	'Me',
 
 	'Separator'			=>	'Z',
-	'Space Separator'		=>	'Zs',
-	'Line Separator'		=>	'Zl',
-	'Paragraph Separator'		=>	'Zp',
+	'Space_Separator'		=>	'Zs',
+	'Line_Separator'		=>	'Zl',
+	'Paragraph_Separator'		=>	'Zp',
 
 	'Number'			=>	'N',
-	'Decimal Digit Number'		=>	'Nd',
-	'Letter Number'			=>	'Nl',
-	'Other Number'			=>	'No',
+	'Decimal_Number'		=>	'Nd',
+	'Letter_Number'			=>	'Nl',
+	'Other_Number'			=>	'No',
 
 	'Punctuation'			=>	'P',
-	'Connector Punctuation'		=>	'Pc',
-	'Dash Punctuation'		=>	'Pd',
-	'Open Punctuation'		=>	'Ps',
-	'Close Punctuation'		=>	'Pe',
-	'Initial Punctuation'		=>	'Pi',
-	'Final Punctuation'		=>	'Pf',
-	'Other Punctuation'		=>	'Po',
+	'Connector_Punctuation'		=>	'Pc',
+	'Dash_Punctuation'		=>	'Pd',
+	'Open_Punctuation'		=>	'Ps',
+	'Close_Punctuation'		=>	'Pe',
+	'Initial_Punctuation'		=>	'Pi',
+	'Final_Punctuation'		=>	'Pf',
+	'Other_Punctuation'		=>	'Po',
 
 	'Symbol'			=>	'S',
-	'Math Symbol'			=>	'Sm',
-	'Currency Symbol'		=>	'Sc',
-	'Modifier Symbol'		=>	'Sk',
-	'Other Symbol'			=>	'So',
+	'Math_Symbol'			=>	'Sm',
+	'Currency_Symbol'		=>	'Sc',
+	'Modifier_Symbol'		=>	'Sk',
+	'Other_Symbol'			=>	'So',
 
 	'Other'				=>	'C',
 	'Control'			=>	'Cc',
 	'Format'			=>	'Cf',
 	'Surrogate'			=>	'Cs',
 	'Private Use'			=>	'Co',
-	'Not Assigned'			=>	'Cn',
-	# 'Other' aliases
-	'Other Control'			=>	'Cc',
-	'Other Format'			=>	'Cf',
-	'Other Surrogate'		=>	'Cs',
-	'Other Private Use'		=>	'Co',
-	'Other Not Assigned'		=>	'Cn',
+	'Unassigned'			=>	'Cn',
 );
 
 #