From: handa <handa>
Date: Fri, 24 Dec 2004 07:23:07 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-2-0~23
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf32e0de6e84959f6afc5e8c6914b2223a30ae8b;p=m17n%2Fm17n-lib.git

*** empty log message ***
---

diff --git a/src/language.c b/src/language.c
index 1f4b93a..a9b5912 100644
--- a/src/language.c
+++ b/src/language.c
@@ -28,6 +28,8 @@
 #include "language.h"
 #include "symbol.h"
 
+#if !defined (FOR_DOXYGEN) || defined (DOXYGEN_INTERNAL_MODULE)
+
 
 /* Internal API */
 
@@ -247,3 +249,5 @@ void
 mlang__fini (void)
 {
 }
+
+#endif /* !FOR_DOXYGEN || DOXYGEN_INTERNAL_MODULE */
diff --git a/src/m17n-core.h b/src/m17n-core.h
index 7c9998d..f416fc5 100644
--- 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
diff --git a/src/m17n-gui.c b/src/m17n-gui.c
index 287988c..de3b764 100644
--- a/src/m17n-gui.c
+++ b/src/m17n-gui.c
@@ -230,9 +230,6 @@ static MDeviceLibraryInterface null_interface =
 
 /* Internal API */
 
-/*** @} */ 
-#endif /* !FOR_DOXYGEN || DOXYGEN_INTERNAL_MODULE */
-
 
 /* External API */
 
@@ -340,6 +337,9 @@ m17n_fini_win (void)
   m17n_fini ();
 }
 
+/*** @} */ 
+#endif /* !FOR_DOXYGEN || DOXYGEN_INTERNAL_MODULE */
+
 /*** @addtogroup m17nFrame */
 /***en
     @brief A @e frame is an object corresponding to the graphic device.
diff --git a/src/m17n-gui.h b/src/m17n-gui.h
index efe9846..e26f235 100644
--- a/src/m17n-gui.h
+++ b/src/m17n-gui.h
@@ -32,6 +32,8 @@ extern "C"
 {
 #endif
 
+#if !defined (FOR_DOXYGEN) || defined (DOXYGEN_INTERNAL_MODULE)
+
 extern void m17n_init_win (void);
 #undef M17N_INIT
 #define M17N_INIT() m17n_init_win ()
@@ -40,6 +42,8 @@ extern void m17n_fini_win (void);
 #undef M17N_FINI
 #define M17N_FINI() m17n_fini_win ()
 
+#endif
+
 /***en @defgroup m17nGUI GUI API */
 /***ja @defgroup m17nGUI GUI API */
 /*=*/
diff --git a/src/m17n.c b/src/m17n.c
index 8c7c14d..34ea41c 100644
--- a/src/m17n.c
+++ b/src/m17n.c
@@ -29,6 +29,8 @@
 #include "charset.h"
 #include "coding.h"
 
+#if !defined (FOR_DOXYGEN) || defined (DOXYGEN_INTERNAL_MODULE)
+
 
 /* Internal API */
 
@@ -115,6 +117,8 @@ m17n_fini (void)
   m17n_fini_core ();
 }
 
+#endif /* !FOR_DOXYGEN || DOXYGEN_INTERNAL_MODULE */
+
 /*
   Local Variables:
   coding: euc-japan
diff --git a/src/m17n.h b/src/m17n.h
index a7de54c..e90629e 100644
--- 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;