*** empty log message ***

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

diff --git a/src/m17n-core.h b/src/m17n-core.h
index 7c9998d..f416fc5 100644 (file)
--- a/src/m17n-core.h
+++ b/src/m17n-core.h
@@ -38,6 +38,8 @@ extern "C"
 /***ja @defgroup m17nIntro ¤Ï¤¸¤á¤Ë  */
 /*=*/
 
+#if !defined (FOR_DOXYGEN) || defined (DOXYGEN_INTERNAL_MODULE)
+
 #define M17NLIB_MAJOR_VERSION 1
 #define M17NLIB_MINOR_VERSION 1
 #define M17NLIB_PATCH_LEVEL 0
@@ -48,6 +50,8 @@ extern void m17n_init_core (void);
 extern void m17n_fini_core (void);
 #define M17N_FINI() m17n_fini_core ()
 
+#endif
+
 /*=*/
 
 /*** @ingroup m17nIntro */
@@ -236,8 +240,10 @@ extern void *mplist_value (MPlist *plist);
 /***ja @defgroup m17nCharacter ʸ»ú */
 /*=*/
 
+#if !defined (FOR_DOXYGEN) || defined (DOXYGEN_INTERNAL_MODULE)
 #define MCHAR_MAX 0x3FFFFF
 /*#define MCHAR_MAX 0x7FFFFFFF*/
+#endif
 
 extern MSymbol Mscript;
 extern MSymbol Mname;
@@ -287,9 +293,8 @@ extern int mchartable_set (MCharTable *table, int c, void *val);
 extern int mchartable_set_range (MCharTable *table, int from, int to,
                                 void *val);
 
-extern int mchartable_map  (MCharTable *table, void *ignore,
-                          void (*func) (int from, int to,
-                                        void *val, void *arg), 
+extern int mchartable_map (MCharTable *table, void *ignore,
+                          void (*func) (int, int, void *, void *), 
                           void *func_arg);
 
 extern void mchartable_range (MCharTable *table, int *from, int *to);
@@ -362,22 +367,20 @@ extern MText *mtext ();
 
 /*=*/
 
-/*** @addtogroup m17nMtext 
-     @{ */
-
-/***en @name Variables: System's UTF-16 and UTF-32 types */
-/***ja @name ÊÑ¿ô: ¥·¥¹¥Æ¥à¤Î UTF-16 ¤È UTF-32 ¤Î¥¿¥¤¥× */
-
+/***en @name Variables: Default Endian of UTF-16 and UTF-32 */
+/***ja @name ÊÑ¿ô: UTF-16 ¤È UTF-32 ¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥¨¥ó¥Ç¥£¥¢¥ó */
+/*** @{ */
 /*=*/
 
+/*** @ingroup m17nMtext */
 /***en
     @brief Variable of value MTEXT_FORMAT_UTF_16LE or MTEXT_FORMAT_UTF_16BE.
 
     The global variable #MTEXT_FORMAT_UTF_16 is initialized to
     #MTEXT_FORMAT_UTF_16LE on a "Little Endian" system (storing words
     with the least significant byte first), and to
-    #MTEXT_FORMAT_UTF_16BE depneding on a "Big Endian" system (storing
-    words with the most significant byte first).  */
+    #MTEXT_FORMAT_UTF_16BE on a "Big Endian" system (storing words
+    with the most significant byte first).  */
 
 /***ja
     @brief Ãͤ¬ MTEXT_FORMAT_UTF_16LE ¤« MTEXT_FORMAT_UTF_16BE ¤Ç¤¢¤ëÊÑ¿ô
@@ -395,13 +398,14 @@ extern MText *mtext ();
 extern const int MTEXT_FORMAT_UTF_16;
 /*=*/
 
+/*** @ingroup m17nMtext */
 /***en
     @brief Variable of value MTEXT_FORMAT_UTF_32LE or MTEXT_FORMAT_UTF_32BE.
 
     The global variable #MTEXT_FORMAT_UTF_32 is initialized to
     #MTEXT_FORMAT_UTF_32LE on a "Little Endian" system (storing words
     with the least significant byte first), and to
-    #MTEXT_FORMAT_UTF_32BE depneding on a "Big Endian" system (storing
+    #MTEXT_FORMAT_UTF_32BE on a "Big Endian" system (storing
     words with the most significant byte first).  */
 
 /***ja
@@ -420,13 +424,14 @@ extern const int MTEXT_FORMAT_UTF_16;
 extern const int MTEXT_FORMAT_UTF_32;
 
 /*=*/
+/*** @} */
+/*=*/
 
 extern MText *mtext_from_data (const void *data, int nitems,
                               enum MTextFormat format);
 
-
 /*=*/
-/***     @} */
+/*** @} */
 
 /*
  *  (5-2) Functions to manipulate M-texts.  They correspond to string