From 92a9c5c6c798a15f2adc171d986e9e4e252a0c77 Mon Sep 17 00:00:00 2001 From: Ted Clancy Date: Fri, 17 Apr 2015 14:19:39 -0400 Subject: [PATCH] Bug 1151908 - Updating our character property data with new Bidi info from Unicode 6.3. r=smontagu --- .../tools/genUnicodePropertyData.pl | 6 +++++- intl/unicharutil/util/nsBidiUtils.h | 4 ++++ .../util/nsUnicodePropertyData.cpp | 20 +++++++++---------- intl/unicharutil/util/nsUnicodeScriptCodes.h | 8 ++++---- layout/base/nsBidi.cpp | 4 ++++ 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/intl/unicharutil/tools/genUnicodePropertyData.pl b/intl/unicharutil/tools/genUnicodePropertyData.pl index c7015104423..b5103a641fc 100644 --- a/intl/unicharutil/tools/genUnicodePropertyData.pl +++ b/intl/unicharutil/tools/genUnicodePropertyData.pl @@ -306,7 +306,11 @@ my %bidicategoryCode = ( "RLO" => "15", # Right-to-Left Override "PDF" => "16", # Pop Directional Format "NSM" => "17", # Non-Spacing Mark - "BN" => "18" # Boundary Neutral + "BN" => "18", # Boundary Neutral + "LRI" => "19", # Left-to-Right Isolate + "RLI" => "20", # Right-to-left Isolate + "FSI" => "21", # First Strong Isolate + "PDI" => "22" # Pop Direcitonal Isolate ); my %verticalOrientationCode = ( diff --git a/intl/unicharutil/util/nsBidiUtils.h b/intl/unicharutil/util/nsBidiUtils.h index 6e2f5c4d419..ce2ac307b87 100644 --- a/intl/unicharutil/util/nsBidiUtils.h +++ b/intl/unicharutil/util/nsBidiUtils.h @@ -37,6 +37,10 @@ enum nsCharType { eCharType_PopDirectionalFormat = 16, eCharType_DirNonSpacingMark = 17, eCharType_BoundaryNeutral = 18, + eCharType_LeftToRightIsolate = 19, + eCharType_RightToLeftIsolate = 20, + eCharType_FirstStrongIsolate = 21, + eCharType_PopDirectionalIsolate = 22, eCharType_CharTypeCount }; diff --git a/intl/unicharutil/util/nsUnicodePropertyData.cpp b/intl/unicharutil/util/nsUnicodePropertyData.cpp index c877d5fb99d..b99ad53d3b0 100644 --- a/intl/unicharutil/util/nsUnicodePropertyData.cpp +++ b/intl/unicharutil/util/nsUnicodePropertyData.cpp @@ -11,7 +11,7 @@ */ /* - * Created on Tue Sep 23 08:31:06 2014 from UCD data files with version info: + * Created on Tue Apr 7 00:14:33 2015 from UCD data files with version info: * # Date: 2014-06-12, 20:18:00 GMT [KW] @@ -44,9 +44,9 @@ Standard. # HangulSyllableType-7.0.0.txt # Date: 2013-11-27, 09:54:39 GMT [MD] -# File: xidmodifications.txt -# Version: 7.0.0 -# Generated: 2014-07-23, 12:42:33 GMT +# File: xidmodifications.txt +# Version: 7.0.0 +# Generated: 2014-09-09, 13:36:12 GMT # # Unihan_Variants.txt @@ -433,7 +433,7 @@ static const nsCharProps2 sCharProp2Values[647][32] = { {{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{14,3,24,10,5,-1,1},{0,3,24,10,5,-1,1},{14,3,9,0,1,-1,1},{0,3,21,10,5,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,1,-1,1},{61,0,2,0,9,-1,1},{14,3,9,0,1,-1,1},{61,0,2,0,9,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,5,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1}}, {{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{61,0,2,0,9,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,0,9,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1}}, {{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,0,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,9,0,8,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,5,-1,1},{14,3,9,0,5,-1,1},{14,3,9,0,5,-1,1},{14,3,9,0,5,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,8,-1,1},{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1}}, - {{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,8,-1,1},{14,3,9,0,5,-1,1},{14,3,5,0,5,-1,1},{14,3,25,10,6,-1,1},{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{14,3,9,0,5,-1,1},{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{14,3,5,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,1,-1,1}}, + {{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{7,3,9,0,3,-1,1},{7,3,5,0,3,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,3,-1,1},{14,3,9,0,5,-1,1},{14,3,5,0,5,-1,1},{14,3,25,10,6,-1,1},{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{14,3,9,0,5,-1,1},{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{14,3,5,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,1,-1,1}}, {{8,3,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1}}, {{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,9,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1}}, {{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,0,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1}}, @@ -441,7 +441,7 @@ static const nsCharProps2 sCharProp2Values[647][32] = { {{8,3,9,0,3,-1,1},{8,3,5,0,3,-1,1},{8,3,26,0,6,-1,1},{8,3,12,17,3,-1,1},{8,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{8,3,12,17,3,-1,1},{8,3,11,17,6,-1,1},{8,3,11,17,6,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1}}, {{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1}}, {{8,3,9,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1}}, - {{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,4,-1,1},{8,3,5,0,4,-1,1},{8,3,9,0,3,-1,1},{8,3,5,0,3,-1,1},{8,3,9,0,3,-1,1},{8,3,5,0,3,-1,1},{8,3,9,0,4,-1,1},{8,3,5,0,4,-1,1},{61,0,2,0,9,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1}}, + {{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{8,3,9,0,3,-1,1},{8,3,5,0,3,-1,1},{8,3,9,0,3,-1,1},{8,3,5,0,3,-1,1},{8,3,9,0,1,-1,1},{8,3,5,0,1,-1,1},{61,0,2,0,9,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1}}, {{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{3,3,9,0,1,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{3,3,6,0,1,-1,1},{3,3,21,0,6,-1,1},{3,3,21,0,6,-1,1},{3,3,21,0,6,-1,1},{3,3,21,0,6,-1,1},{3,3,21,0,6,-1,1},{3,3,21,0,6,-1,1}}, {{61,0,2,0,9,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1}}, {{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,1,-1,1},{3,3,5,0,5,-1,1},{61,0,2,0,9,-1,1},{0,3,21,0,6,-1,1},{3,3,17,10,0,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{3,3,26,10,6,-1,1},{3,3,26,10,6,-1,1},{3,3,23,4,6,-1,1},{61,0,2,1,9,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1}}, @@ -466,7 +466,7 @@ static const nsCharProps2 sCharProp2Values[647][32] = { {{90,3,12,17,3,-1,1},{90,3,12,17,3,-1,1},{90,3,12,17,3,-1,1},{90,3,12,17,3,-1,1},{90,3,6,1,3,-1,1},{90,3,12,17,3,-1,1},{90,3,12,17,3,-1,1},{90,3,12,17,3,-1,1},{90,3,6,1,3,-1,1},{90,3,12,17,3,-1,1},{90,3,12,17,3,-1,1},{90,3,12,17,3,-1,1},{90,3,12,17,3,-1,1},{90,3,12,17,3,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{90,3,21,1,6,-1,1},{61,0,2,1,9,-1,1}}, {{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,7,1,4,-1,1},{95,3,12,17,4,-1,1},{95,3,12,17,4,-1,1},{95,3,12,17,4,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{95,3,21,1,6,-1,1},{61,0,2,1,9,-1,1}}, {{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1},{61,0,2,1,9,-1,1}}, - {{2,3,7,13,1,-1,1},{2,3,7,13,4,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,4,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1}}, + {{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,1,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,3,-1,1},{2,3,7,13,1,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1}}, {{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1}}, {{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{61,0,2,13,9,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1},{2,3,12,17,4,-1,1}}, {{10,3,12,17,4,-1,1},{10,3,12,17,1,-1,1},{10,3,12,17,1,-1,1},{10,3,10,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1}}, @@ -617,7 +617,7 @@ static const nsCharProps2 sCharProp2Values[647][32] = { {{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,29,9,5,-1,1},{0,3,1,18,2,-1,1},{1,3,1,18,0,-1,1},{1,3,1,18,0,-1,1},{0,3,1,0,2,-1,1},{0,3,1,1,2,-1,1},{0,0,17,10,0,-1,1},{0,3,17,10,5,-1,1},{0,3,17,10,6,-1,1},{0,0,17,10,6,-1,1},{0,0,17,10,6,-1,1},{0,0,17,10,6,-1,1},{0,0,21,10,6,-1,0},{0,3,21,10,5,-1,1},{0,0,20,10,6,-1,1},{0,0,19,10,0,-1,1},{0,3,22,10,6,-1,1},{0,3,20,10,6,-1,1},{0,0,20,10,6,-1,1},{0,0,19,10,6,-1,1},{0,3,22,10,6,-1,1},{0,3,20,10,6,-1,1}}, {{0,0,21,10,6,-1,0},{0,0,21,10,6,-1,0},{0,0,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,0,21,10,5,-1,1},{0,0,21,10,5,-1,1},{0,0,21,10,5,-1,1},{0,0,21,10,0,-1,1},{0,3,27,9,6,-1,1},{0,3,28,7,6,-1,1},{0,3,1,11,2,-1,1},{0,3,1,14,2,-1,1},{0,3,1,16,2,-1,1},{0,3,1,12,2,-1,1},{0,3,1,15,2,-1,1},{0,3,29,6,5,-1,1},{0,0,21,4,6,-1,0},{0,3,21,4,6,-1,0},{0,0,21,4,6,-1,1},{0,0,21,4,5,-1,1},{0,3,21,4,5,-1,1},{0,0,21,10,6,-1,1},{0,3,21,10,5,-1,1},{0,3,21,10,5,-1,1},{0,3,21,10,6,-1,1},{0,3,20,10,6,-1,1},{0,3,19,10,6,-1,1},{0,0,21,10,6,-1,0},{0,3,21,10,5,-1,0},{0,3,21,10,6,-1,1},{0,0,21,10,5,-1,1},{0,3,16,10,8,-1,1}}, {{0,3,16,10,8,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,0},{0,3,21,10,6,-1,1},{0,3,25,6,6,-1,1},{0,3,22,10,6,-1,1},{0,3,18,10,6,-1,1},{0,3,21,10,5,-1,0},{0,3,21,10,5,-1,0},{0,3,21,10,5,-1,0},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,0},{0,3,25,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,16,10,4,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,5,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,21,10,6,-1,1},{0,3,29,9,5,-1,1}}, - {{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{61,0,2,0,2,-1,0},{0,3,1,0,2,-1,1},{0,3,1,0,2,-1,1},{0,3,1,0,2,-1,1},{0,3,1,0,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,15,2,5,0,1},{25,3,6,0,5,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{0,0,15,2,5,4,1},{0,3,15,2,5,5,1},{0,3,15,2,5,6,1},{0,3,15,2,5,7,1},{0,3,15,2,5,8,1},{0,3,15,2,5,9,1},{0,3,25,3,5,-1,1},{0,3,25,3,5,-1,1},{0,3,25,10,5,-1,1},{0,3,22,10,5,-1,1},{0,3,18,10,5,-1,1},{25,0,6,0,5,-1,1}}, + {{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{61,0,2,0,2,-1,0},{0,3,1,19,2,-1,1},{0,3,1,20,2,-1,1},{0,3,1,21,2,-1,1},{0,3,1,22,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,1,18,2,-1,1},{0,3,15,2,5,0,1},{25,3,6,0,5,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{0,0,15,2,5,4,1},{0,3,15,2,5,5,1},{0,3,15,2,5,6,1},{0,3,15,2,5,7,1},{0,3,15,2,5,8,1},{0,3,15,2,5,9,1},{0,3,25,3,5,-1,1},{0,3,25,3,5,-1,1},{0,3,25,10,5,-1,1},{0,3,22,10,5,-1,1},{0,3,18,10,5,-1,1},{25,0,6,0,5,-1,1}}, {{0,3,15,2,5,0,1},{0,0,15,2,5,1,1},{0,0,15,2,5,2,1},{0,0,15,2,5,3,1},{0,0,15,2,5,4,1},{0,3,15,2,5,5,1},{0,3,15,2,5,6,1},{0,3,15,2,5,7,1},{0,3,15,2,5,8,1},{0,3,15,2,5,9,1},{0,3,25,3,5,-1,1},{0,3,25,3,5,-1,1},{0,3,25,10,5,-1,1},{0,3,22,10,5,-1,1},{0,3,18,10,5,-1,1},{61,0,2,0,9,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{25,3,6,0,5,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1}}, {{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,5,-1,1},{0,2,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,0,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{0,3,23,4,6,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1}}, {{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{61,0,2,4,9,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{1,3,11,17,6,-1,0},{1,3,11,17,6,-1,0},{1,3,11,17,6,-1,0}}, @@ -778,11 +778,11 @@ static const nsCharProps2 sCharProp2Values[647][32] = { {{84,3,12,17,4,-1,1},{84,3,12,17,4,-1,1},{84,3,12,17,4,-1,1},{84,3,10,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1}}, {{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,7,0,4,-1,1},{84,3,12,17,4,-1,1},{84,3,10,0,4,-1,1},{84,3,10,0,4,-1,1},{84,3,12,17,4,-1,1},{84,3,12,17,4,-1,1},{84,3,12,17,4,-1,1},{84,3,12,17,4,-1,1},{84,3,10,0,4,-1,1},{84,3,10,0,4,-1,1},{84,3,12,17,4,-1,1},{84,3,10,0,4,-1,1},{84,3,10,0,4,-1,1},{84,3,10,0,4,-1,1}}, {{84,3,10,0,4,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1},{61,0,2,0,9,-1,1},{0,3,6,0,3,-1,1},{84,3,13,0,4,0,1},{84,3,13,0,4,1,1},{84,3,13,0,4,2,1},{84,3,13,0,4,3,1},{84,3,13,0,4,4,1},{84,3,13,0,4,5,1},{84,3,13,0,4,6,1},{84,3,13,0,4,7,1},{84,3,13,0,4,8,1},{84,3,13,0,4,9,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{84,3,21,0,6,-1,1},{84,3,21,0,6,-1,1}}, - {{28,3,7,0,3,-1,1},{28,3,7,0,3,-1,1},{28,3,7,0,3,-1,1},{28,3,7,0,3,-1,1},{28,3,7,0,3,-1,1},{28,3,12,17,3,-1,1},{28,3,6,0,3,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,13,0,4,0,1},{28,3,13,0,4,1,1},{28,3,13,0,4,2,1},{28,3,13,0,4,3,1},{28,3,13,0,4,4,1},{28,3,13,0,4,5,1},{28,3,13,0,4,6,1},{28,3,13,0,4,7,1},{28,3,13,0,4,8,1},{28,3,13,0,4,9,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1},{61,0,2,0,9,-1,1}}, + {{28,3,7,0,3,-1,1},{28,3,7,0,3,-1,1},{28,3,7,0,3,-1,1},{28,3,7,0,3,-1,1},{28,3,7,0,3,-1,1},{28,3,12,17,3,-1,1},{28,3,6,0,3,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,13,0,1,0,1},{28,3,13,0,1,1,1},{28,3,13,0,1,2,1},{28,3,13,0,1,3,1},{28,3,13,0,1,4,1},{28,3,13,0,1,5,1},{28,3,13,0,1,6,1},{28,3,13,0,1,7,1},{28,3,13,0,1,8,1},{28,3,13,0,1,9,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{61,0,2,0,9,-1,1}}, {{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1}}, {{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,12,17,4,-1,1},{72,3,12,17,4,-1,1},{72,3,12,17,4,-1,1},{72,3,12,17,4,-1,1},{72,3,12,17,4,-1,1},{72,3,12,17,4,-1,1},{72,3,10,0,4,-1,1},{72,3,10,0,4,-1,1},{72,3,12,17,4,-1,1},{72,3,12,17,4,-1,1},{72,3,10,0,4,-1,1},{72,3,10,0,4,-1,1},{72,3,12,17,4,-1,1},{72,3,12,17,4,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1}}, {{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,12,17,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,7,0,4,-1,1},{72,3,12,17,4,-1,1},{72,3,10,0,4,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{72,3,13,0,4,0,1},{72,3,13,0,4,1,1},{72,3,13,0,4,2,1},{72,3,13,0,4,3,1},{72,3,13,0,4,4,1},{72,3,13,0,4,5,1},{72,3,13,0,4,6,1},{72,3,13,0,4,7,1},{72,3,13,0,4,8,1},{72,3,13,0,4,9,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{72,3,21,0,6,-1,1},{72,3,21,0,6,-1,1},{72,3,21,0,6,-1,1},{72,3,21,0,6,-1,1}}, - {{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,6,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,26,0,6,-1,1},{28,3,26,0,6,-1,1},{28,3,26,0,6,-1,1},{28,3,7,0,1,-1,1},{28,3,10,0,1,-1,1},{28,3,12,17,4,-1,1},{28,3,10,0,4,-1,1},{28,3,7,0,4,-1,1},{28,3,7,0,4,-1,1}}, + {{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,6,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,26,0,6,-1,1},{28,3,26,0,6,-1,1},{28,3,26,0,6,-1,1},{28,3,7,0,1,-1,1},{28,3,10,0,1,-1,1},{28,3,12,17,1,-1,1},{28,3,10,0,1,-1,1},{28,3,7,0,1,-1,1},{28,3,7,0,1,-1,1}}, {{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1}}, {{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,12,17,4,-1,1},{92,3,7,0,4,-1,1},{92,3,12,17,4,-1,1},{92,3,12,17,4,-1,1},{92,3,12,17,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,12,17,4,-1,1},{92,3,12,17,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,12,17,4,-1,1},{92,3,12,17,4,-1,1}}, {{92,3,7,0,4,-1,1},{92,3,12,17,4,-1,1},{92,3,7,0,4,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{92,3,7,0,4,-1,1},{92,3,7,0,4,-1,1},{92,3,6,0,4,-1,1},{92,3,21,0,6,-1,1},{92,3,21,0,6,-1,1}}, diff --git a/intl/unicharutil/util/nsUnicodeScriptCodes.h b/intl/unicharutil/util/nsUnicodeScriptCodes.h index 199cc4d6b2b..69a0070e1bd 100644 --- a/intl/unicharutil/util/nsUnicodeScriptCodes.h +++ b/intl/unicharutil/util/nsUnicodeScriptCodes.h @@ -11,7 +11,7 @@ */ /* - * Created on Tue Sep 23 08:31:06 2014 from UCD data files with version info: + * Created on Tue Apr 7 00:14:33 2015 from UCD data files with version info: * # Date: 2014-06-12, 20:18:00 GMT [KW] @@ -44,9 +44,9 @@ Standard. # HangulSyllableType-7.0.0.txt # Date: 2013-11-27, 09:54:39 GMT [MD] -# File: xidmodifications.txt -# Version: 7.0.0 -# Generated: 2014-07-23, 12:42:33 GMT +# File: xidmodifications.txt +# Version: 7.0.0 +# Generated: 2014-09-09, 13:36:12 GMT # # Unihan_Variants.txt diff --git a/layout/base/nsBidi.cpp b/layout/base/nsBidi.cpp index ff623bb9200..77660499aa3 100644 --- a/layout/base/nsBidi.cpp +++ b/layout/base/nsBidi.cpp @@ -37,6 +37,10 @@ enum { PDF = eCharType_PopDirectionalFormat, NSM = eCharType_DirNonSpacingMark, BN = eCharType_BoundaryNeutral, + LRI = eCharType_LeftToRightIsolate, + RLI = eCharType_RightToLeftIsolate, + FSI = eCharType_FirstStrongIsolate, + PDI = eCharType_PopDirectionalIsolate, dirPropCount };