word break now comes from the table

[disorder] / lib / unicode.c

diff --git a/lib/unicode.c b/lib/unicode.c
index 5e2dacd591c42520f9a2961662e293f66e7e0ee3..b89c6c594a4f5383b53ceeaea9f7b4954b97db0f 100644 (file)
--- a/lib/unicode.c
+++ b/lib/unicode.c
@@ -209,13 +209,23 @@ size_t utf32_len(const uint32_t *s) {
  * @p c can be any 32-bit value, a sensible value will be returned regardless.
  */
 static const struct unidata *utf32__unidata(uint32_t c) {
-  if(c < UNICODE_NCHARS)
+  /* The bottom half of the table contains almost everything of interest
+   * and we can just return the right thing straight away */
+  if(c < UNICODE_BREAK_START)
     return &unidata[c / UNICODE_MODULUS][c % UNICODE_MODULUS];
-  else if((c >= 0xF0000 && c <= 0xFFFFD)
-          || (c >= 0x100000 && c <= 0x10FFFD))
-    return utf32__unidata(0xE000);      /* Co */
-  else
-    return utf32__unidata(0xFFFF);      /* Cn */
+  /* Within the break everything is unassigned */
+  if(c < UNICODE_BREAK_END)
+    return utf32__unidata(0xFFFF);      /* guaranteed to be Cn */
+  /* Planes 15 and 16 are (mostly) private use */
+  if((c >= 0xF0000 && c <= 0xFFFFD)
+     || (c >= 0x100000 && c <= 0x10FFFD))
+    return utf32__unidata(0xE000);      /* first Co code point */
+  /* Everything else above the break top is unassigned */
+  if(c >= UNICODE_BREAK_TOP)
+    return utf32__unidata(0xFFFF);      /* guaranteed to be Cn */
+  /* Currently the rest is language tags and variation selectors */
+  c -= (UNICODE_BREAK_END - UNICODE_BREAK_START);
+  return &unidata[c / UNICODE_MODULUS][c % UNICODE_MODULUS];
 }
 
 /** @brief Return the combining class of @p c
@@ -636,10 +646,7 @@ static uint32_t utf32__hangul_syllable_type(uint32_t c) {
  * @return Word_Break property value of @p c
  */
 static enum unicode_Word_Break utf32__word_break(uint32_t c) {
-  if(c < 0xAC00 || c > 0xD7A3)
-    return utf32__unidata(c)->word_break;
-  else
-    return unicode_Word_Break_ALetter;
+  return utf32__unidata(c)->word_break;
 }
 
 /** @brief Identify a grapheme cluster boundary