Bug 1151908 - Update our character property data with new Bidi info from Unicode 6.3. r=smontagu, a=jocheng
authorTed Clancy <tclancy@mozilla.com>
Fri, 17 Apr 2015 14:19:39 -0400
changeset 238581 71637e1fa0270e3b3d24010c3cad7aff3f42d2ad
parent 238580 2b930da4529124df04ca117e6123fe97f28a8881
child 238582 cd8c5c44de246efc07903e39ce87c7c02efae3ef
push id677
push userryanvm@gmail.com
push dateWed, 03 Jun 2015 20:49:30 +0000
treeherdermozilla-b2g37_v2_2@4eea7e9b74da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu, jocheng
bugs1151908
milestone37.0
Bug 1151908 - Update our character property data with new Bidi info from Unicode 6.3. r=smontagu, a=jocheng
intl/unicharutil/tools/genUnicodePropertyData.pl
intl/unicharutil/util/nsBidiUtils.h
intl/unicharutil/util/nsUnicodePropertyData.cpp
intl/unicharutil/util/nsUnicodeScriptCodes.h
layout/base/nsBidi.cpp
--- a/intl/unicharutil/tools/genUnicodePropertyData.pl
+++ b/intl/unicharutil/tools/genUnicodePropertyData.pl
@@ -301,17 +301,21 @@ my %bidicategoryCode = (
   "ON"  => "10", # Other Neutrals
   "LRE" => "11", # Left-to-Right Embedding
   "LRO" => "12", # Left-to-Right Override
   "AL"  => "13", # Right-to-Left Arabic
   "RLE" => "14", # Right-to-Left Embedding
   "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 = (
   'U' => 0,  #   U - Upright, the same orientation as in the code charts
   'R' => 1,  #   R - Rotated 90 degrees clockwise compared to the code charts
   'Tu' => 2, #   Tu - Transformed typographically, with fallback to Upright
   'Tr' => 3  #   Tr - Transformed typographically, with fallback to Rotated
 );
--- a/intl/unicharutil/util/nsBidiUtils.h
+++ b/intl/unicharutil/util/nsBidiUtils.h
@@ -32,16 +32,20 @@ enum nsCharType   {
   eCharType_LeftToRightEmbedding     = 11,
   eCharType_LeftToRightOverride      = 12,
   eCharType_RightToLeftArabic        = 13,
   eCharType_RightToLeftEmbedding     = 14,
   eCharType_RightToLeftOverride      = 15,
   eCharType_PopDirectionalFormat     = 16,
   eCharType_DirNonSpacingMark        = 17,
   eCharType_BoundaryNeutral          = 18,
+  eCharType_LeftToRightIsolate       = 19,
+  eCharType_RightToLeftIsolate       = 20,
+  eCharType_FirstStrongIsolate       = 21,
+  eCharType_PopDirectionalIsolate    = 22,
   eCharType_CharTypeCount
 };
 
 /**
  * This specifies the language directional property of a character set.
  */
 typedef enum nsCharType nsCharType;
 
