Update ICU to 54.1 step 1

source/common/uscript_props.cpp

 /*
 *******************************************************************************
-*   Copyright (C) 2013, International Business Machines
+*   Copyright (C) 2013-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  uscript_props.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2013feb16
 *   created by: Markus W. Scherer
 */
 
 #include "unicode/utypes.h"
 #include "unicode/unistr.h"
 #include "unicode/uscript.h"
 #include "unicode/utf16.h"
 #include "ustr_imp.h"
-
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+#include "cmemory.h"
 
 namespace {
 
 // Script metadata (script properties).
 // See http://unicode.org/cldr/trac/browser/trunk/common/properties/scriptMetadata.txt
 
 // 0 = NOT_ENCODED, no sample character, default false script properties.
 // Bits 20.. 0: sample character
 
 // Bits 23..21: usage
 const int32_t UNKNOWN = 1 << 21;
 const int32_t EXCLUSION = 2 << 21;
 const int32_t LIMITED_USE = 3 << 21;
 const int32_t ASPIRATIONAL = 4 << 21;
 const int32_t RECOMMENDED = 5 << 21;
 
 // Bits 31..24: Single-bit flags
 const int32_t RTL = 1 << 24;
 const int32_t LB_LETTERS = 1 << 25;
 const int32_t CASED = 1 << 26;
 
 const int32_t SCRIPT_PROPS[] = {
     // Begin copy-paste output from
     // tools/trunk/unicode/py/parsescriptmetadata.py
-    0x0040 | UNKNOWN,  // Zyyy
+    0x0040 | RECOMMENDED,  // Zyyy
     0x0308 | UNKNOWN,  // Zinh
     0x0628 | RECOMMENDED | RTL,  // Arab
     0x0531 | RECOMMENDED | CASED,  // Armn
     0x0995 | RECOMMENDED,  // Beng
     0x3105 | RECOMMENDED | LB_LETTERS,  // Bopo
     0x13C4 | LIMITED_USE,  // Cher
     0x03E2 | EXCLUSION | CASED,  // Copt
     0x042F | RECOMMENDED | CASED,  // Cyrl
     0x10414 | EXCLUSION | CASED,  // Dsrt
     0x0905 | RECOMMENDED,  // Deva
@@ skipping 41 matching lines @@
     0x1950 | LIMITED_USE | LB_LETTERS,  // Tale
     0x10380 | EXCLUSION,  // Ugar
     0,
     0x1A00 | EXCLUSION,  // Bugi
     0x2C00 | EXCLUSION | CASED,  // Glag
     0x10A00 | EXCLUSION | RTL,  // Khar
     0xA800 | LIMITED_USE,  // Sylo
     0x1980 | LIMITED_USE | LB_LETTERS,  // Talu
     0x2D30 | ASPIRATIONAL,  // Tfng
     0x103A0 | EXCLUSION,  // Xpeo
-    0x1B05 | LIMITED_USE | LB_LETTERS,  // Bali
+    0x1B05 | LIMITED_USE,  // Bali
     0x1BC0 | LIMITED_USE,  // Batk
     0,
     0x11005 | EXCLUSION,  // Brah
     0xAA00 | LIMITED_USE,  // Cham
     0,
     0,
     0,
     0,
     0x13153 | EXCLUSION,  // Egyp
     0,
     0x5B57 | RECOMMENDED | LB_LETTERS,  // Hans
     0x5B57 | RECOMMENDED | LB_LETTERS,  // Hant
+    0x16B1C | EXCLUSION,  // Hmng
     0,
     0,
-    0,
-    0xA984 | LIMITED_USE | LB_LETTERS,  // Java
+    0xA984 | LIMITED_USE,  // Java
     0xA90A | LIMITED_USE,  // Kali
     0,
     0,
     0x1C00 | LIMITED_USE,  // Lepc
-    0,
+    0x10647 | EXCLUSION,  // Lina
     0x0840 | LIMITED_USE | RTL,  // Mand
     0,
     0x10980 | EXCLUSION | RTL,  // Mero
     0x07CA | LIMITED_USE | RTL,  // Nkoo
     0x10C00 | EXCLUSION | RTL,  // Orkh
-    0,
+    0x1036B | EXCLUSION,  // Perm
     0xA840 | EXCLUSION,  // Phag
     0x10900 | EXCLUSION | RTL,  // Phnx
     0x16F00 | ASPIRATIONAL,  // Plrd
     0,
     0,
     0,
     0,
     0,
     0,
     0xA549 | LIMITED_USE,  // Vaii
@@ skipping 11 matching lines @@
     0xA882 | LIMITED_USE,  // Saur
     0,
     0x1B83 | LIMITED_USE,  // Sund
     0,
     0xABC0 | LIMITED_USE,  // Mtei
     0x10840 | EXCLUSION | RTL,  // Armi
     0x10B00 | EXCLUSION | RTL,  // Avst
     0x11103 | LIMITED_USE,  // Cakm
     0xAC00 | RECOMMENDED,  // Kore
     0x11083 | EXCLUSION,  // Kthi
-    0,
+    0x10AD8 | EXCLUSION | RTL,  // Mani
     0x10B60 | EXCLUSION | RTL,  // Phli
-    0,
+    0x10B8F | EXCLUSION | RTL,  // Phlp
     0,
     0x10B40 | EXCLUSION | RTL,  // Prti
     0x0800 | EXCLUSION | RTL,  // Samr
     0xAA80 | LIMITED_USE | LB_LETTERS,  // Tavt
     0,
     0,
     0xA6A0 | LIMITED_USE,  // Bamu
     0xA4D0 | LIMITED_USE,  // Lisu
     0,
     0x10A60 | EXCLUSION | RTL,  // Sarb
+    0x16AE6 | EXCLUSION,  // Bass
+    0x1BC20 | EXCLUSION,  // Dupl
+    0x10500 | EXCLUSION,  // Elba
+    0x11315 | EXCLUSION,  // Gran
     0,
     0,
+    0x1E802 | EXCLUSION | RTL,  // Mend
+    0x109A0 | EXCLUSION | RTL,  // Merc
+    0x10A95 | EXCLUSION | RTL,  // Narb
+    0x10896 | EXCLUSION | RTL,  // Nbat
+    0x10873 | EXCLUSION | RTL,  // Palm
+    0x112BE | EXCLUSION,  // Sind
+    0x118B4 | EXCLUSION | CASED,  // Wara
     0,
     0,
-    0,
-    0,
-    0,
-    0x109A0 | EXCLUSION | RTL,  // Merc
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
+    0x16A4F | EXCLUSION,  // Mroo
     0,
     0x11183 | EXCLUSION,  // Shrd
     0x110D0 | EXCLUSION,  // Sora
     0x11680 | EXCLUSION,  // Takr
     0,
     0,
     0,
+    0x11208 | EXCLUSION,  // Khoj
+    0x11484 | EXCLUSION,  // Tirh
+    0x10537 | EXCLUSION,  // Aghb
+    0x11152 | EXCLUSION,  // Mahj
     0,
     0,
+    0x1160E | EXCLUSION,  // Modi
     0,
-    0,
+    0x11AC0 | EXCLUSION,  // Pauc
+    0x1158E | EXCLUSION,  // Sidd
     // End copy-paste from parsescriptmetadata.py
 };
 
 int32_t getScriptProps(UScriptCode script) {
-    if (0 <= script && script < LENGTHOF(SCRIPT_PROPS)) {
+    if (0 <= script && script < UPRV_LENGTHOF(SCRIPT_PROPS)) {
         return SCRIPT_PROPS[script];
     } else {
         return 0;
     }
 }
 
 }  // namespace
 
 U_CAPI int32_t U_EXPORT2
 uscript_getSampleString(UScriptCode script, UChar *dest, int32_t capacity, UErrorCode *pErrorCode) {
@@ skipping 38 matching lines @@
 
 U_CAPI UBool U_EXPORT2
 uscript_breaksBetweenLetters(UScriptCode script) {
     return (getScriptProps(script) & LB_LETTERS) != 0;
 }
 
 U_CAPI UBool U_EXPORT2
 uscript_isCased(UScriptCode script) {
     return (getScriptProps(script) & CASED) != 0;
 }