Changeset 18654 for indexers/trunk/packages/unac

Timestamp:

2009-03-10T17:22:40+13:00 (15 years ago)

Author:

mdewsnip

Message:

Fix to support the Hawaiian Glottal character, many thanks to John Thompson at DL Consulting Ltd.

File:

• indexers/trunk/packages/unac/unac.c (modified) (3 diffs)

indexers/trunk/packages/unac/unac.c

@@ -665 +665 @@
  * 02B8 MODIFIER LETTER SMALL Y
  *  0079 LATIN SMALL LETTER Y
+ * 02BB MODIFIER LETTER TURNED COMMA (GLOTTAL)
+ *      0000 NOTHING
  * 02D8 BREVE
  *  0020 SPACE
@@ -12168 +12170 @@
 unsigned short unac_data11[] = { 0x0041, 0x0061, 0x0041, 0x0061, 0x0045, 0x0065, 0x0045, 0x0065, 0x0049, 0x0069, 0x0049, 0x0069, 0x004F, 0x006F, 0x004F, 0x006F, 0x0052, 0x0072, 0x0052, 0x0072, 0x0055, 0x0075, 0x0055, 0x0075, 0x0053, 0x0073, 0x0054, 0x0074, 0xFFFF, 0xFFFF, 0x0048, 0x0068 };
 unsigned short unac_data12[] = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0041, 0x0061, 0x0045, 0x0065, 0x004F, 0x006F, 0x004F, 0x006F, 0x004F, 0x006F, 0x004F, 0x006F, 0x0059, 0x0079, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF };
-unsigned short unac_data13[] = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0068, 0x0266, 0x006A, 0x0072, 0x0279, 0x027B, 0x0281, 0x0077, 0x0079, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF };
+// Greenstone Customisation: Added mapping for Glottal to remove it from
+// string. Glottal character is 5th from end and is set to 0x000 which isn't
+// a valid character anyway.
+unsigned short unac_data13[] = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0068, 0x0266, 0x006A, 0x0072, 0x0279, 0x027B, 0x0281, 0x0077, 0x0079, 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF }; 
 unsigned short unac_data14[] = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0xFFFF, 0xFFFF };
 unsigned short unac_data15[] = { 0x0263, 0x006C, 0x0073, 0x0078, 0x0295, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF };
@@ -12666 +12671 @@
     }
     if(l > 0) {
-      /*
-       * If there is a decomposition, insert it in the output 
-       * string.
-       */
-      for(k = 0; k < l; k++) {
-    out[out_length++] = (p[k] >> 8) & 0xff;
-    out[out_length++] = (p[k] & 0xff);
+      // Greenstone customization: If the decomposition isn't a valid printable
+      // character, then simply ignore the character to remove it from the
+      // string. This is used to fold Glottals and other spacing modifiers into
+      // non-existance.
+      if (l == 1 && *(p) < 0x0020)
+      {
+      }
+      else
+      {
+        /*
+         * If there is a decomposition, insert it in the output 
+         * string.
+         */
+        for(k = 0; k < l; k++) {
+          out[out_length++] = (p[k] >> 8) & 0xff;
+          out[out_length++] = (p[k] & 0xff);
+        }
       }
     } else {