X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Ficu_I18N.h;h=659151413ef17ebebb49e7ea2d06e65e6ae6ceeb;hp=f00eef935ea7782b12a123c37f9e8c28162bd72e;hb=5b5d2ba5455538ccc356e208476dc7aeb3703421;hpb=2788a4851b551e1a3efb320a2878b809f2d8a9d7

diff --git a/include/yaz/icu_I18N.h b/include/yaz/icu_I18N.h
index f00eef9..6591514 100644
--- a/include/yaz/icu_I18N.h
+++ b/include/yaz/icu_I18N.h
@@ -162,31 +162,31 @@ int32_t icu_tokenizer_token_count(struct icu_tokenizer * tokenizer);
 
 
 
-struct icu_normalizer
+struct icu_transform
 {
     char action;
-    struct icu_buf_utf16 * rules16;
     UParseError parse_error;
     UTransliterator * trans;
 };
 
-struct icu_normalizer * icu_normalizer_create(const char *rules, char action,
-                                              UErrorCode *status);
-
+struct icu_transform * icu_transform_create(const char *id, char action,
+                                            const char *rules,
+                                            UErrorCode *status);
 
-void icu_normalizer_destroy(struct icu_normalizer * normalizer);
+void icu_transform_destroy(struct icu_transform * transform);
 
-int icu_normalizer_normalize(struct icu_normalizer * normalizer,
-                             struct icu_buf_utf16 * dest16,
-                             struct icu_buf_utf16 * src16,
-                             UErrorCode *status);
+int icu_transform_trans(struct icu_transform * transform,
+                        struct icu_buf_utf16 * dest16,
+                        struct icu_buf_utf16 * src16,
+                        UErrorCode *status);
 
 enum icu_chain_step_type {
     ICU_chain_step_type_none,
     ICU_chain_step_type_display,   /* convert to utf8 display format */
     ICU_chain_step_type_casemap,   /* apply utf16 charmap */
-    ICU_chain_step_type_normalize, /* apply utf16 normalization */
-    ICU_chain_step_type_tokenize   /* apply utf16 tokenization */
+    ICU_chain_step_type_transform, /* apply utf16 transform */
+    ICU_chain_step_type_tokenize,  /* apply utf16 tokenization */
+    ICU_chain_step_type_transliterate  /* apply utf16 tokenization */
 };
 
 
@@ -197,7 +197,7 @@ struct icu_chain_step
     enum icu_chain_step_type type;
     union {
 	struct icu_casemap * casemap;
-	struct icu_normalizer * normalizer;
+	struct icu_transform * transform;
 	struct icu_tokenizer * tokenizer;  
     } u;
     /* temprary post-action utf16 buffer */
@@ -262,7 +262,9 @@ const UCollator * icu_chain_get_coll(yaz_icu_chain_t chain);
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+