--- a/intl/unicharutil/util/nsUnicodePropertyData.cpp
+++ b/intl/unicharutil/util/nsUnicodePropertyData.cpp
@@ -6,17 +6,17 @@
 
 /*
  * Derived from the Unicode Character Database by genUnicodePropertyData.pl
  *
  * For Unicode terms of use, see http://www.unicode.org/terms_of_use.html
  */
 
 /*
- * 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]
 #
 # Unicode Character Database
 # Copyright (c) 1991-2014 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -39,19 +39,19 @@ Standard.
 # Date: 2014-02-28, 23:15:00 GMT [KW, LI]
 
 # BidiMirroring-7.0.0.txt
 # Date: 2013-12-17, 00:00:00 GMT [KW, LI]
 
 # 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
 # Date: 2014-05-09 18:17:02 GMT [JHJ]
 
 # VerticalOrientation-13.txt
 # Date: 2014-09-03, 17:30:00 GMT [EM, KI, LI]
 
@@ -428,25 +428,25 @@ static const nsCharProps2 sCharProp2Valu
   {{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},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{5,3,24,10,6,-1,0},{5,3,24,10,6,-1,0},{0,3,6,10,1,-1,1},{0,3,24,10,6,-1,1},{0,3,6,0,8,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1},{0,3,24,10,6,-1,1}},
   {{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,4,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,4,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,4,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1}},
   {{1,0,12,17,8,-1,1},{1,0,12,17,4,-1,1},{1,0,12,17,4,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,4,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,4,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,4,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1}},
   {{1,0,12,17,5,-1,1},{1,0,12,17,5,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,5,-1,1},{1,0,12,17,5,-1,1},{1,0,12,17,1,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,2,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,4,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1}},
   {{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,8,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,3,-1,1},{1,0,12,17,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},{0,3,6,10,5,-1,1},{14,3,24,10,0,-1,1},{14,3,9,0,3,-1,1},{14,3,5,0,3,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{14,3,6,0,5,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{0,3,21,10,5,-1,1},{14,3,9,0,3,-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},{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}},
   {{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,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,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,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,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,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,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,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,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}},
   {{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},{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,1,-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,17,1,6,-1,1},{19,3,12,17,4,-1,1}},
   {{19,3,21,1,6,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,21,1,6,-1,1},{19,3,12,17,4,-1,1},{19,3,12,17,4,-1,1},{19,3,21,1,6,-1,1},{19,3,12,17,4,-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},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1}},
   {{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-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},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,7,1,1,-1,1},{19,3,21,1,0,-1,1},{19,3,21,1,0,-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,1,5,6,-1,1},{2,3,1,5,6,-1,1},{2,3,1,5,6,-1,1},{2,3,1,5,6,-1,1},{2,3,1,5,6,-1,1},{0,3,1,5,6,-1,1},{2,3,25,10,6,-1,1},{2,3,25,10,6,-1,1},{2,3,25,13,6,-1,1},{2,3,21,4,6,-1,1},{2,3,21,4,6,-1,1},{2,3,23,13,6,-1,1},{0,3,21,6,6,-1,1},{2,3,21,13,6,-1,1},{2,3,26,10,6,-1,1},{2,3,26,10,6,-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},{0,3,21,13,6,-1,1},{0,3,1,13,2,-1,1},{61,0,2,13,9,-1,1},{2,3,21,13,6,-1,1},{0,3,21,13,6,-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,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,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}},
@@ -461,17 +461,17 @@ static const nsCharProps2 sCharProp2Valu
   {{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1}},
   {{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,7,13,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,3,12,17,1,-1,1},{37,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}},
   {{66,3,13,1,4,0,1},{66,3,13,1,4,1,1},{66,3,13,1,4,2,1},{66,3,13,1,4,3,1},{66,3,13,1,4,4,1},{66,3,13,1,4,5,1},{66,3,13,1,4,6,1},{66,3,13,1,4,7,1},{66,3,13,1,4,8,1},{66,3,13,1,4,9,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1}},
   {{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,7,1,4,-1,1},{66,3,12,17,4,-1,1},{66,3,12,17,4,-1,1},{66,3,12,17,4,-1,1},{66,3,12,17,4,-1,1},{66,3,12,17,4,-1,1},{66,3,12,17,4,-1,1},{66,3,12,17,4,-1,1},{66,3,12,17,4,-1,1},{66,3,12,17,4,-1,1},{66,3,6,1,4,-1,1},{66,3,6,1,4,-1,1},{66,3,26,10,6,-1,1},{66,3,21,10,6,-1,1},{66,3,21,10,6,-1,1},{66,3,21,10,6,-1,1},{66,3,6,1,4,-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}},
   {{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,1,3,-1,1},{90,3,7,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,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}},
   {{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}},
   {{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,12,17,1,-1,1},{10,3,10,0,1,-1,1},{10,3,12,17,1,-1,1},{10,3,7,0,1,-1,1},{10,3,10,0,1,-1,1},{10,3,10,0,1,-1,1}},
   {{10,3,10,0,1,-1,1},{10,3,12,17,1,-1,1},{10,3,12,17,1,-1,1},{10,3,12,17,1,-1,1},{10,3,12,17,1,-1,1},{10,3,12,17,1,-1,1},{10,3,12,17,1,-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,10,0,1,-1,1},{10,3,10,0,1,-1,1},{10,3,10,0,1,-1,1},{10,3,12,17,1,-1,1},{10,3,10,0,3,-1,1},{10,3,10,0,1,-1,1},{10,3,7,0,1,-1,1},{1,3,12,17,3,-1,1},{1,3,12,17,3,-1,1},{10,3,12,17,8,-1,1},{10,3,12,17,8,-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,7,0,5,-1,1},{10,3,7,0,5,-1,1},{10,3,7,0,5,-1,1},{10,3,7,0,5,-1,1},{10,3,7,0,5,-1,1},{10,3,7,0,5,-1,1},{10,3,7,0,5,-1,1},{10,3,7,0,5,-1,1}},
   {{10,3,7,0,1,-1,1},{10,3,7,0,1,-1,1},{10,3,12,17,1,-1,1},{10,3,12,17,1,-1,1},{0,3,21,0,6,-1,1},{0,3,21,0,6,-1,1},{10,3,13,0,1,0,1},{10,3,13,0,1,1,1},{10,3,13,0,1,2,1},{10,3,13,0,1,3,1},{10,3,13,0,1,4,1},{10,3,13,0,1,5,1},{10,3,13,0,1,6,1},{10,3,13,0,1,7,1},{10,3,13,0,1,8,1},{10,3,13,0,1,9,1},{10,3,21,0,6,-1,1},{10,3,6,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,3,-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}},
   {{4,3,7,0,3,-1,1},{4,3,12,17,1,-1,1},{4,3,10,0,1,-1,1},{4,3,10,0,1,-1,1},{61,0,2,0,9,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1}},
   {{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{4,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{4,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{4,3,12,17,1,-1,1},{4,3,7,0,1,-1,1},{4,3,10,0,1,-1,1},{4,3,10,0,1,-1,1}},
@@ -612,17 +612,17 @@ static const nsCharProps2 sCharProp2Valu
   {{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,5,0,1,-1,1},{14,3,5,0,1,-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,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,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,5,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,5,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-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,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,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,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,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,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,0,1,-1,1},{14,3,8,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},{61,0,2,0,9,-1,1},{14,3,5,0,1,-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,5,-1,1},{14,3,8,0,1,-1,1},{14,3,24,10,5,-1,1},{14,3,5,0,5,-1,1},{14,3,24,10,5,-1,1}},
   {{14,3,24,10,5,-1,1},{14,3,24,10,5,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{61,0,2,0,9,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,5,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,5,-1,1},{14,3,8,0,1,-1,1},{14,3,24,10,5,-1,1},{14,3,24,10,5,-1,1},{14,3,24,10,5,-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,5,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{14,3,5,0,1,-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,5,-1,1},{61,0,2,0,9,-1,1},{14,3,24,10,5,-1,1},{14,3,24,10,5,-1,1},{14,3,24,10,5,-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,5,-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,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,5,-1,1},{14,3,9,0,1,-1,1},{14,3,24,10,5,-1,1},{14,3,24,10,5,-1,1},{14,3,24,10,5,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{61,0,2,0,9,-1,1},{14,3,5,0,1,-1,1},{14,3,5,0,1,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,5,-1,1},{14,3,9,0,1,-1,1},{14,3,9,0,5,-1,1},{14,3,8,0,1,-1,1},{14,3,24,10,5,-1,1},{14,3,24,10,5,-1,1},{61,0,2,0,9,-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,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}},
   {{1,3,11,17,6,-1,0},{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},{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},{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}},
   {{0,3,26,10,5,-1,0},{0,3,26,10,5,-1,0},{0,3,9,0,5,-1,1},{0,0,26,10,5,-1,0},{0,3,26,10,6,-1,0},{0,0,26,10,5,-1,0},{0,3,26,10,5,-1,0},{0,3,9,0,5,-1,0},{0,3,26,10,6,-1,0},{0,0,26,10,5,-1,0},{0,3,5,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,5,0,5,-1,1},{0,3,5,0,5,-1,0},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,0,5,0,5,-1,0},{0,3,26,10,6,-1,0},{0,3,9,0,5,-1,1},{0,0,26,10,5,-1,0},{0,3,26,10,6,-1,0},{0,3,25,10,8,-1,1},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,26,10,6,-1,0},{0,3,26,10,6,-1,0}},
   {{0,3,26,10,5,-1,0},{0,0,26,10,5,-1,0},{0,0,26,10,5,-1,0},{0,3,26,10,6,-1,0},{0,3,9,0,5,-1,1},{0,3,26,10,6,-1,0},{14,0,9,0,5,-1,1},{0,3,26,10,6,-1,0},{0,3,9,0,5,-1,1},{0,3,26,10,6,-1,0},{25,3,9,0,5,-1,1},{25,0,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,26,4,8,-1,0},{0,3,5,0,5,-1,1},{0,3,9,0,5,-1,1},{0,3,9,0,5,-1,1},{25,3,9,0,3,-1,1},{0,3,9,0,5,-1,1},{0,3,5,0,5,-1,1},{0,3,7,0,5,-1,0},{0,3,7,0,5,-1,0},{0,3,7,0,5,-1,0},{0,3,7,0,5,-1,0},{0,3,5,0,5,-1,0},{0,3,26,10,6,-1,0},{0,3,26,10,5,-1,0},{0,3,5,0,5,-1,0},{0,3,5,0,5,-1,0},{0,3,9,0,5,-1,0},{0,3,9,0,5,-1,0}},
   {{0,3,25,10,5,-1,1},{0,3,25,10,6,-1,1},{0,3,25,10,6,-1,1},{0,3,25,10,6,-1,1},{0,3,25,10,6,-1,1},{0,3,9,0,5,-1,0},{0,3,5,0,5,-1,0},{0,3,5,0,5,-1,0},{0,3,5,0,5,-1,0},{0,3,5,0,5,-1,0},{0,3,26,10,6,-1,0},{0,3,25,10,6,-1,1},{0,3,26,10,6,-1,0},{0,3,26,10,6,-1,0},{25,3,5,0,3,-1,1},{0,3,26,0,6,-1,0},{0,3,15,10,5,-1,0},{0,3,15,10,5,-1,0},{0,3,15,10,5,-1,0},{0,0,15,10,5,-1,0},{0,0,15,10,5,-1,0},{0,3,15,10,5,-1,0},{0,3,15,10,5,-1,0},{0,3,15,10,5,-1,0},{0,3,15,10,5,-1,0},{0,3,15,10,5,-1,0},{0,3,15,10,5,-1,0},{0,0,15,10,5,-1,0},{0,0,15,10,5,-1,0},{0,0,15,10,5,-1,0},{0,0,15,10,5,-1,0},{0,3,15,10,5,-1,0}},
   {{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,3,14,0,5,-1,0},{25,3,14,0,5,-1,0},{25,3,14,0,5,-1,0},{25,3,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,0,14,0,5,-1,0},{25,3,14,0,5,-1,0},{25,3,14,0,5,-1,0},{25,3,14,0,5,-1,0},{25,3,14,0,5,-1,0},{25,3,14,0,5,-1,0},{25,3,14,0,5,-1,0}},
@@ -773,21 +773,21 @@ static const nsCharProps2 sCharProp2Valu
   {{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,12,17,3,-1,1},{10,3,7,0,3,-1,1},{10,3,7,0,3,-1,1},{10,3,7,0,3,-1,1},{10,3,7,0,3,-1,1},{10,3,7,0,3,-1,1},{10,3,7,0,3,-1,1},{10,3,21,0,6,-1,1},{10,3,21,0,6,-1,1},{10,3,21,0,6,-1,1},{10,3,7,0,3,-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}},
   {{67,3,13,0,4,0,1},{67,3,13,0,4,1,1},{67,3,13,0,4,2,1},{67,3,13,0,4,3,1},{67,3,13,0,4,4,1},{67,3,13,0,4,5,1},{67,3,13,0,4,6,1},{67,3,13,0,4,7,1},{67,3,13,0,4,8,1},{67,3,13,0,4,9,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1}},
   {{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,7,0,4,-1,1},{67,3,12,17,4,-1,1},{67,3,12,17,4,-1,1},{67,3,12,17,4,-1,1},{67,3,12,17,4,-1,1},{67,3,12,17,4,-1,1},{67,3,12,17,4,-1,1},{67,3,12,17,4,-1,1},{67,3,12,17,4,-1,1},{0,3,21,0,6,-1,1},{67,3,21,0,6,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1}},
   {{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,7,0,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,12,17,3,-1,1},{69,3,10,0,3,-1,1},{69,3,10,0,3,-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},{69,3,21,0,6,-1,1}},
   {{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{18,5,7,0,3,-1,0},{61,0,2,0,9,-1,0},{61,0,2,0,9,-1,0},{61,0,2,0,9,-1,0}},
   {{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}},
   {{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,7,0,4,-1,1},{87,3,10,0,4,-1,1},{87,3,12,17,4,-1,1},{87,3,12,17,4,-1,1},{87,3,10,0,4,-1,1},{87,3,10,0,4,-1,1},{87,3,21,0,6,-1,1},{87,3,21,0,6,-1,1},{87,3,7,0,4,-1,1},{87,3,6,0,4,-1,1},{87,3,6,0,4,-1,1},{87,3,10,0,4,-1,1},{87,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}},
   {{61,0,2,0,9,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-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}},
   {{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{11,3,7,0,1,-1,1},{61,0,2,0,9,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1}},
   {{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{25,3,5,0,3,-1,1},{0,3,24,0,6,-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},{61,0,2,0,9,-1,1},{25,3,5,0,3,-1,1},{14,3,5,0,3,-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},{61,0,2,0,9,-1,1},{61,0,2,0,9,-1,1}},
--- a/intl/unicharutil/util/nsUnicodeScriptCodes.h
+++ b/intl/unicharutil/util/nsUnicodeScriptCodes.h
@@ -6,17 +6,17 @@
 
 /*
  * Derived from the Unicode Character Database by genUnicodePropertyData.pl
  *
  * For Unicode terms of use, see http://www.unicode.org/terms_of_use.html
  */
 
 /*
- * 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]
 #
 # Unicode Character Database
 # Copyright (c) 1991-2014 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -39,19 +39,19 @@ Standard.
 # Date: 2014-02-28, 23:15:00 GMT [KW, LI]
 
 # BidiMirroring-7.0.0.txt
 # Date: 2013-12-17, 00:00:00 GMT [KW, LI]
 
 # 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
 # Date: 2014-05-09 18:17:02 GMT [JHJ]
 
 # VerticalOrientation-13.txt
 # Date: 2014-09-03, 17:30:00 GMT [EM, KI, LI]
 
--- a/layout/base/nsBidi.cpp
+++ b/layout/base/nsBidi.cpp
@@ -32,16 +32,20 @@ enum {
     LRE = eCharType_LeftToRightEmbedding,
     LRO = eCharType_LeftToRightOverride,
     AL =  eCharType_RightToLeftArabic,
     RLE = eCharType_RightToLeftEmbedding,
     RLO = eCharType_RightToLeftOverride,
     PDF = eCharType_PopDirectionalFormat,
     NSM = eCharType_DirNonSpacingMark,
     BN =  eCharType_BoundaryNeutral,
+    LRI = eCharType_LeftToRightIsolate,
+    RLI = eCharType_RightToLeftIsolate,
+    FSI = eCharType_FirstStrongIsolate,
+    PDI = eCharType_PopDirectionalIsolate,
     dirPropCount
 };
 
 /* to avoid some conditional statements, use tiny constant arrays */
 static Flags flagLR[2]={ DIRPROP_FLAG(L), DIRPROP_FLAG(R) };
 static Flags flagE[2]={ DIRPROP_FLAG(LRE), DIRPROP_FLAG(RLE) };
 static Flags flagO[2]={ DIRPROP_FLAG(LRO), DIRPROP_FLAG(RLO) };