mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-08 15:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Logical_Order_Exception support from PropList.txt.

Browse Source
This commit is contained in:
Reece H. Dunn
2017-04-16 09:29:02 +01:00
parent 66b2404ce3
commit a3f811aac1
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/ucd/ucd.h
+2
View File
@@ -355,6 +355,7 @@ enum
UCD_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT = 0x0000000000400000ull, /**< @brief Other_Default_Ignorable_Code_Point */
UCD_PROPERTY_DEPRECATED = 0x0000000000800000ull, /**< @brief Deprecated */
UCD_PROPERTY_SOFT_DOTTED = 0x0000000001000000ull, /**< @brief Soft_Dotted */
UCD_PROPERTY_LOGICAL_ORDER_EXCEPTION = 0x0000000002000000ull, /**< @brief Logical_Order_Exception */
};
/** @brief Return the properties of the specified codepoint.
@@ -840,6 +841,7 @@ namespace ucd
Other_Default_Ignorable_Code_Point = UCD_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT, /**< @brief Other_Default_Ignorable_Code_Point */
Deprecated = UCD_PROPERTY_DEPRECATED, /**< @brief Deprecated */
Soft_Dotted = UCD_PROPERTY_SOFT_DOTTED, /**< @brief Soft_Dotted */
Logical_Order_Exception = UCD_PROPERTY_LOGICAL_ORDER_EXCEPTION, /**< @brief Logical_Order_Exception */
};
/** @brief Return the properties of the specified codepoint.
src/proplist.c
+11
View File
@@ -292,12 +292,20 @@ static int properties_Lo(codepoint_t c)
case 0x0600:
if (c == 0x0673) return UCD_PROPERTY_DEPRECATED;
break;
case 0x0E00:
if (c >= 0x0E40 && c <= 0x0E44) return UCD_PROPERTY_LOGICAL_ORDER_EXCEPTION;
if (c >= 0x0EC0 && c <= 0x0EC4) return UCD_PROPERTY_LOGICAL_ORDER_EXCEPTION;
break;
case 0x1100:
if (c >= 0x115F && c <= 0x1160) return UCD_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT;
break;
case 0x1700:
if (c >= 0x17A3 && c <= 0x17A4) return UCD_PROPERTY_DEPRECATED;
break;
case 0x1900:
if (c >= 0x19B5 && c <= 0x19B7) return UCD_PROPERTY_LOGICAL_ORDER_EXCEPTION;
if (c == 0x19BA) return UCD_PROPERTY_LOGICAL_ORDER_EXCEPTION;
break;
case 0x2100:
if (c >= 0x2135 && c <= 0x2138) return UCD_PROPERTY_OTHER_MATH;
break;
@@ -308,6 +316,9 @@ static int properties_Lo(codepoint_t c)
if (c == 0x3164) return UCD_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT;
break;
case 0xAA00:
if (c >= 0xAAB5 && c <= 0xAAB6) return UCD_PROPERTY_LOGICAL_ORDER_EXCEPTION;
if (c == 0xAAB9) return UCD_PROPERTY_LOGICAL_ORDER_EXCEPTION;
if (c >= 0xAABB && c <= 0xAABC) return UCD_PROPERTY_LOGICAL_ORDER_EXCEPTION;
if (c == 0xAAC0) return UCD_PROPERTY_DIACRITIC;
if (c == 0xAAC2) return UCD_PROPERTY_DIACRITIC;
break;
tools/printdata.py
+1
View File
@@ -146,6 +146,7 @@ def properties(data):
props += (2 ** 22) * data.get('Other_Default_Ignorable_Code_Point', 0)
props += (2 ** 23) * data.get('Deprecated', 0)
props += (2 ** 24) * data.get('Soft_Dotted', 0)
props += (2 ** 25) * data.get('Logical_Order_Exception', 0)
return props
if __name__ == '__main__':