(mdatabase__dir_list): Renamed from mdb_dir_list.

[m17n/m17n-lib.git] / src / m17n.h

diff --git a/src/m17n.h b/src/m17n.h
index ebc9ba2..e90629e 100644 (file)
--- a/src/m17n.h
+++ b/src/m17n.h
@@ -36,6 +36,7 @@ extern "C"
 {
 #endif
 
+#if !defined (FOR_DOXYGEN) || defined (DOXYGEN_INTERNAL_MODULE)
 extern void m17n_init (void);
 #undef M17N_INIT
 #define M17N_INIT() m17n_init ()
@@ -43,6 +44,7 @@ extern void m17n_init (void);
 extern void m17n_fini (void);
 #undef M17N_FINI
 #define M17N_FINI() m17n_fini ()
+#endif
 
 /***en @defgroup m17nShell SHELL API */
 /***ja @defgroup m17nShell ¥·¥§¥ë API */
@@ -106,7 +108,10 @@ extern MDatabase *mdatabase_define (MSymbol tag1, MSymbol tag2,
 /***en @defgroup m17nCharset Charset */
 /***ja @defgroup m17nCharset ʸ»ú¥»¥Ã¥È */
 /*=*/
+
+#if !defined (FOR_DOXYGEN) || defined (DOXYGEN_INTERNAL_MODULE)
 #define MCHAR_INVALID_CODE 0xFFFFFFFF
+#endif
 
 /* Predefined charsets */ 
 extern MSymbol Mcharset_ascii;
@@ -142,7 +147,7 @@ extern MSymbol Msuperset;
 /* etc. */
 extern MSymbol Mcharset;
 
-extern MSymbol mchar_define_charset (char *name, MPlist *plist);
+extern MSymbol mchar_define_charset (const char *name, MPlist *plist);
 
 extern MSymbol mchar_resolve_charset (MSymbol symbol);
 
@@ -767,9 +772,9 @@ typedef struct
 } MCodingInfoUTF;
 /*=*/
 
-extern MSymbol mconv_define_coding (char *name, MPlist *plist,
+extern MSymbol mconv_define_coding (const char *name, MPlist *plist,
                                    int (*resetter) (MConverter *),
-                                   int (*decoder) (unsigned char *, int,
+                                   int (*decoder) (const unsigned char *, int,
                                                    MText *, MConverter *),
                                    int (*encoder) (MText *, int, int,
                                                    unsigned char *, int,
@@ -825,6 +830,7 @@ extern MText *mconv_gets (MConverter *converter, MText *mt);
 /***ja @defgroup m17nLocale ¥í¥±¡¼¥ë */
 /*=*/
 
+/*** @ingroup m17nLocale */
 /***en
     @brief @c struct @c MLocale.
 
@@ -890,12 +896,13 @@ extern MText *mtext_toupper (MText *mt);
 /***ja @defgroup m17nInputMethod ÆþÎϥ᥽¥Ã¥É (´ðËÜÉôʬ) */
 /*=*/
 
+/*** @addtogroup m17nInputMethod 
+     @{ */
+
 /* Struct forward declaration.  */
 typedef struct MInputMethod MInputMethod;
 typedef struct MInputContext MInputContext;
 
-/*** @ingroup m17nInputMethod */
-
 /***en
     @brief Type of input method callback functions.
 
@@ -1082,8 +1089,8 @@ typedef struct MInputDriver
       #Minput_preedit_done, #Minput_status_start, #Minput_status_draw,
       #Minput_status_done, #Minput_candidates_start,
       #Minput_candidates_draw, #Minput_candidates_done,
-      #Minput_set_spot, and #Minput_toggle.  Values are functions of
-      type #MInputCallbackFunc.  */
+      #Minput_set_spot, #Minput_toggle, #Minput_reset.
+      Values are functions of type #MInputCallbackFunc.  */
   /***ja
       @brief ¥³¡¼¥ë¥Ð¥Ã¥¯´Ø¿ô¤Î¥ê¥¹¥È.
 
@@ -1092,8 +1099,8 @@ typedef struct MInputDriver
       #Minput_preedit_done, #Minput_status_start, #Minput_status_draw,
       #Minput_status_done, #Minput_candidates_start,
       #Minput_candidates_draw, #Minput_candidates_done,
-      #Minput_set_spot, #Minput_toggle¡£ ÃͤÏ#MInputCallbackFunc ·¿¤Î
-      ´Ø¿ô¡£.  */
+      #Minput_set_spot, #Minput_toggle, #Minput_reset¡£ 
+      ÃͤÏ#MInputCallbackFunc ·¿¤Î´Ø¿ô¡£  */
   MPlist *callback_list;
 
 } MInputDriver;
@@ -1117,6 +1124,7 @@ extern MSymbol Minput_candidates_draw;
 extern MSymbol Minput_candidates_done;
 extern MSymbol Minput_set_spot;
 extern MSymbol Minput_toggle;
+extern MSymbol Minput_reset;
 
 /***en
     @brief Structure of input method.
@@ -1308,12 +1316,13 @@ extern void minput_set_spot (MInputContext *ic, int x, int y,
 
 extern void minput_toggle (MInputContext *ic);
 
-extern MSymbol minput_char_to_key (int c);
-
+extern void minput_reset_ic (MInputContext *ic);
 /*=*/
+/***     @} */
 
 extern MInputMethod *mdebug_dump_im (MInputMethod *im, int indent);
 
+
 #ifdef __cplusplus
 }
 #endif