Index: source/i18n/unicode/uspoof.h |
diff --git a/source/i18n/unicode/uspoof.h b/source/i18n/unicode/uspoof.h |
index 83dea3702a2a3b1103121fb7daf83a538f9d34ef..8d665e1b3ed7aca91101309598eec1f17058c6d2 100644 |
--- a/source/i18n/unicode/uspoof.h |
+++ b/source/i18n/unicode/uspoof.h |
@@ -1,6 +1,6 @@ |
/* |
*************************************************************************** |
-* Copyright (C) 2008-2014, International Business Machines Corporation |
+* Copyright (C) 2008-2015, International Business Machines Corporation |
* and others. All Rights Reserved. |
*************************************************************************** |
* file name: uspoof.h |
@@ -139,6 +139,14 @@ |
* identifying new pairs or sequences of characters that are visually |
* confusable, and thus must be mapped to the same skeleton character(s). |
* |
+ * Skeletons are computed using the algorithm and data describe in Unicode UAX 39. |
+ * The latest proposed update, UAX 39 Version 8 draft 1, says "the tables SL, SA, and ML |
+ * were still problematic, and discouraged from use in [Uniocde] 7.0. |
+ * They were thus removed from version 8.0" |
+ * |
+ * In light of this, the default mapping data included with ICU 55 uses the |
+ * Unicode 7 MA (Multi script Any case) table data for the other type options |
+ * (Single Script, Any Case), (Single Script, Lower Case) and (Multi Script, Lower Case). |
*/ |
struct USpoofChecker; |
@@ -270,14 +278,12 @@ typedef enum USpoofChecks { |
* @stable ICU 51 |
*/ |
USPOOF_ASCII = 0x10000000, |
-#ifndef U_HIDE_DRAFT_API |
/** |
* All characters in each identifier must be from a single script. |
* |
- * @draft ICU 53 |
+ * @stable ICU 53 |
*/ |
USPOOF_SINGLE_SCRIPT_RESTRICTIVE = 0x20000000, |
-#endif /* U_HIDE_DRAFT_API */ |
/** |
* All characters in each identifier must be from a single script, or from the combinations: Latin + Han + |
* Hiragana + Katakana; Latin + Han + Bopomofo; or Latin + Han + Hangul. Note that this level will satisfy the |
@@ -304,14 +310,12 @@ typedef enum USpoofChecks { |
* @stable ICU 51 |
*/ |
USPOOF_UNRESTRICTIVE = 0x60000000, |
-#ifndef U_HIDE_DRAFT_API |
/** |
* Mask for selecting the Restriction Level bits from the return value of uspoof_check(). |
* |
- * @draft ICU 53 |
+ * @stable ICU 53 |
*/ |
USPOOF_RESTRICTION_LEVEL_MASK = 0x7F000000 |
-#endif /* U_HIDE_DRAFT_API */ |
} URestrictionLevel; |
/** |
@@ -872,7 +876,7 @@ uspoof_areConfusableUnicodeString(const USpoofChecker *sc, |
* of the Unicode confusable data tables to use. |
* The default is Mixed-Script, Lowercase. |
* Allowed options are USPOOF_SINGLE_SCRIPT_CONFUSABLE and |
- * USPOOF_ANY_CASE_CONFUSABLE. The two flags may be ORed. |
+ * USPOOF_ANY_CASE. The two flags may be ORed. |
* @param id The input identifier whose skeleton will be computed. |
* @param length The length of the input identifier, expressed in 16 bit |
* UTF-16 code units, or -1 if the string is zero terminated. |
@@ -954,7 +958,7 @@ uspoof_getSkeletonUTF8(const USpoofChecker *sc, |
* of the Unicode confusable data tables to use. |
* The default is Mixed-Script, Lowercase. |
* Allowed options are USPOOF_SINGLE_SCRIPT_CONFUSABLE and |
- * USPOOF_ANY_CASE_CONFUSABLE. The two flags may be ORed. |
+ * USPOOF_ANY_CASE. The two flags may be ORed. |
* @param id The input identifier whose skeleton will be computed. |
* @param dest The output identifier, to receive the skeleton string. |
* @param status The error code, set if an error occurred while attempting to |