bug 1057548 patch 1 - update table-generating tools. r=smontagu
authorJonathan Kew <jkew@mozilla.com>
Sun, 24 Aug 2014 15:22:54 +0100
changeset 201326 4aad525f0dac704aefb252d444eac608365c9c56
parent 201325 274540a1331f3d0ebd58de319ff947516803ca06
child 201327 af609a8d8f27498d97ace9040e6b4893a8008719
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerssmontagu
bugs1057548
milestone34.0a1
bug 1057548 patch 1 - update table-generating tools. r=smontagu
intl/unicharutil/tools/genSpecialCasingData.pl
intl/unicharutil/tools/genUnicodePropertyData.pl
--- a/intl/unicharutil/tools/genSpecialCasingData.pl
+++ b/intl/unicharutil/tools/genSpecialCasingData.pl
@@ -78,17 +78,17 @@ print <<__END__;
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* Auto-generated from files in the Unicode Character Database
    by genSpecialCasingData.pl - do not edit! */
 
 #include "nsSpecialCasingData.h"
-#include "mozilla/Util.h" // for ArrayLength
+#include "mozilla/ArrayUtils.h" // for ArrayLength
 #include <stdlib.h>       // for bsearch
 
 __END__
 map { print "/* $_ */\n" } @headerLines;
 
 print <<__END__;
 
 using mozilla::unicode::MultiCharMapping;
--- a/intl/unicharutil/tools/genUnicodePropertyData.pl
+++ b/intl/unicharutil/tools/genUnicodePropertyData.pl
@@ -192,46 +192,43 @@ my %scriptCode = (
 # unicode 6.1 additions
   CHAKMA => 96,
   MEROITIC_CURSIVE => 97,
   MEROITIC_HIEROGLYPHS => 98,
   MIAO => 99,
   SHARADA => 100,
   SORA_SOMPENG => 101,
   TAKRI => 102,
-
-# Expected unicode 7.0 additions, not yet supported; re-check when enabling
-# by comparison with harfbuzz and with PangoScript values
-#  BASSA_VAH => 103,
-#  CAUCASIAN_ALBANIAN => 104,
-#  DUPLOYAN => 105,
-#  ELBASAN => 106,
-#  GRANTHA => 107,
-#  KHOJKI => 108,
-#  KHUDAWADI => 109,
-#  LINEAR_A => 110,
-#  MAHAJANI => 111,
-#  MANICHAEAN => 112,
-#  MENDE_KIKAKUI => 113,
-#  MODI => 114,
-#  MRO => 115,
-#  NABATAEAN => 116,
-#  OLD_NORTH_ARABIAN => 117,
-#  OLD_PERMIC => 118,
-#  PAHAWH_HMONG => 119,
-#  PALMYRENE => 120,
-#  PAU_CIN_HAU => 121,
-#  PSALTER_PAHLAVI => 122,
-#  SIDDHAM => 123,
-#  TIRHUTA => 124,
-#  WARANG_CITI => 125,
+# unicode 7.0 additions
+  BASSA_VAH => 103,
+  CAUCASIAN_ALBANIAN => 104,
+  DUPLOYAN => 105,
+  ELBASAN => 106,
+  GRANTHA => 107,
+  KHOJKI => 108,
+  KHUDAWADI => 109,
+  LINEAR_A => 110,
+  MAHAJANI => 111,
+  MANICHAEAN => 112,
+  MENDE_KIKAKUI => 113,
+  MODI => 114,
+  MRO => 115,
+  NABATAEAN => 116,
+  OLD_NORTH_ARABIAN => 117,
+  OLD_PERMIC => 118,
+  PAHAWH_HMONG => 119,
+  PALMYRENE => 120,
+  PAU_CIN_HAU => 121,
+  PSALTER_PAHLAVI => 122,
+  SIDDHAM => 123,
+  TIRHUTA => 124,
+  WARANG_CITI => 125,
 
 # additional "script" code, not from Unicode (but matches ISO 15924's Zmth tag)
-# XXX need to update this when the Unicode 7.0 scripts are enabled above
-  MATHEMATICAL_NOTATION => 103,
+  MATHEMATICAL_NOTATION => 126,
 );
 
 my $sc = -1;
 my $cc = -1;
 my %catCode;
 my @scriptCodeToTag;
 my @scriptCodeToName;