X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-misc.h;h=2021dbadeebf564a01a85e9867f4cf3c62d014eb;hb=1b7bcea372680c0e52493e54e3b4c2e16744101d;hp=5faf2370e5241e706275df6842f6816325585ac4;hpb=2818c176dac104d38f6c868d8ca1e602a87aef0c;p=m17n%2Fm17n-lib.git

diff --git a/src/m17n-misc.h b/src/m17n-misc.h
index 5faf237..2021dba 100644
--- a/src/m17n-misc.h
+++ b/src/m17n-misc.h
@@ -1,5 +1,5 @@
 /* m17n-misc.h -- header file for the MISC API.
-   Copyright (C) 2003, 2004
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H15PRO112
 
@@ -17,13 +17,21 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the m17n library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    02111-1307, USA.  */
 
 #ifndef _M17N_ERR_H_
 #define _M17N_ERR_H_
 
+#ifndef _M17N_CORE_H_
+#include <m17n-core.h>
+#endif
+
+M17N_BEGIN_HEADER
+
 /*** @defgroup m17nMisc MISC API */
+/***en @brief Miscellaneous API */
+/***ja @brief ¤½¤Î¾¤Î API */
 /*=*/
 /*** @ingroup m17nMisc  */
 /***en @defgroup m17nError Error Handling */
@@ -37,7 +45,7 @@
     Enumeration for error code of the m17n library.
 
     When a library function is called with an invalid argument, it
-    sets the external variable @e merror_code to one of these values.
+    sets the external variable #merror_code to one of these values.
     All the error codes are positive integers.
 
     When a memory allocation error happens, the function pointed to by
@@ -49,12 +57,11 @@
 
     m17n ¥é¥¤¥Ö¥é¥ê¥¨¥é¡¼¥³¡¼¥É¤ÎÎóµó
 
-    ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô¤¬ÂÅÅö¤Ç¤Ê¤¤°ú¿ô¤È¤È¤â¤Ë¸Æ¤Ð¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢ÊÑ¿ô @c
-    merror_code ¤ò¤³¤ì¤é¤ÎÃͤΤɤ줫¤Ë¥»¥Ã¥È¤¹¤ë¡£¤¹¤Ù¤Æ¤Î¥¨¥é¡¼¥³¡¼¥É
-    ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤¢¤ë¡£
+    ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô¤¬ÂÅÅö¤Ç¤Ê¤¤°ú¿ô¤È¤È¤â¤Ë¸Æ¤Ð¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢ÊÑ¿ô 
+    #merror_code ¤ò¤³¤ì¤é¤ÎÃͤΤɤ줫¤Ë¥»¥Ã¥È¤¹¤ë¡£¤¹¤Ù¤Æ¤Î¥¨¥é¡¼¥³¡¼¥É¤ÏÀµ¤ÎÀ°¿ô¤Ç¤¢¤ë¡£
 
-    ¥á¥â¥ê³äÅö¤Æ¥¨¥é¡¼¤ÎºÝ¤Ë¤Ï¡¢³°ÉôÊÑ¿ô #m17n_memory_full_handler ¤Î»Ø
-    ¤¹´Ø¿ô¤¬¡¢¤³¤ì¤é¤ÎÃͤΤ¦¤Á¤Î¤É¤ì¤«¤ò°ú¿ô¤È¤·¤Æ¸Æ¤Ð¤ì¤ë¡£
+    ¥á¥â¥ê³äÅö¤Æ¥¨¥é¡¼¤ÎºÝ¤Ë¤Ï¡¢³°ÉôÊÑ¿ô #m17n_memory_full_handler 
+    ¤Î»Ø¤¹´Ø¿ô¤¬¡¢¤³¤ì¤é¤ÎÃͤΤ¦¤Á¤Î¤É¤ì¤«¤ò°ú¿ô¤È¤·¤Æ¸Æ¤Ð¤ì¤ë¡£
     */
 
 enum MErrorCode
@@ -78,22 +85,23 @@ enum MErrorCode
     MERROR_FRAME,
     MERROR_FACE,
     MERROR_DRAW,
+    MERROR_FLT,
     MERROR_FONT,
     MERROR_FONTSET,
     MERROR_FONT_OTF,
+    MERROR_FONT_X,
     MERROR_FONT_FT,
     MERROR_IM,
     MERROR_DB,
     MERROR_IO,
     MERROR_DEBUG,
     MERROR_MEMORY,
+    MERROR_GD,
     MERROR_MAX
   };
 
 /*=*/
 
-extern enum MErrorCode merror_code;
-
 extern void (*m17n_memory_full_handler) (enum MErrorCode err);
 
 /*=*/
@@ -114,6 +122,9 @@ extern MCharTable *mdebug_dump_chartab (MCharTable *table, int indent);
 /***en @defgroup m17nInternal Internal */
 /***ja @defgroup m17nInternal Internal */
 #endif
+
+M17N_END_HEADER
+
 #endif /* _M17N_ERR_H_ */
 
 /*