Indent

[yaz-moved-to-github.git] / include / yaz / icu_I18N.h

diff --git a/include/yaz/icu_I18N.h b/include/yaz/icu_I18N.h
index 3abe6bb..44e852c 100644 (file)
--- a/include/yaz/icu_I18N.h
+++ b/include/yaz/icu_I18N.h
@@ -47,9 +47,9 @@ int icu_check_status (UErrorCode status);
 
 struct icu_buf_utf16
 {
-  UChar * utf16;
-  int32_t utf16_len;
-  int32_t utf16_cap;
+    UChar * utf16;
+    int32_t utf16_len;
+    int32_t utf16_cap;
 };
 
 struct icu_buf_utf16 * icu_buf_utf16_create(size_t capacity);
@@ -103,7 +103,7 @@ struct icu_casemap
 };
 
 struct icu_casemap * icu_casemap_create(const char *locale, char action,
-                                            UErrorCode *status);
+                                        UErrorCode *status);
 
 void icu_casemap_destroy(struct icu_casemap * casemap);
 
@@ -225,6 +225,8 @@ struct icu_chain
     uint8_t locale[16];
     int sort;
 
+    const char * src8cstr;
+
     UCollator * coll;
     
     /* number of tokens returned so far */
@@ -242,14 +244,14 @@ struct icu_chain
     struct icu_chain_step * steps;
 };
 
-struct icu_chain * icu_chain_create(const uint8_t * locale,
+struct icu_chain * icu_chain_create(const char * locale,
                                     int sort,
                                     UErrorCode * status);
 
 void icu_chain_destroy(struct icu_chain * chain);
 
-struct icu_chain * icu_chain_xml_config(xmlNode *xml_node,
-                                        const uint8_t * locale,
+struct icu_chain * icu_chain_xml_config(const xmlNode *xml_node,
+                                        const char *locale,
                                         int sort,
                                         UErrorCode * status);
 
@@ -269,13 +271,13 @@ int icu_chain_assign_cstr(struct icu_chain * chain,
 int icu_chain_next_token(struct icu_chain * chain,
                          UErrorCode *status);
 
-int icu_chain_get_token_count(struct icu_chain * chain);
+int icu_chain_token_number(struct icu_chain * chain);
 
-const char * icu_chain_get_display(struct icu_chain * chain);
+const char * icu_chain_token_display(struct icu_chain * chain);
 
-const char * icu_chain_get_norm(struct icu_chain * chain);
+const char * icu_chain_token_norm(struct icu_chain * chain);
 
-const char * icu_chain_get_sort(struct icu_chain * chain);
+const char * icu_chain_token_sortkey(struct icu_chain * chain);
 
 const UCollator * icu_chain_get_coll(struct icu_chain * chain);