From: nisikimi Date: Wed, 21 Apr 2004 06:17:47 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: withdl~282 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=2818c176dac104d38f6c868d8ca1e602a87aef0c;p=m17n%2Fm17n-lib.git *** empty log message *** --- diff --git a/src/character.c b/src/character.c index 6f667e1..54517a0 100644 --- a/src/character.c +++ b/src/character.c @@ -42,7 +42,7 @@ /***ja @addtogroup m17nCharacter - @brief ʸ»ú¥ª¥Ö¥¸¥§¥¯¥È¤È¤½¤ì¤Ë´Ø¤¹¤ë API + @brief ʸ»ú¥ª¥Ö¥¸¥§¥¯¥È¤È¤½¤ì¤Ë´Ø¤¹¤ë API. m17n ¥é¥¤¥Ö¥é¥ê¤Ï @e ʸ»ú ¤òʸ»ú¥³¡¼¥É¡ÊÀ°¿ô¡Ë¤Çɽ¸½¤¹¤ë¡£ºÇ¾®¤Îʸ »ú¥³¡¼¥É¤Ï @c 0 ¤Ç¡¢ºÇÂç¤Îʸ»ú¥³¡¼¥É¤Ï¥Þ¥¯¥í #MCHAR_MAX ¤Ë¤è¤Ã¤Æ diff --git a/src/coding.c b/src/coding.c index 0dd09cd..b99c56c 100644 --- a/src/coding.c +++ b/src/coding.c @@ -37,7 +37,7 @@ /***ja @addtogroup m17nConv - @brief ¥³¡¼¥É·Ï¥ª¥Ö¥¸¥§¥¯¥È¤È¤½¤ì¤Ë´Ø¤¹¤ë API + @brief ¥³¡¼¥É·Ï¥ª¥Ö¥¸¥§¥¯¥È¤È¤½¤ì¤Ë´Ø¤¹¤ë API. m17n ¥é¥¤¥Ö¥é¥ê¤Ï¡¢Éä¹æ²½Ê¸»ú½¸¹ç (coded character set; CCS) ¤Îʸ »úÉä¹ç²½Êý¼° (character encoding scheme; CES) ¤ò @e ¥³¡¼¥É·Ï ¤È¸Æ @@ -3088,13 +3088,13 @@ mcoding__load_from_database () /*=*/ /***en - @brief Symbol for the coding system US-ASCII + @brief Symbol for the coding system US-ASCII. The symbol #Mcoding_us_ascii has name "us-ascii" and represents a coding system for the CES US-ASCII. */ /***ja - @brief US-ASCII ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief US-ASCII ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_us_ascii ¤Ï "us-ascii" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Á¡¢ CES US-ASCII ÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ @@ -3103,13 +3103,13 @@ MSymbol Mcoding_us_ascii; /*=*/ /***en - @brief Symbol for the coding system ISO-8859-1 + @brief Symbol for the coding system ISO-8859-1. The symbol #Mcoding_iso_8859_1 has name "iso-8859-1" and represents a coding system for the CES ISO-8859-1. */ /***ja - @brief ISO-8859-1 ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief ISO-8859-1 ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_iso_8859_1 ¤Ï "iso-8859-1" ¤È¤¤¤¦Ì¾Á° ¤ò»ý¤Á¡¢CES ISO-8859-1 ÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ */ @@ -3118,13 +3118,13 @@ MSymbol Mcoding_iso_8859_1; /*=*/ /***en - @brief Symbol for the coding system UTF-8 + @brief Symbol for the coding system UTF-8. The symbol #Mcoding_utf_8 has name "utf-8" and represents a coding system for the CES UTF-8. */ /***ja - @brief UTF-8 ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief UTF-8 ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_utf_8 ¤Ï "utf-8" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Á¡¢CES UTF-8 ÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ @@ -3134,7 +3134,7 @@ MSymbol Mcoding_utf_8; /*=*/ /***en - @brief Symbol for the coding system UTF-8-FULL + @brief Symbol for the coding system UTF-8-FULL. The symbol #Mcoding_utf_8_full has name "utf-8-full" and represents a coding system that is a extension of UTF-8. This @@ -3143,7 +3143,7 @@ MSymbol Mcoding_utf_8; supported by the m17n library. */ /***ja - @brief UTF-8-FULL ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief UTF-8-FULL ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_utf_8_full ¤Ï "utf-8-full" ¤È¤¤¤¦Ì¾Á°¤ò »ý¤Á¡¢"UTF-8" ¤Î³ÈÄ¥¤Ç¤¢¤ë¥³¡¼¥É·Ï¤ò¼¨¤¹¡£¤³¤Î¥³¡¼¥É·Ï¤Ï @@ -3156,12 +3156,12 @@ MSymbol Mcoding_utf_8_full; /*=*/ /***en - @brief Symbol for the coding system UTF-16 + @brief Symbol for the coding system UTF-16. The symbol #Mcoding_utf_16 has name "utf-16" and represents a coding system for the CES UTF-16 (RFC 2279). */ /***ja - @brief UTF-16 ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief UTF-16 ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_utf_16 ¤Ï "utf-16" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Á¡¢ CES UTF-16 (RFC 2279) ÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ @@ -3171,13 +3171,13 @@ MSymbol Mcoding_utf_16; /*=*/ /***en - @brief Symbol for the coding system UTF-16BE + @brief Symbol for the coding system UTF-16BE. The symbol #Mcoding_utf_16be has name "utf-16be" and represents a coding system for the CES UTF-16BE (RFC 2279). */ /***ja - @brief UTF-16BE ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief UTF-16BE ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_utf_16be ¤Ï "utf-16be" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Á¡¢ CES UTF-16BE (RFC 2279) ÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ */ @@ -3186,13 +3186,13 @@ MSymbol Mcoding_utf_16be; /*=*/ /***en - @brief Symbol for the coding system UTF-16LE + @brief Symbol for the coding system UTF-16LE. The symbol #Mcoding_utf_16le has name "utf-16le" and represents a coding system for the CES UTF-16LE (RFC 2279). */ /***ja - @brief UTF-16LE ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief UTF-16LE ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_utf_16le ¤Ï "utf-16le" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Á¡¢ CES UTF-16LE (RFC 2279) ÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ */ @@ -3201,13 +3201,13 @@ MSymbol Mcoding_utf_16le; /*=*/ /***en - @brief Symbol for the coding system UTF-32 + @brief Symbol for the coding system UTF-32. The symbol #Mcoding_utf_32 has name "utf-32" and represents a coding system for the CES UTF-32 (RFC 2279). */ /***ja - @brief UTF-32 ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief UTF-32 ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_utf_32 ¤Ï "utf-32" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Á¡¢ CES UTF-32 (RFC 2279) ÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ */ @@ -3216,12 +3216,12 @@ MSymbol Mcoding_utf_32; /*=*/ /***en - @brief Symbol for the coding system UTF-32be + @brief Symbol for the coding system UTF-32be. The symbol #Mcoding_utf_32be has name "utf-32be" and represents a coding system for the CES UTF-32BE (RFC 2279). */ /***ja - @brief UTF-32be ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief UTF-32be ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_utf_32be ¤Ï "utf-32be" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Á¡¢ CES UTF-32BE (RFC 2279) ÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ */ @@ -3230,12 +3230,12 @@ MSymbol Mcoding_utf_32be; /*=*/ /***en - @brief Symbol for the coding system UTF-32LE + @brief Symbol for the coding system UTF-32LE. The symbol #Mcoding_utf_32le has name "utf-32le" and represents a coding system for the CES UTF-32LE (RFC 2279). */ /***ja - @brief UTF-32LE ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief UTF-32LE ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_utf_32le ¤Ï "utf-32le" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Á¡¢ CES UTF-32LE (RFC 2279) ÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ */ @@ -3244,12 +3244,12 @@ MSymbol Mcoding_utf_32le; /*=*/ /***en - @brief Symbol for the coding system SJIS + @brief Symbol for the coding system SJIS. The symbol #Mcoding_sjis has name "sjis" and represents a coding system for the CES Shift-JIS. */ /***ja - @brief SJIS ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë + @brief SJIS ¥³¡¼¥É·Ï¤Î¥·¥ó¥Ü¥ë. ¥·¥ó¥Ü¥ë #Mcoding_sjis has ¤Ï "sjis" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Á¡¢ CES Shift-JISÍѤΥ³¡¼¥É·Ï¤ò¼¨¤¹¡£ */ @@ -3355,7 +3355,7 @@ MSymbol Mfull_support; used a value of #Mbom parameter of the function mconv_define_coding () (which see). */ /***ja - @brief "maybe"¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë + @brief "maybe"¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë. ÊÑ¿ô #Mmaybe ¤Ï "maybe" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¡£¤³¤ì¤Ï´Ø¿ô mconv_define_coding () ¥Ñ¥é¥á¡¼¥¿ #Mbom ¤ÎÃͤȤ·¤ÆÍѤ¤¤é¤ì¤ë¡£(¾Ü @@ -3365,14 +3365,14 @@ MSymbol Mmaybe; /*=*/ /***en - @brief The symbol @c Mcoding + @brief The symbol @c Mcoding. Any decoded M-text has a text property whose key is the predefined symbol @c Mcoding. The name of @c Mcoding is "coding". */ /***ja - @brief ¥·¥ó¥Ü¥ë @c Mcoding + @brief ¥·¥ó¥Ü¥ë @c Mcoding. ¥Ç¥³¡¼¥É¤µ¤ì¤¿ M-text ¤Ï¤¹¤Ù¤Æ¡¢¥­¡¼¤¬ÄêµÁºÑ¤ß¥·¥ó¥Ü¥ë @c Mcoding ¤Ç¤¢¤ë¤è¤¦¤Ê¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤ò»ý¤Ä¡£¥·¥ó¥Ü¥ë @c Mcoding ¤Ï @@ -3384,7 +3384,7 @@ MSymbol Mcoding; /*=*/ /***en - @brief Define a coding system + @brief Define a coding system. The mconv_define_coding () function defines a new coding system and makes it accessive via a symbol whose name is $NAME. $PLIST @@ -4022,7 +4022,7 @@ mconv_resolve_coding (MSymbol symbol) representing a coding system, stores the pointer to the array in a place pointed to by $SYMBOLS, and returns the length of the array. */ /***ja - @brief ¥³¡¼¥É·Ï¤òɽ¤ï¤¹¥·¥ó¥Ü¥ë¤òÎóµó¤¹¤ë + @brief ¥³¡¼¥É·Ï¤òɽ¤ï¤¹¥·¥ó¥Ü¥ë¤òÎóµó¤¹¤ë. ´Ø¿ô mchar_list_codings () ¤Ï¡¢¥³¡¼¥É·Ï¤ò¼¨¤¹¥·¥ó¥Ü¥ë¤òʤ٤¿ÇÛÎó ¤òºî¤ê¡¢$SYMBOLS ¤Ç¥Ý¥¤¥ó¥È¤µ¤ì¤¿¾ì½ê¤Ë¤³¤ÎÇÛÎó¤Ø¤Î¥Ý¥¤¥ó¥¿¤òÃÖ¤­¡¢ @@ -4065,7 +4065,7 @@ mconv_list_codings (MSymbol **symbols) assigns an error code to the external variable #merror_code. */ /***ja - @brief ¥Ð¥Ã¥Õ¥¡¤Ë·ë¤ÓÉÕ¤±¤é¤ì¤¿¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤òºî¤ë + @brief ¥Ð¥Ã¥Õ¥¡¤Ë·ë¤ÓÉÕ¤±¤é¤ì¤¿¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤òºî¤ë. ´Ø¿ô mconv_buffer_converter () ¤Ï¡¢¥³¡¼¥É·Ï $CODING ÍѤΥ³¡¼¥É¥³¥ó ¥Ð¡¼¥¿¤òºî¤ë¡£¤³¤Î¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤Ï¡¢$BUF ¤Ç¼¨¤µ¤ì¤ëÂ礭¤µ $N ¥Ð @@ -4143,7 +4143,7 @@ mconv_buffer_converter (MSymbol name, unsigned char *buf, int n) merror_code. */ /***ja - @brief ¥¹¥È¥ê¡¼¥à¤Ë·ë¤ÓÉÕ¤±¤é¤ì¤¿¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤òºî¤ë + @brief ¥¹¥È¥ê¡¼¥à¤Ë·ë¤ÓÉÕ¤±¤é¤ì¤¿¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤òºî¤ë. ´Ø¿ô mconv_stream_converter () ¤Ï¡¢¥³¡¼¥É·Ï $CODING ÍѤΥ³¡¼¥É¥³¥ó ¥Ð¡¼¥¿¤òºî¤ë¡£¤³¤Î¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤Ï¡¢¥¹¥È¥ê¡¼¥à $FP ¤Ë·ë¤ÓÉÕ¤±¤é @@ -4226,7 +4226,7 @@ mconv_stream_converter (MSymbol name, FILE *fp) applied to $CONVERTER. Otherwise it returns 0. */ /***ja - @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤ò¥ê¥»¥Ã¥È¤¹¤ë + @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤ò¥ê¥»¥Ã¥È¤¹¤ë. ´Ø¿ô mconv_reset_converter () ¤Ï¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿ $CONVERTER ¤ò½é´ü ¾õÂÖ¤ËÌ᤹¡£ @@ -4259,7 +4259,7 @@ mconv_reset_converter (MConverter *converter) $CONVERTER. */ /***ja - @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤ò²òÊü¤¹¤ë + @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤ò²òÊü¤¹¤ë. ´Ø¿ô mconv_free_converter () ¤Ï¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿ $CONVERTER ¤ò²òÊü ¤¹¤ë¡£ */ @@ -4289,7 +4289,7 @@ mconv_free_converter (MConverter *converter) This function always returns $CONVERTER. */ /***ja - @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤Ë¥Ð¥Ã¥Õ¥¡Îΰè¤ò·ë¤ÓÉÕ¤±¤ë + @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤Ë¥Ð¥Ã¥Õ¥¡Îΰè¤ò·ë¤ÓÉÕ¤±¤ë. ´Ø¿ô mconv_rebind_buffer () ¤Ï¡¢$BUF ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤¿Â礭¤µ $N ¥Ð ¥¤¥È¤Î¥Ð¥Ã¥Õ¥¡Îΰè¤ò¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿ $CONVERTER ¤Ë·ë¤ÓÉÕ¤±¤ë¡£¤³¤ì @@ -4330,7 +4330,7 @@ mconv_rebind_buffer (MConverter *converter, unsigned char *buf, int n) This function always returns $CONVERTER. */ /***ja - @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤Ë¥¹¥È¥ê¡¼¥à¤ò·ë¤ÓÉÕ¤±¤ë + @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤Ë¥¹¥È¥ê¡¼¥à¤ò·ë¤ÓÉÕ¤±¤ë. ´Ø¿ô mconv_rebind_stream () ¤Ï¡¢¥¹¥È¥ê¡¼¥à $FP ¤ò¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿ $CONVERTER ¤Ë·ë¤ÓÉÕ¤±¤ë¡£¤³¤ì°Ê¹ß¤Î¥Ç¥³¡¼¥É¤ª¤è¤Ó¥¨¥ó¥³¡¼¥É¤Ï¡¢ @@ -4378,7 +4378,7 @@ mconv_rebind_stream (MConverter *converter, FILE *fp) the external variable #merror_code. */ /***ja - @brief ¥Ð¥¤¥ÈÎó¤ò M-text ¤Ë¥Ç¥³¡¼¥É¤¹¤ë + @brief ¥Ð¥¤¥ÈÎó¤ò M-text ¤Ë¥Ç¥³¡¼¥É¤¹¤ë. ´Ø¿ô mconv_decode () ¤Ï¡¢¥Ð¥¤¥ÈÎó¤ò¥Ç¥³¡¼¥É¤·¤Æ¤½¤Î·ë²Ì¤ò M-text $MT ¤ÎËöÈø¤ËÄɲ乤롣¥Ç¥³¡¼¥É¸µ¤Î¥Ð¥¤¥ÈÎó¤Ï¡¢¸½ºß·ë¤ÓÉÕ¤±¤é¤ì¤Æ¤¤¤ë @@ -4517,7 +4517,7 @@ mconv_decode (MConverter *converter, MText *mt) assigns an error code to the external variable #merror_code. */ /***ja - @brief ¥³¡¼¥É·Ï¤Ë´ð¤Å¤¤¤Æ¥Ð¥Ã¥Õ¥¡Îΰè¤ò¥Ç¥³¡¼¥É¤¹¤ë + @brief ¥³¡¼¥É·Ï¤Ë´ð¤Å¤¤¤Æ¥Ð¥Ã¥Õ¥¡Îΰè¤ò¥Ç¥³¡¼¥É¤¹¤ë. ´Ø¿ô mconv_decode_buffer () ¤Ï¡¢$BUF ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤¿ $N ¥Ð¥¤¥È¤Î ¥Ð¥Ã¥Õ¥¡Îΰè¤ò¡¢¥³¡¼¥É·Ï $NAME ¤Ë´ð¤Å¤¤¤Æ¥Ç¥³¡¼¥É¤¹¤ë¡£¥Ç¥³¡¼¥É¤Ë @@ -4568,7 +4568,7 @@ mconv_decode_buffer (MSymbol name, unsigned char *buf, int n) error code to the external variable #merror_code. */ /***ja - @brief ¥³¡¼¥É·Ï¤Ë´ð¤Å¤¤¤Æ¥¹¥È¥ê¡¼¥àÆþÎϤò¥Ç¥³¡¼¥É¤¹¤ë + @brief ¥³¡¼¥É·Ï¤Ë´ð¤Å¤¤¤Æ¥¹¥È¥ê¡¼¥àÆþÎϤò¥Ç¥³¡¼¥É¤¹¤ë. ´Ø¿ô mconv_decode_stream () ¤Ï¡¢¥¹¥È¥ê¡¼¥à $FP ¤«¤éÆɤ߹þ¤Þ¤ì¤ë¥Ð ¥¤¥ÈÎóÁ´ÂΤò¡¢¥³¡¼¥É·Ï $NAME ¤Ë´ð¤Å¤¤¤Æ¥Ç¥³¡¼¥É¤¹¤ë¡£¥Ç¥³¡¼¥É¤Ëɬ @@ -4618,7 +4618,7 @@ mconv_decode_stream (MSymbol name, FILE *fp) error code to the external variable #merror_code. */ /***ja - @brief M-text ¤ò¥Ð¥¤¥ÈÎó¤Ë¥¨¥ó¥³¡¼¥É¤¹¤ë + @brief M-text ¤ò¥Ð¥¤¥ÈÎó¤Ë¥¨¥ó¥³¡¼¥É¤¹¤ë. ´Ø¿ô mconv_encode () ¤Ï¡¢M-text $MT ¤ò¥¨¥ó¥³¡¼¥É¤·¤Æ¡¢¥³¡¼¥É¥³¥ó¥Ð¡¼ ¥¿ $CONVERTER ¤Ë¸½ºß·ë¤ÓÉÕ¤±¤é¤ì¤Æ¤¤¤ë¥Ð¥Ã¥Õ¥¡Îΰ褢¤ë¤¤¤Ï¥¹¥È¥ê¡¼ @@ -4646,7 +4646,7 @@ mconv_encode (MConverter *converter, MText *mt) /*=*/ /***en - @brief Encode a part of an M-text + @brief Encode a part of an M-text. The mconv_encode_range () function encodes the text between $FROM (inclusive) and $TO (exclusive) in M-text $MT and writes the @@ -4659,7 +4659,7 @@ mconv_encode (MConverter *converter, MText *mt) error code to the external variable #merror_code. */ /***ja - @brief M-text ¤Î°ìÉô¤ò¤ò¥Ð¥¤¥ÈÎó¤Ë¥¨¥ó¥³¡¼¥É¤¹¤ë + @brief M-text ¤Î°ìÉô¤ò¤ò¥Ð¥¤¥ÈÎó¤Ë¥¨¥ó¥³¡¼¥É¤¹¤ë. ´Ø¿ô mconv_encode_range () ¤Ï¡¢M-text $MT ¤Î $FROM ¡Ê´Þ¤à¡Ë¤«¤é $TO ¡Ê´Þ¤Þ¤Ê¤¤¡Ë¤Þ¤Ç¤ÎÈϰϤΥƥ­¥¹¥È¤ò¥¨¥ó¥³¡¼¥É¤·¤Æ¡¢¥³¡¼¥É¥³¥ó¥Ð¡¼ @@ -4759,7 +4759,7 @@ mconv_encode_range (MConverter *converter, MText *mt, int from, int to) an error code to the external variable #merror_code. */ /***ja - @brief M-text ¤ò¥¨¥ó¥³¡¼¥É¤·¤Æ¥Ð¥Ã¥Õ¥¡Îΰè¤Ë½ñ¤­¹þ¤à + @brief M-text ¤ò¥¨¥ó¥³¡¼¥É¤·¤Æ¥Ð¥Ã¥Õ¥¡Îΰè¤Ë½ñ¤­¹þ¤à. ´Ø¿ô mconv_encode_buffer () ¤ÏM-text $MT ¤ò¥³¡¼¥É·Ï $NAME ¤Ë´ð¤Å¤¤ ¤Æ¥¨¥ó¥³¡¼¥É¤·¡¢ÆÀ¤é¤ì¤¿¥Ð¥¤¥ÈÎó¤ò $BUF ¤Î»Ø¤¹¥Ð¥Ã¥Õ¥¡Îΰè¤Ë½ñ¤­¹þ @@ -4807,7 +4807,7 @@ mconv_encode_buffer (MSymbol name, MText *mt, unsigned char *buf, int n) an error code to the external variable #merror_code. */ /***ja - @brief M-text ¤ò¥¨¥ó¥³¡¼¥É¤·¤Æ¥¹¥È¥ê¡¼¥à¤Ë½ñ¤­¹þ¤à + @brief M-text ¤ò¥¨¥ó¥³¡¼¥É¤·¤Æ¥¹¥È¥ê¡¼¥à¤Ë½ñ¤­¹þ¤à. ´Ø¿ô mconv_encode_stream () ¤ÏM-text $MT ¤ò¥³¡¼¥É·Ï $NAME ¤Ë´ð¤Å¤¤ ¤Æ¥¨¥ó¥³¡¼¥É¤·¡¢ÆÀ¤é¤ì¤¿¥Ð¥¤¥ÈÎó¤ò¥¹¥È¥ê¡¼¥à $FP ¤Ë½ñ¤­½Ð¤¹¡£¥¨¥ó @@ -4857,7 +4857,7 @@ mconv_encode_stream (MSymbol name, MText *mt, FILE *fp) #merror_code. */ /***ja - @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿·Ðͳ¤Ç1ʸ»úÆɤà + @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿·Ðͳ¤Ç1ʸ»úÆɤà. ´Ø¿ô mconv_getc () ¤Ï¡¢¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿ $CONVERTER ¤Ë¸½ºß·ë¤ÓÉÕ¤± ¤é¤ì¤Æ¤¤¤ë¥Ð¥Ã¥Õ¥¡Îΰ褢¤ë¤¤¤Ï¥¹¥È¥ê¡¼¥à¤«¤é1ʸ»ú¤òÆɤ߹þ¤à¡£¥Ð¥¤ @@ -4911,7 +4911,7 @@ mconv_getc (MConverter *converter) external variable #merror_code. */ /***ja - @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤Ë1ʸ»úÌ᤹ + @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤Ë1ʸ»úÌ᤹. ´Ø¿ô mconv_ungetc () ¤Ï¡¢¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿ $CONVERTER ¤Ëʸ»ú $C ¤ò ²¡¤·Ì᤹¡£Ì᤹ʸ»ú¿ô¤ËÀ©¸Â¤Ï¤Ê¤¤¡£¤³¤Î¸å¤Ë mconv_getc () ¤ò¸Æ¤Ó½Ð @@ -4960,7 +4960,7 @@ mconv_ungetc (MConverter *converter, int c) an error code to the external variable #merror_code. */ /***ja - @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤ò·Ðͳ¤Ç1ʸ»ú½ñ¤¯ + @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤ò·Ðͳ¤Ç1ʸ»ú½ñ¤¯. ´Ø¿ô mconv_putc () ¤Ï¡¢¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿ $CONVERTER ¤Ë¸½ºß·ë¤ÓÉÕ¤± ¤é¤ì¤Æ¤¤¤ë¥Ð¥Ã¥Õ¥¡Îΰ褢¤ë¤¤¤Ï¥¹¥È¥ê¡¼¥à¤Ëʸ»ú $C ¤ò½ñ¤­½Ð¤¹¡£Ê¸»ú @@ -5013,7 +5013,7 @@ mconv_putc (MConverter *converter, int c) merror_code. */ /***ja - @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤ò»È¤Ã¤Æ1¹ÔÆɤà + @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤ò»È¤Ã¤Æ1¹ÔÆɤà. ´Ø¿ô mconv_gets () ¤Ï¡¢¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿ $CONVERTER ¤Ë¸½ºß·ë¤ÓÉÕ¤± ¤é¤ì¤Æ¤¤¤ë¥Ð¥Ã¥Õ¥¡Îΰ褢¤ë¤¤¤Ï¥¹¥È¥ê¡¼¥à¤«¤é1¹Ô¤òÆɤ߹þ¤à¡£¥Ð¥¤¥È diff --git a/src/database.c b/src/database.c index 132adb9..4cf31c1 100644 --- a/src/database.c +++ b/src/database.c @@ -22,7 +22,7 @@ /***en @addtogroup m17nDatabase - @brief The m17n database and API for it + @brief The m17n database and API for it. The m17n library dynamically acquires various kinds of information in need from data in the m17n database. Application @@ -68,7 +68,7 @@ /***ja @addtogroup m17nDatabase - @brief m17n ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤È¤½¤ì¤Ë´Ø¤¹¤ë API + @brief m17n ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤È¤½¤ì¤Ë´Ø¤¹¤ë API. m17n ¥é¥¤¥Ö¥é¥ê¤ÏɬÍפ˱þ¤¸¤ÆưŪ¤Ë @e m17n @e ¥Ç¡¼¥¿¥Ù¡¼¥¹ ¤«¤é¾ð Êó¤ò¼èÆÀ¤¹¤ë¡£¤Þ¤¿¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é¥à¤âÆȼ«¤Î¥Ç¡¼¥¿¤ò @@ -613,7 +613,7 @@ mdatabase__fini (void) The default value is NULL. */ /***ja - @brief ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¸ÇÍ­¤Î¥Ç¡¼¥¿Íѥǥ£¥ì¥¯¥È¥ê + @brief ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¸ÇÍ­¤Î¥Ç¡¼¥¿Íѥǥ£¥ì¥¯¥È¥ê. ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é¥à¤¬¡¢¤½¤Î¥×¥í¥°¥é¥à¸ÇÍ­¤Î¥Ç¡¼¥¿¤ä m17n ¥Ç¡¼ ¥¿¥Ù¡¼¥¹¤ò¾å½ñ¤­¤¹¤ë¥Ç¡¼¥¿¤òÄ󶡤¹¤ë¾ì¹ç¤Ë¤Ï¡¢¥Þ¥¯¥í M17N_INIT () @@ -636,7 +636,7 @@ char *mdatabase_dir; NULL. */ /***ja - @brief ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òõ¤¹ + @brief ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òõ¤¹. ´Ø¿ô mdatabase_find () ¤Ï¡¢ m17n ¸À¸ì¾ðÊó¥Ù¡¼¥¹Ãæ¤Ç $TAG0 ¤«¤é $TAG3 ¤Þ¤Ç¤Î¥¿¥°¤ò»ý¤Ä¥Ç¡¼¥¿¥Ù¡¼¥¹¤òõ¤·¡¢¤½¤ì¤Ø¤Î¥Ý¥¤¥ó¥¿¤òÊÖ¤¹¡£ @@ -672,7 +672,7 @@ mdatabase_find (MSymbol tag0, MSymbol tag1, MSymbol tag2, MSymbol tag3) any tag. Each element of the plist has key #Mt and value a pointer to type #MDatabase. */ /***ja - @brief m17n ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ç¡¼¥¿¥ê¥¹¥È¤òÊÖ¤¹¡£ + @brief m17n ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ç¡¼¥¿¥ê¥¹¥È¤òÊÖ¤¹. ´Ø¿ô mdatabase_list () ¤Ï m17n ¥Ç¡¼¥¿¥Ù¡¼¥¹Ã椫¤éÆÃÄê¤Î¥¿¥°$TAG0 .. $TAG3 ¤ò»ý¤Ä¥Ç¡¼¥¿¤òõ¤·¡¢¤½¤Î¥ê¥¹¥È¤òplist ¤È¤·¤ÆÊÖ¤¹¡£ $TAGn @@ -728,7 +728,7 @@ mdatabase_list (MSymbol tag0, MSymbol tag1, MSymbol tag2, MSymbol tag3) mdatabase_load (). Otherwise, it returns @c NULL. */ /***ja - @brief m17n ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ç¡¼¥¿¤òÄêµÁ¤¹¤ë + @brief m17n ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ç¡¼¥¿¤òÄêµÁ¤¹¤ë. ´Ø¿ô mdatabase_define () ¤Ï $TAG0 ¤«¤é $TAG3 ¤Þ¤Ç¤Î¥¿¥°¤ª¤è¤ÓÉղà ¾ðÊó $EXTRA_INFO ¤ò»ý¤Ä¥Ç¡¼¥¿¤òÄêµÁ¤¹¤ë¡£ @@ -804,7 +804,7 @@ mdatabase_define (MSymbol tag0, MSymbol tag1, MSymbol tag2, MSymbol tag3, /***ja - @brief ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¥í¡¼¥É¤¹¤ë + @brief ¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¥Ç¡¼¥¿¤ò¥í¡¼¥É¤¹¤ë. ´Ø¿ô mdatabase_load () ¤Ï $MDB ¤¬»Ø¤¹¥Ç¡¼¥¿¤ò¥í¡¼¥É¤·¡¢¤½¤Î Ãæ¿È¤òÊÖ¤¹¡£ÊÖ¤µ¤ì¤ë¤â¤Î¤Ï¥Ç¡¼¥¿¤Î¥¿¥¤¥×¤Ë¤è¤Ã¤Æ°Û¤Ê¤ë¡£ @@ -850,7 +850,7 @@ mdatabase_load (MDatabase *mdb) four. */ /***oldja - @brief ¥Ç¡¼¥¿¤Î¥¿¥°¤òÆÀ¤ë + @brief ¥Ç¡¼¥¿¤Î¥¿¥°¤òÆÀ¤ë. ´Ø¿ô mdatabase_tag () ¤Ï¡¢¥Ç¡¼¥¿ $MDB ¤Î¥¿¥°¡Ê¥·¥ó¥Ü¥ë¡Ë¤ÎÇÛÎó¤òÊÖ ¤¹¡£ÇÛÎó¤ÎŤµ¤Ï 4 ¤Ç¤¢¤ë¡£ diff --git a/src/draw.c b/src/draw.c index 29da70e..e0921f8 100644 --- a/src/draw.c +++ b/src/draw.c @@ -22,7 +22,7 @@ /***en @addtogroup m17nDraw - @brief Drawing M-text on a window. + @brief Drawing M-texts on a window. The m17n GUI API provides functions to draw M-texts. @@ -36,7 +36,7 @@ /***ja @addtogroup m17nDraw - @brief M-text ¤ò¥¦¥£¥ó¥É¥¦¤ËÉÁ²è¤¹¤ë + @brief M-text ¤ò¥¦¥£¥ó¥É¥¦¤ËÉÁ²è¤¹¤ë. m17n-gui API ¤Ë¤Ï¡¢M-text ¤òɽ¼¨¤¹¤ë¤¿¤á¤Î´Ø¿ô¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë¡£ @@ -1811,7 +1811,7 @@ mdraw__fini () error is detected, it returns -1 and assigns an error code to the external variable #merror_code. */ /***ja - @brief ¥¦¥£¥ó¥É¥¦¤Ë M-text ¤òÉÁ²è¤¹¤ë + @brief ¥¦¥£¥ó¥É¥¦¤Ë M-text ¤òÉÁ²è¤¹¤ë. ´Ø¿ô mdraw_text () ¤Ï¡¢¥Õ¥ì¡¼¥à $FRAME ¤Î¥¦¥£¥ó¥É¥¦ $WIN ¤ÎºÂɸ ($X, $Y) ¤Ë¡¢M-text $MT ¤Î $FROM ¤«¤é $TO ¤Þ¤Ç¤Î¥Æ¥­¥¹¥È¤ò @@ -1900,7 +1900,7 @@ mdraw_text (MFrame *frame, MDrawWindow win, int x, int y, /***en - @brief Draw an M-text on a window as an image + @brief Draw an M-text on a window as an image. The mdraw_image_text () function draws the text between $FROM and $TO of M-text $MT as image on window $WIN of frame $FRAME at @@ -1920,7 +1920,7 @@ mdraw_text (MFrame *frame, MDrawWindow win, int x, int y, to the external variable #merror_code. */ /***ja - @brief ¥Ç¥£¥¹¥×¥ì¥¤¤ËM-text ¤ò²èÁü¤È¤·¤ÆÉÁ¤¯ + @brief ¥Ç¥£¥¹¥×¥ì¥¤¤ËM-text ¤ò²èÁü¤È¤·¤ÆÉÁ¤¯. ´Ø¿ô mdraw_image_text () ¤Ï¡¢¥Õ¥ì¡¼¥à $FRAME ¤Î¥¦¥£¥ó¥É¥¦ $WIN ¤Î ºÂɸ ($X, $Y) ¤Ë¡¢M-text $MT ¤Î $FROM ¤«¤é $TO ¤Þ¤Ç¤Î¥Æ¥­¥¹¥È¤ò²è @@ -1978,7 +1978,7 @@ mdraw_image_text (MFrame *frame, MDrawWindow win, int x, int y, more detail. */ /***ja - @brief ¥Ç¥£¥¹¥×¥ì¥¤¤ËM-text ¤òÉÁ¤¯¡Ê¾ÜºÙ¤ÊÀ©¸æ¤Ä¤­¡Ë + @brief ¥Ç¥£¥¹¥×¥ì¥¤¤ËM-text ¤òÉÁ¤¯¡Ê¾ÜºÙ¤ÊÀ©¸æ¤Ä¤­¡Ë. ´Ø¿ô mdraw_text_with_control () ¤Ï¡¢¥Õ¥ì¡¼¥à $FRAME ¤Î¥¦¥£¥ó¥É¥¦ $WIN ¤ÎºÂɸ ($X, $Y) ¤Ë¡¢M-text $MT ¤Î $FROM ¤«¤é $TO ¤Þ¤Ç¤Î¥Æ¥­¥¹ @@ -2038,7 +2038,7 @@ mdraw_text_with_control (MFrame *frame, MDrawWindow win, int x, int y, /***ja - @brief ¥Æ¥­¥¹¥È¤ÎÉý¡Ê¥Ô¥¯¥»¥ëñ°Ì¡Ë¤ò·×»»¤¹¤ë + @brief ¥Æ¥­¥¹¥È¤ÎÉý¡Ê¥Ô¥¯¥»¥ëñ°Ì¡Ë¤ò·×»»¤¹¤ë. ´Ø¿ô mdraw_text_extents () ¤Ï¡¢´Ø¿ô mdraw_text_with_control () ¤¬ ÉÁ²èÀ©¸æ¥ª¥Ö¥¸¥§¥¯¥È $CONTROL ¤òÍѤ¤¤Æ M-text $MT ¤Î $FROM ¤«¤é $TO @@ -2046,13 +2046,13 @@ mdraw_text_with_control (MFrame *frame, MDrawWindow win, int x, int y, $OVERALL_INK_RETURN ¤¬ @c NULL ¤Ç¤Ê¤±¤ì¤Ð¡¢¤³¤Î´Ø¿ô¤Ï M-text ¤Îʸ »ú¤Î¥¤¥ó¥¯¤Î¥Ð¥¦¥ó¥Ç¥£¥ó¥°¥Ü¥Ã¥¯¥¹¤â·×»»¤·¡¢$OVERALL_INK_RETURN ¤¬ - »Ø¤¹¹½Â¤ÂΤΥá¥ó¥Ð¤Ë¤½¤Î·ë²Ì¤òÀßÄꤹ¤ë¡£M-text ¤Ë surrounding box + »Ø¤¹¹½Â¤ÂΤΥá¥ó¥Ð¤Ë¤½¤Î·ë²Ì¤òÀßÄꤹ¤ë¡£M-text ¤Ë°Ï¤ßÏÈ(surrounding box) ¤ò»ØÄꤹ¤ë¥Õ¥§¡¼¥¹¤¬¤¢¤ì¤Ð¡¢¤½¤ì¤â¥Ð¥¦¥ó¥Ç¥£¥ó¥°¥Ü¥Ã¥¯¥¹¤Ë´Þ¤à¡£ $OVERALL_LOGICAL_RETURN ¤¬ @c NULL ¤Ç¤Ê¤±¤ì¤Ð¡¢¤³¤Î´Ø¿ô¤Ï M-text - ¤È¾¤Î graphical feature ¡Êsurrounding box ¤Ê¤É¡Ë¤È¤Î´Ö¤ÎºÇ¾®¤Î¥¹ - ¥Ú¡¼¥¹¤ò¼¨¤¹¥Ð¥¦¥ó¥Ç¥£¥ó¥°¥Ü¥Ã¥¯¥¹¤â·×»»¤·¡¢$OVERALL_LOGICAL_RETURN ¤¬»Ø¤¹¹½Â¤ÂÎ - ¤Î¥á¥ó¥Ð¤Ë¤½¤Î·ë²Ì¤òÀßÄꤹ¤ë¡£ + ¤È¾¤Î graphical feature ¡Ê°Ï¤ßÏȤʤɡˤȤδ֤κǾ®¤Î¥¹¥Ú¡¼¥¹¤ò¼¨ + ¤¹¥Ð¥¦¥ó¥Ç¥£¥ó¥°¥Ü¥Ã¥¯¥¹¤â·×»»¤·¡¢$OVERALL_LOGICAL_RETURN ¤¬»Ø¤¹¹½ + ¤ÂΤΥá¥ó¥Ð¤Ë¤½¤Î·ë²Ì¤òÀßÄꤹ¤ë¡£ $OVERALL_LINE_RETURN ¤¬ @c NULL ¤Ç¤Ê¤±¤ì¤Ð¡¢¤³¤Î´Ø¿ô¤Ï¾¤Î M-text ¤È¤Î´Ö¤ÎºÇ¾®¤Î¥¹¥Ú¡¼¥¹¤ò¼¨¤¹¥Ð¥¦¥ó¥Ç¥£¥ó¥°¥Ü¥Ã¥¯¥¹¤â·×»»¤·¡¢ @@ -2179,6 +2179,7 @@ mdraw_text_extents (MFrame *frame, only the metrics of characters in the first line. */ /***ja @brief M-text ¤Î³Æʸ»ú¤Îɽ¼¨ÈϰϤò·×»»¤¹¤ë. + ´Ø¿ô mdraw_text_per_char_extents () ¤Ï¡¢´Ø¿ô mdraw_text_with_control () ¤¬ÉÁ²èÀ©¸æ¥ª¥Ö¥¸¥§¥¯¥È $CONTROL ¤òÍѤ¤ ¤Æ M-text $MT ¤Î $FROM ¤«¤é $TO ¤Þ¤Ç¤ò¥Õ¥ì¡¼¥à $FRAME ¤Ëɽ¼¨¤¹¤ëºÝ @@ -2328,7 +2329,7 @@ mdraw_text_per_char_extents (MFrame *frame, last character drawn on the line $Y. */ /***ja - @brief »ØÄꤷ¤¿ºÂɸ¤ËºÇ¤â¶á¤¤Ê¸»ú¤Îʸ»ú°ÌÃÖ¤òÆÀ¤ë + @brief »ØÄꤷ¤¿ºÂɸ¤ËºÇ¤â¶á¤¤Ê¸»ú¤Îʸ»ú°ÌÃÖ¤òÆÀ¤ë. ´Ø¿ô mdraw_coordinates_position () ¤Ï¡¢´Ø¿ô mdraw_text_with_control () ¤¬ÉÁ²èÀ©¸æ¥ª¥Ö¥¸¥§¥¯¥È $CONTROL ¤òÍѤ¤ @@ -2699,7 +2700,7 @@ mdraw_default_line_break (MText *mt, int pos, the members of the structure pointed to by $OVERALL_RETURN */ /***ja - @brief M-text ¤Îʸ»úËè¤Îɽ¼¨ÈϰϾðÊó¤òÆÀ¤ë + @brief M-text ¤Îʸ»úËè¤Îɽ¼¨ÈϰϾðÊó¤òÆÀ¤ë. ´Ø¿ô mdraw_per_char_extents () ¤Ï¡¢M-text $MT Ãæ¤Î³Æʸ»ú¤Îɽ¼¨ÈÏ°Ï ¤ò·×»»¤¹¤ë¡£¤³¤Î·×»»¤ËÍѤ¤¤ë¥Õ¥©¥ó¥È¤Ï¡¢$MT ¤Î¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Ç diff --git a/src/face.c b/src/face.c index f8bfca5..2413110 100644 --- a/src/face.c +++ b/src/face.c @@ -684,7 +684,7 @@ mface__free_realized (MRealizedFace *rface) /*=*/ /***en - @brief Key of a face property specifying foreground color + @brief Key of a face property specifying foreground color. The variable #Mforeground is used as a key of face property. The property value must be a symbol whose name is a color name, or @@ -695,7 +695,7 @@ mface__free_realized (MRealizedFace *rface) color. */ /***ja - @brief Á°·Ê¿§¤ò»ØÄꤹ¤ë¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼ + @brief Á°·Ê¿§¤ò»ØÄꤹ¤ë¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼. ÊÑ¿ô #Mforeground ¤Ï¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£ ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤϡ¢¿§Ì¾¤ò̾Á°¤È¤·¤Æ»ý¤Ä¥·¥ó¥Ü¥ë¤« #Mnil ¤Ç¤¢¤ë¡£ @@ -706,7 +706,7 @@ mface__free_realized (MRealizedFace *rface) MSymbol Mforeground; /***en - @brief Key of a face property specifying background color + @brief Key of a face property specifying background color. The variable #Mbackground is used as a key of face property. The property value must be a symbol whose name is a color name, or @@ -717,7 +717,7 @@ MSymbol Mforeground; color. */ /***ja - @brief ÇØ·Ê¿§¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼ + @brief ÇØ·Ê¿§¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼. ÊÑ¿ô #Mbackground ¤Ï¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£ ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤϡ¢¿§Ì¾¤ò̾Á°¤È¤·¤Æ»ý¤Ä¥·¥ó¥Ü¥ë¤« #Mnil ¤Ç¤¢¤ë¡£ @@ -728,7 +728,7 @@ MSymbol Mforeground; MSymbol Mbackground; /***en - @brief Key of a face property specifying video mode + @brief Key of a face property specifying video mode. The variable #Mvideomode is used as a key of face property. The property value must be #Mnormal, #Mreverse, or #Mnil. @@ -744,7 +744,7 @@ MSymbol Mbackground; #Mnil means that the face does not specify a video mode. */ /***ja - @brief ¥Ó¥Ç¥ª¥â¡¼¥É¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼ + @brief ¥Ó¥Ç¥ª¥â¡¼¥É¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼. ÊÑ¿ô #Mvideomode ¤Ï¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£ ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤϡ¢#Mnormal, #Mreverse, #Mnil ¤Î¤¤¤º¤ì¤«¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ @@ -761,7 +761,7 @@ MSymbol Mbackground; MSymbol Mvideomode; /***en - @brief Key of a face property specifying font size ratio + @brief Key of a face property specifying font size ratio. The variable #Mratio is used as a key of face property. The value RATIO must be an integer. @@ -771,7 +771,7 @@ MSymbol Mvideomode; * RATIO / 100) where FONTSIZE is a font size specified by the face property #Msize. */ /***ja - @brief ¥µ¥¤¥º¤ÎÈæΨ¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼ + @brief ¥µ¥¤¥º¤ÎÈæΨ¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼. ÊÑ¿ô #Mratio ¤Ï¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£ÃÍ RATIO ¤ÏÀ°¿ôÃͤǤʤ¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ @@ -784,7 +784,7 @@ MSymbol Mvideomode; MSymbol Mratio; /***en - @brief Key of a face property specifying horizontal line + @brief Key of a face property specifying horizontal line. The variable #Mhline is used as a key of face property. The value must be a pointer to an object of type #MFaceHLineProp, or @c @@ -795,7 +795,7 @@ MSymbol Mratio; a way specified by the object that the value points to. */ /***ja - @brief ¿åÊ¿Àþ¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼ + @brief ¿åÊ¿Àþ¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼. ÊÑ¿ô #Mhline ¤Ï¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£ÃÍ¤Ï #MFaceHLineProp ·¿¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î¥Ý¥¤¥ó¥¿¤« @c NULL ¤Ç¤Ê¤¯¤Æ¤Ï¤Ê @@ -808,7 +808,7 @@ MSymbol Mratio; MSymbol Mhline; /***en - @brief Key of a face property specifying box + @brief Key of a face property specifying box. The variable #Mbox is used as a key of face property. The value must be a pointer to an object of type #MFaceBoxProp, or @c NULL. @@ -818,7 +818,7 @@ MSymbol Mhline; specified by the object that the value points to. */ /***ja - @brief °Ï¤ßÏȤò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼ + @brief °Ï¤ßÏȤò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼. ÊÑ¿ô #Mbox ¤Ï¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£ÃÍ¤Ï #MFaceBoxProp ·¿¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î¥Ý¥¤¥ó¥¿¤« @c NULL ¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é @@ -831,7 +831,7 @@ MSymbol Mhline; MSymbol Mbox; /***en - @brief Key of a face property specifying fontset + @brief Key of a face property specifying fontset. The variable #Mfontset is used as a key of face property. The value must be a pointer to an object of type #Mfontset, or @c @@ -842,7 +842,7 @@ MSymbol Mbox; specified in the fontset. */ /***ja - @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼ + @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼. ÊÑ¿ô #Mfontset ¤Ï¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£ÃÍ¤Ï #Mfontset ·¿¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î¥Ý¥¤¥ó¥¿¤« @c NULL ¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ @@ -854,7 +854,7 @@ MSymbol Mbox; MSymbol Mfontset; /***en - @brief Key of a face property specifying hook + @brief Key of a face property specifying hook. The variable #Mhook_func is used as a key of face property. The value must be a function of type #MFaceHookFunc, or @c NULL. @@ -863,7 +863,7 @@ MSymbol Mfontset; Otherwise, the specified function is called before the face is realized. */ /***ja - @brief ¥Õ¥Ã¥¯¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼ + @brief ¥Õ¥Ã¥¯¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼. ÊÑ¿ô #Mhook_func ¤Ï¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£ÃÍ¤Ï #MFaceHookFunc ·¿¤Î´Ø¿ô¤« @c NULL ¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£ @@ -873,13 +873,13 @@ MSymbol Mfontset; MSymbol Mhook_func; /***en - @brief Key of a face property specifying argument of hook + @brief Key of a face property specifying argument of hook. The variable #Mhook_arg is used as a key of face property. The value can be anything that is passed a hook function specified by the face property #Mhook_func. */ /***ja - @brief ¥Õ¥Ã¥¯¤Î°ú¿ô¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼ + @brief ¥Õ¥Ã¥¯¤Î°ú¿ô¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¡¼¤Î¥­¡¼. ÊÑ¿ô #Mhook_arg ¤Ï¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£ÃÍ¤Ï ²¿¤Ç¤â¤è¤¯¡¢¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£ #Mhook_func ¤Ç»ØÄꤵ¤ì¤ë´Ø¿ô¤ËÅϤµ @@ -911,7 +911,7 @@ MSymbol Mreverse; /*=*/ /***en - @brief Normal video face + @brief Normal video face. The variable #mface_normal_video points to a face that has the #Mvideomode property with value #Mnormal. The other properties @@ -919,7 +919,7 @@ MSymbol Mreverse; colors (i.e. the foreground is drawn by foreground color, and background is drawn by background color). */ /***en - @brief ɸ½à¥Ó¥Ç¥ª¥Õ¥§¡¼¥¹ + @brief ɸ½à¥Ó¥Ç¥ª¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_normal_video ¤Ï #Mvideomode ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬ #Mnormal ¤Ç¤¢¤ë¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£¤Ï»ØÄꤵ¤ì¤Ê¤¤¡£ @@ -929,7 +929,7 @@ MSymbol Mreverse; MFace *mface_normal_video; /***en - @brief Reverse video face + @brief Reverse video face. The variable #mface_reverse_video points to a face that has the #Mvideomode property with value #Mreverse. The other properties @@ -937,7 +937,7 @@ MFace *mface_normal_video; reversed colors (i.e. the foreground is drawn by background color, and background is drawn by foreground color). */ /***ja - @brief ¥ê¥Ð¡¼¥¹¥Ó¥Ç¥ª¥Õ¥§¡¼¥¹ + @brief ¥ê¥Ð¡¼¥¹¥Ó¥Ç¥ª¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_reverse_video ¤Ï #Mvideomode ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬ #Mreverse ¤Ç¤¢¤ë¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£¤Ï»ØÄê @@ -947,7 +947,7 @@ MFace *mface_normal_video; MFace *mface_reverse_video; /***en - @brief Underline face + @brief Underline face. The variable #mface_underline points to a face that has the #Mhline property with value a pointer to an object of type @@ -964,7 +964,7 @@ MFace *mface_reverse_video; The other properties are not specified. An M-text that has this face is drawn with an underline. */ /***ja - @brief ²¼Àþ¥Õ¥§¡¼¥¹ + @brief ²¼Àþ¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_underline ¤Ï #Mhline ¥×¥í¥Ñ¥Æ¥¤¤ÎÃͤ¬ #MFaceHLineProp ·¿¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£¥ª¥Ö @@ -984,14 +984,14 @@ MFace *mface_reverse_video; MFace *mface_underline; /***en - @brief Medium face + @brief Medium face. The variable #mface_medium points to a face that has the #Mweight property with value a symbol of name "medium". The other properties are not specified. An M-text that has this face is drawn with a font of medium weight. */ /***ja - @brief ¥ß¥Ç¥£¥¢¥à¥Õ¥§¡¼¥¹ + @brief ¥ß¥Ç¥£¥¢¥à¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_medium ¤Ï #Mweight ¥×¥í¥Ñ¥Æ¥¤¤ÎÃͤ¬ "medium" ¤È¤¤¤¦Ì¾ Á°¤ò¤â¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í @@ -1000,7 +1000,7 @@ MFace *mface_underline; MFace *mface_medium; /***en - @brief Bold face + @brief Bold face. The variable #mface_bold points to a face that has the #Mweight property with value a symbol of name "bold". The other properties @@ -1008,7 +1008,7 @@ MFace *mface_medium; font of bold weight. */ /***ja - @brief ¥Ü¡¼¥ë¥É¥Õ¥§¡¼¥¹ + @brief ¥Ü¡¼¥ë¥É¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_bold ¤Ï #Mweight ¥×¥í¥Ñ¥Æ¥¤¤ÎÃͤ¬ "bold" ¤È¤¤¤¦Ì¾Á°¤ò ¤â¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£ @@ -1019,7 +1019,7 @@ MFace *mface_medium; MFace *mface_bold; /***en - @brief Italic face + @brief Italic face. The variable #mface_italic points to a face that has the #Mstyle property with value a symbol of name "italic". The other @@ -1027,7 +1027,7 @@ MFace *mface_bold; drawn with a font of italic style. */ /***ja - @brief ¥¤¥¿¥ê¥Ã¥¯¥Õ¥§¡¼¥¹ + @brief ¥¤¥¿¥ê¥Ã¥¯¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_italic ¤Ï #Mstyle ¥×¥í¥Ñ¥Æ¥¤¤ÎÃͤ¬ "italic" ¤È¤¤¤¦Ì¾Á° ¤ò¤â¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ @@ -1038,7 +1038,7 @@ MFace *mface_bold; MFace *mface_italic; /***en - @brief Bold italic face + @brief Bold italic face. The variable #mface_bold_italic points to a face that has the #Mweight property with value a symbol of name "bold", and #Mstyle @@ -1047,7 +1047,7 @@ MFace *mface_italic; drawn with a font of bold weight and italic style. */ /***ja - @brief ¥Ü¡¼¥ë¥É¥¤¥¿¥ê¥Ã¥¯¥Õ¥§¡¼¥¹ + @brief ¥Ü¡¼¥ë¥É¥¤¥¿¥ê¥Ã¥¯¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_bold_italic ¤Ï¡¢#Mweight ¥×¥í¥Ñ¥Æ¥¤¤ÎÃͤ¬ "bold" ¤È¤¤ ¤¦Ì¾Á°¤ò¤â¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¤«¤Ä #Mstyle ¥×¥í¥Ñ¥Æ¥¤¤ÎÃͤ¬ "italic" @@ -1059,7 +1059,7 @@ MFace *mface_italic; MFace *mface_bold_italic; /***en - @brief Smallest face + @brief Smallest face. The variable #mface_xx_small points to a face that has the #Mratio property with value 50. The other properties are not specified. @@ -1067,7 +1067,7 @@ MFace *mface_bold_italic; 50% of a normal font. */ /***ja - @brief ºÇ¾®¤Î¥Õ¥§¡¼¥¹ + @brief ºÇ¾®¤Î¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_xx_small ¤Ï¡¢#Mratio ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬ 50 ¤Ç¤¢¤ë¥Õ¥§¡¼ ¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£¤Ï»ØÄꤵ¤ì¤Ê¤¤¡£¤³¤Î¥Õ¥§¡¼¥¹ @@ -1077,7 +1077,7 @@ MFace *mface_bold_italic; MFace *mface_xx_small; /***en - @brief Smaller face + @brief Smaller face. The variable #mface_x_small points to a face that has the #Mratio property with value 66. The other properties are not specified. @@ -1085,7 +1085,7 @@ MFace *mface_xx_small; 66% of a normal font. */ /***ja - @brief ¤â¤Ã¤È¾®¤µ¤¤¥Õ¥§¡¼¥¹ + @brief ¤â¤Ã¤È¾®¤µ¤¤¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_x_small ¤Ï¡¢#Mratio ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬ 66 ¤Ç¤¢¤ë¥Õ¥§¡¼ ¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£¤Ï»ØÄꤵ¤ì¤Ê¤¤¡£¤³¤Î¥Õ¥§¡¼¥¹ @@ -1095,7 +1095,7 @@ MFace *mface_xx_small; MFace *mface_x_small; /***en - @brief Small face + @brief Small face. The variable #mface_x_small points to a face that has the #Mratio property with value 75. The other properties are not specified. @@ -1103,7 +1103,7 @@ MFace *mface_x_small; 75% of a normal font. */ /***ja - @brief ¾®¤µ¤¤¥Õ¥§¡¼¥¹ + @brief ¾®¤µ¤¤¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_small ¤Ï¡¢#Mratio ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬ 75 ¤Ç¤¢¤ë¥Õ¥§¡¼¥¹¤ò »Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£¤Ï»ØÄꤵ¤ì¤Ê¤¤¡£¤³¤Î¥Õ¥§¡¼¥¹¤ò»ý @@ -1113,7 +1113,7 @@ MFace *mface_x_small; MFace *mface_small; /***en - @brief Normalsize face + @brief Normalsize face. The variable #mface_normalsize points to a face that has the #Mratio property with value 100. The other properties are not @@ -1121,7 +1121,7 @@ MFace *mface_small; whose size is the same as a normal font. */ /***ja - @brief ɸ½à¤ÎÂ礭¤µ¤Î¥Õ¥§¡¼¥¹ + @brief ɸ½à¤ÎÂ礭¤µ¤Î¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_normalsize ¤Ï¡¢#Mratio ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬ 100 ¤Ç¤¢¤ë¥Õ¥§¡¼ ¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£¤Ï»ØÄꤵ¤ì¤Ê¤¤¡£¤³¤Î¥Õ¥§¡¼¥¹ @@ -1131,7 +1131,7 @@ MFace *mface_small; MFace *mface_normalsize; /***en - @brief Large face + @brief Large face. The variable #mface_large points to a face that has the #Mratio property with value 120. The other properties are not specified. @@ -1139,7 +1139,7 @@ MFace *mface_normalsize; 120% of a normal font. */ /***ja - @brief Â礭¤¤¥Õ¥§¡¼¥¹ + @brief Â礭¤¤¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_large ¤Ï¡¢#Mratio ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬ 120 ¤Ç¤¢¤ë¥Õ¥§¡¼¥¹ ¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£¤Ï»ØÄꤵ¤ì¤Ê¤¤¡£¤³¤Î¥Õ¥§¡¼¥¹¤ò @@ -1149,7 +1149,7 @@ MFace *mface_normalsize; MFace *mface_large; /***en - @brief Larger face + @brief Larger face. The variable #mface_x_large points to a face that has the #Mratio property with value 150. The other properties are not specified. @@ -1157,7 +1157,7 @@ MFace *mface_large; 150% of a normal font. */ /***ja - @brief ¤â¤Ã¤ÈÂ礭¤¤¥Õ¥§¡¼¥¹ + @brief ¤â¤Ã¤ÈÂ礭¤¤¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_x_large ¤Ï¡¢#Mratio ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬ 150 ¤Ç¤¢¤ë¥Õ¥§¡¼ ¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£¤Ï»ØÄꤵ¤ì¤Ê¤¤¡£¤³¤Î¥Õ¥§¡¼¥¹ @@ -1167,7 +1167,7 @@ MFace *mface_large; MFace *mface_x_large; /***en - @brief Largest face + @brief Largest face. The variable #mface_xx_large points to a face that has the #Mratio property with value 200. The other properties are not specified. @@ -1175,7 +1175,7 @@ MFace *mface_x_large; 200% of a normal font. */ /***ja - @brief ºÇÂç¤Î¥Õ¥§¡¼¥¹ + @brief ºÇÂç¤Î¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_xx_large ¤Ï¡¢#Mratio ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤ¬ 200 ¤Ç¤¢¤ë¥Õ¥§¡¼ ¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ¥Æ¥£¤Ï»ØÄꤵ¤ì¤Ê¤¤¡£¤³¤Î¥Õ¥§¡¼¥¹ @@ -1185,14 +1185,15 @@ MFace *mface_x_large; MFace *mface_xx_large; /***en - @brief Black face + @brief Black face. The variable #mface_black points to a face that has the #Mforeground property with value a symbol of name "black". The other properties are not specified. An M-text that has this face is drawn with black foreground. */ -/***ja @brief ¹õ¥Õ¥§¡¼¥¹ +/***ja + @brief ¹õ¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_black ¤Ï¡¢#Mforeground ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤȤ·¤Æ "black" ¤È ¤¤¤¦Ì¾Á°¤Î¥·¥ó¥Ü¥ë¤ò»ý¤Ä¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥× @@ -1202,7 +1203,7 @@ MFace *mface_xx_large; MFace *mface_black; /***en - @brief White face + @brief White face. The variable #mface_white points to a face that has the #Mforeground property with value a symbol of name "white". The @@ -1210,7 +1211,7 @@ MFace *mface_black; is drawn with white foreground. */ /***ja - @brief Çò¥Õ¥§¡¼¥¹ + @brief Çò¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_white ¤Ï¡¢#Mforeground ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤȤ·¤Æ "white" ¤È ¤¤¤¦Ì¾Á°¤Î¥·¥ó¥Ü¥ë¤ò»ý¤Ä¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥× @@ -1220,7 +1221,7 @@ MFace *mface_black; MFace *mface_white; /***en - @brief Red face + @brief Red face. The variable #mface_red points to a face that has the #Mforeground property with value a symbol of name "red". The @@ -1228,7 +1229,7 @@ MFace *mface_white; is drawn with red foreground. */ /***ja - @brief ÀÖ¥Õ¥§¡¼¥¹ + @brief ÀÖ¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_red ¤Ï¡¢#Mforeground ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤȤ·¤Æ "red" ¤È¤¤¤¦ ̾Á°¤Î¥·¥ó¥Ü¥ë¤ò»ý¤Ä¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í¥Ñ @@ -1238,7 +1239,7 @@ MFace *mface_white; MFace *mface_red; /***en - @brief Green face + @brief Green face. The variable #mface_green points to a face that has the #Mforeground property with value a symbol of name "green". The @@ -1246,7 +1247,7 @@ MFace *mface_red; is drawn with green foreground. */ /***ja - @brief ÎÐ¥Õ¥§¡¼¥¹ + @brief ÎÐ¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_green ¤Ï¡¢#Mforeground ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤȤ·¤Æ "green" ¤È ¤¤¤¦Ì¾Á°¤Î¥·¥ó¥Ü¥ë¤ò»ý¤Ä¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥× @@ -1256,7 +1257,7 @@ MFace *mface_red; MFace *mface_green; /***en - @brief Blue face + @brief Blue face. The variable #mface_blue points to a face that has the #Mforeground property with value a symbol of name "blue". The @@ -1264,7 +1265,7 @@ MFace *mface_green; is drawn with blue foreground. */ /***ja - @brief ÀÄ¥Õ¥§¡¼¥¹ + @brief ÀÄ¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_blue ¤Ï¡¢#Mforeground ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤȤ·¤Æ "blue" ¤È¤¤ ¤¦Ì¾Á°¤Î¥·¥ó¥Ü¥ë¤ò»ý¤Ä¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í @@ -1274,7 +1275,7 @@ MFace *mface_green; MFace *mface_blue; /***en - @brief Cyan face + @brief Cyan face. The variable #mface_cyan points to a face that has the #Mforeground property with value a symbol of name "cyan". The @@ -1282,7 +1283,7 @@ MFace *mface_blue; is drawn with cyan foreground. */ /***ja - @brief ¥·¥¢¥ó¥Õ¥§¡¼¥¹ + @brief ¥·¥¢¥ó¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_cyan ¤Ï¡¢#Mforeground ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤȤ·¤Æ "cyan" ¤È¤¤ ¤¦Ì¾Á°¤Î¥·¥ó¥Ü¥ë¤ò»ý¤Ä¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î¥×¥í @@ -1292,7 +1293,7 @@ MFace *mface_blue; MFace *mface_cyan; /***en - @brief yellow face + @brief yellow face. The variable #mface_yellow points to a face that has the #Mforeground property with value a symbol of name "yellow". The @@ -1300,7 +1301,7 @@ MFace *mface_cyan; is drawn with yellow foreground. */ /***ja - @brief ²«¥Õ¥§¡¼¥¹ + @brief ²«¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_yellow ¤Ï¡¢#Mforeground ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤȤ·¤Æ "yellow" ¤È¤¤¤¦Ì¾Á°¤Î¥·¥ó¥Ü¥ë¤ò»ý¤Ä¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£Â¾¤Î @@ -1310,7 +1311,7 @@ MFace *mface_cyan; MFace *mface_yellow; /***en - @brief Magenta face + @brief Magenta face. The variable #mface_magenta points to a face that has the #Mforeground property with value a symbol of name "magenta". The @@ -1318,7 +1319,7 @@ MFace *mface_yellow; is drawn with magenta foreground. */ /***ja - @brief ¥Þ¥¼¥ó¥¿¥Õ¥§¡¼¥¹ + @brief ¥Þ¥¼¥ó¥¿¥Õ¥§¡¼¥¹. ÊÑ¿ô #mface_magenta ¤Ï¡¢#Mforeground ¥×¥í¥Ñ¥Æ¥£¤ÎÃͤȤ·¤Æ "magenta" ¤È¤¤¤¦Ì¾Á°¤Î¥·¥ó¥Ü¥ë¤ò»ý¤Ä¤è¤¦¤Ê¥Õ¥§¡¼¥¹¤ò»Ø¤¹¥Ý¥¤¥ó¥¿¤Ç @@ -1343,7 +1344,7 @@ MFace *mface_magenta; of type #MFace. This is a managing key. */ /***ja - @brief ¥Õ¥§¡¼¥¹¤ò»ØÄꤹ¤ë¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief ¥Õ¥§¡¼¥¹¤ò»ØÄꤹ¤ë¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô #Mface ¤Ï "face" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¡£¤³ ¤Î¥·¥ó¥Ü¥ë¤ò¥­¡¼¤È¤¹¤ë¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Ï¡¢#MFace ·¿¤Î¥ª¥Ö¥¸¥§¥¯ @@ -1364,7 +1365,7 @@ MSymbol Mface; This function returns a pointer to the created face. */ /***ja - @brief ¿·¤·¤¤¥Õ¥§¡¼¥¹¤ò¤Ä¤¯¤ë + @brief ¿·¤·¤¤¥Õ¥§¡¼¥¹¤ò¤Ä¤¯¤ë. ´Ø¿ô mface () ¤Ï¥×¥í¥Ñ¥Æ¥£¤ò°ìÀÚ»ý¤¿¤Ê¤¤¿·¤·¤¤¥Õ¥§¡¼¥¹¥ª¥Ö¥¸¥§¥¯¥È ¤òºî¤ë¡£ @@ -1526,7 +1527,7 @@ mface_from_font (MFont *font) #merror_code. */ /***ja - @brief ¥Õ¥§¡¼¥¹¤Î¥×¥í¥Ñ¥Æ¥£¤ÎÃͤòÆÀ¤ë + @brief ¥Õ¥§¡¼¥¹¤Î¥×¥í¥Ñ¥Æ¥£¤ÎÃͤòÆÀ¤ë. ´Ø¿ô mface_get_prop () ¤Ï¡¢¥Õ¥§¡¼¥¹ $FACE ¤¬»ý¤Ä¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£ ¤ÎÆâ¡¢¥­¡¼¤¬ $KEY ¤Ç¤¢¤ë¤â¤Î¤ÎÃͤòÊÖ¤¹¡£$KEY ¤Ï²¼µ­¤Î¤¤¤º¤ì¤«¤Ç¤Ê @@ -1583,7 +1584,7 @@ mface_get_prop (MFace *face, MSymbol key) variable #merror_code. */ /***ja - @brief ¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤ÎÃͤòÀßÄꤹ¤ë + @brief ¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤ÎÃͤòÀßÄꤹ¤ë. ´Ø¿ô mface_put_prop () ¤Ï¡¢¥Õ¥§¡¼¥¹ $FACE Æâ¤Ç¥­¡¼¤¬ $KEY ¤Ç¤¢¤ë¥× ¥í¥Ñ¥Æ¥£¤ÎÃͤò $VAL ¤ËÀßÄꤹ¤ë¡£$KEY ¤Ï°Ê²¼¤Î¤¤¤º¤ì¤«¤Ç¤Ê¤¯¤Æ¤Ï¤Ê diff --git a/src/font.c b/src/font.c index 170a516..4a19321 100644 --- a/src/font.c +++ b/src/font.c @@ -22,7 +22,7 @@ /***en @addtogroup m17nFont - @brief Font object + @brief Font object. The m17n GUI API represents a font by an object of the type @c MFont. A font can have @e font @e properties. Like other types @@ -167,7 +167,7 @@ /***ja @addtogroup m17nFont - @brief ¥Õ¥©¥ó¥È¥ª¥Ö¥¸¥§¥¯¥È + @brief ¥Õ¥©¥ó¥È¥ª¥Ö¥¸¥§¥¯¥È. m17n GUI API ¤Ï¥Õ¥©¥ó¥È¤ò @c MFont ·¿¤Î¥ª¥Ö¥¸¥§¥¯¥È¤È¤·¤Æɽ¸½¤¹¤ë¡£ ¥Õ¥©¥ó¥È¤Ï @e ¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£ ¤ò»ý¤Ä¤³¤È¤¬¤Ç¤­¤ë¡£Â¾¤Î¥¿¥¤¥×¤Î @@ -1144,13 +1144,13 @@ mfont__set_spec (MFont *font, MSymbol *attrs, /*=*/ /***en - @brief Key of font property specifying foundry + @brief Key of font property specifying foundry. The variable #Mfoundry is a symbol of name "foundry" and is used as a key of font property and face property. The property value must be a symbol whose name is a foundry name of a font. */ /***ja - @brief ³«È¯¸µ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief ³«È¯¸µ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô ¤Ï "fondry" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¥Õ¥©¥ó¥È ¥×¥í¥Ñ¥Æ¥£¤È¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£Ãͤϡ¢¥Õ¥©¥ó @@ -1160,13 +1160,13 @@ mfont__set_spec (MFont *font, MSymbol *attrs, MSymbol Mfoundry; /***en - @brief Key of font property specifying family + @brief Key of font property specifying family. The variable #Mfamily is a symbol of name "family" and is used as a key of font property and face property. The property value must be a symbol whose name is a family name of a font. */ /***ja - @brief ¥Õ¥¡¥ß¥ê¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief ¥Õ¥¡¥ß¥ê¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô ¤Ï "family" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¥Õ¥©¥ó¥È ¥×¥í¥Ñ¥Æ¥£¤È¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£Ãͤϡ¢¥Õ¥©¥ó @@ -1176,14 +1176,14 @@ MSymbol Mfoundry; MSymbol Mfamily; /***en - @brief Key of font property specifying weight + @brief Key of font property specifying weight. The variable #Mweight is a symbol of name "weight" and is used as a key of font property and face property. The property value must be a symbol whose name is a weight name of a font (e.g "medium", "bold"). */ /***ja - @brief weight ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief weight ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô ¤Ï "weight" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¥Õ¥©¥ó¥È ¥×¥í¥Ñ¥Æ¥£¤È¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£Ãͤϡ¢¥Õ¥©¥ó @@ -1194,14 +1194,14 @@ MSymbol Mfamily; MSymbol Mweight; /***en - @brief Key of font property specifying style + @brief Key of font property specifying style. The variable #Mstyle is a symbol of name "style" and is used as a key of font property and face property. The property value must be a symbol whose name is a style name of a font (e.g "r", "i", "o"). */ /***ja - @brief ¥¹¥¿¥¤¥ë¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief ¥¹¥¿¥¤¥ë¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô ¤Ï "style" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¥Õ¥©¥ó¥È ¥×¥í¥Ñ¥Æ¥£¤È¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£Ãͤϡ¢¥Õ¥©¥ó @@ -1212,14 +1212,14 @@ MSymbol Mweight; MSymbol Mstyle; /***en - @brief Key of font property specifying stretch + @brief Key of font property specifying stretch. The variable #Mstretch is a symbol of name "stretch" and is used as a key of font property and face property. The property value must be a symbol whose name is a stretch name of a font (e.g "normal", "condensed"). */ /***ja - @brief stretch ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief stretch ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô ¤Ï "stretch" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¥Õ¥©¥ó ¥È¥×¥í¥Ñ¥Æ¥£¤È¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£Ãͤϡ¢¥Õ¥© @@ -1230,14 +1230,14 @@ MSymbol Mstyle; MSymbol Mstretch; /***en - @brief Key of font property specifying additional style + @brief Key of font property specifying additional style. The variable #Madstyle is a symbol of name "adstyle" and is used as a key of font property and face property. The property value must be a symbol whose name is an additional style name of a font (e.g "serif", "", "sans"). */ /***ja - @brief adstyle ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief adstyle ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô ¤Ï "adstyle" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¥Õ¥©¥ó ¥È¥×¥í¥Ñ¥Æ¥£¤È¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£Ãͤϡ¢¥Õ¥© @@ -1248,14 +1248,14 @@ MSymbol Mstretch; MSymbol Madstyle; /***en - @brief Key of font property specifying registry + @brief Key of font property specifying registry. The variable #Mregistry is a symbol of name "registry" and is used as a key of font property. The property value must be a symbol whose name is a registry name a font registry (e.g. "iso8859-1", "jisx0208.1983-0"). */ /***ja - @brief ¥ì¥¸¥¹¥È¥ê¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief ¥ì¥¸¥¹¥È¥ê¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô ¤Ï "registry" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¥Õ¥©¥ó ¥È¥×¥í¥Ñ¥Æ¥£¤È¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£Ãͤϡ¢¥Õ¥© @@ -1266,14 +1266,14 @@ MSymbol Madstyle; MSymbol Mregistry; /***en - @brief Key of font property specifying size + @brief Key of font property specifying size. The variable #Msize is a symbol of name "size" and is used as a key of font property and face property. The property value must be an integer specifying a font design size in the unit of 1/10 point (on 100 dpi display). */ /***ja - @brief ¥µ¥¤¥º¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief ¥µ¥¤¥º¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô ¤Ï "size" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¥Õ¥©¥ó¥È¥× ¥í¥Ñ¥Æ¥£¤È¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£Ãͤϡ¢100 dpi @@ -1284,14 +1284,14 @@ MSymbol Mregistry; MSymbol Msize; /***en - @brief Key of font property specifying resolution + @brief Key of font property specifying resolution. The variable #Mresolution is a symbol of name "resolution" and is used as a key of font property and face property. The property value must be an integer to specifying a font resolution in the unit of dots per inch (dpi). */ /***ja - @brief ²òÁüÅÙ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼ + @brief ²òÁüÅÙ¤ò»ØÄꤹ¤ë¥Õ¥©¥ó¥È¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼. ÊÑ¿ô ¤Ï "resolution" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥·¥ó¥Ü¥ë¤Ç¤¢¤ê¡¢¥Õ¥© ¥ó¥È¥×¥í¥Ñ¥Æ¥£¤È¥Õ¥§¡¼¥¹¥×¥í¥Ñ¥Æ¥£¤Î¥­¡¼¤È¤·¤ÆÍѤ¤¤é¤ì¤ë¡£Ãͤϡ¢¥Õ¥© @@ -1305,7 +1305,7 @@ MSymbol Mresolution; /*=*/ /***en - @brief List of font files and directories that contain font files + @brief List of font files and directories that contain font files. The variable @c mfont_freetype_path is a plist of FreeType font files and directories that contain FreeType font files. Key of @@ -1323,7 +1323,7 @@ MSymbol Mresolution; If the m17n library is not configured to use the FreeType library, this variable is not used. */ /***ja - @brief ¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë¤È¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È + @brief ¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë¤È¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È. ÊÑ¿ô @c mfont_freetype_path ¤Ï¡¢¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë¤È¥Õ¥©¥ó¥È¥Õ¥¡¥¤¥ë ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤Î plist ¤Ç¤¢¤ë¡£³ÆÍ×ÁǤΥ­¡¼¤Ï @c Mstring ¤Ç¤¢ @@ -1345,7 +1345,7 @@ MPlist *mfont_freetype_path; /*=*/ /***en - @brief Create a new font + @brief Create a new font. The mfont () function creates a new font object that has no property. @@ -1386,7 +1386,7 @@ mfont () to the created font. Otherwise it returns @c NULL. */ /***ja - @brief ¥Õ¥©¥ó¥È̾¤«¤é¥Õ¥©¥ó¥È¤òºî¤ë + @brief ¥Õ¥©¥ó¥È̾¤«¤é¥Õ¥©¥ó¥È¤òºî¤ë. ´Ø¿ô mfont_from_name () ¤Ï¡¢¥Õ¥©¥ó¥È̾ $NAME ¤«¤é¼è¤ê½Ð¤µ¤ì¤¿¥×¥í¥Ñ ¥Æ¥£¤ò»ý¤Ä¡¢¿·¤·¤¤¥Õ¥©¥ó¥È¥ª¥Ö¥¸¥§¥¯¥È¤òºî¤ë¡£ @@ -1853,7 +1853,7 @@ mfont_set_encoding (MFont *font, MSymbol encoding_name, MSymbol repertory_name) /*** @{ */ /***en - @brief Dump a font + @brief Dump a font. The mdebug_dump_font () function prints font $FONT in a human readable way to the stderr. diff --git a/src/fontset.c b/src/fontset.c index 42d1f69..4f7e672 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -28,21 +28,29 @@ M-text, a fontset provides rules to select a font for each character in the M-text according to the following information. - - The script character property of a character. - - The language text property of a character. - - The charset text property of a character. + @li The script character property of a character. + @li The language text property of a character. + @li The charset text property of a character. The documentation of mdraw_text () describes how that information is used. */ -/***oldja - @addtogroup m17nFontset - @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤Ï°ìÄê¤Î¥¹¥¿¥¤¥ë¤ò¶¦Í­¤¹¤ë¥Õ¥©¥ó¥È¤Î½¸¹ç¤Ç¤¢¤ë +/***ja @addtogroup m17nFontset + + @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤Ïʸ»ú¤«¤é¥Õ¥©¥ó¥È¤Ø¤ÎÂбþÉÕ¤±¤ò¹Ô¤¦¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ë. + + @e ¥Õ¥©¥ó¥È¥»¥Ã¥È ¤Ï @c MFontset ·¿¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ë¡£M-text ¤ò + ɽ¼¨¤¹¤ëºÝ¡¢¥Õ¥©¥ó¥È¥»¥Ã¥È¤Ï M-text Ãæ¤Î¸Ä¡¹¤Îʸ»ú¤ËÂФ·¤Æ¤É¤Î¥Õ¥© + ¥ó¥È¤òÍѤ¤¤ë¤«¤Îµ¬Â§¤ò¡¢°Ê²¼¤Î¾ðÊó¤Ë½¾¤Ã¤ÆÍ¿¤¨¤ë¡£ - @e ¥Õ¥©¥ó¥È¥»¥Ã¥È ¤Ï @c MFontset ·¿¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ê¡¢Â¿¸À¸ìʸ - ½ñ¤Îɽ¼¨¤ÎºÝ¡¢¸«¤«¤±¤Î»÷¤¿¥Õ¥©¥ó¥È¤ò½¸¤á¤Æ°ì´Ó¤·¤Æ¼è¤ê°·¤¦¤¿¤á¤Ë»È - ¤ï¤ì¤ë¡£¥Õ¥©¥ó¥È¥»¥Ã¥È¤Ï¤Þ¤¿¡¢¸À¸ì¡¢Ê¸»ú¥»¥Ã¥È¡¢Ê¸»ú¤¬Í¿¤¨¤é¤ì¤¿¤È - ¤­¤ËŬÀڤʥե©¥ó¥È¤òÁªÂò¤¹¤ë¤¿¤á¤Î¾ðÊó¤âÊÝ»ý¤·¤Æ¤¤¤ë¡£ */ + @li ʸ»ú¤Îʸ»ú¥×¥í¥Ñ¥Æ¥£ "¥¹¥¯¥ê¥×¥È" + @li ʸ»ú¤Î¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£ "¸À¸ì" + @li ʸ»ú¤Î¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£ "ʸ»ú¥»¥Ã¥È" + + ¤³¤ì¤é¤Î¾ðÊ󤬤ɤΤ褦¤ËÍѤ¤¤é¤ì¤ë¤«¤Ï mdraw_text () ¤ÎÀâÌÀ¤ò»²¾È + ¤Î¤³¤È¡£ + + */ /*=*/ @@ -605,6 +613,25 @@ mfont__lookup_fontset (MRealizedFontset *realized, MGlyph *g, int *num, @return This function returns a pointer to the found or newly created fontset. */ +/***ja + @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤òÊÖ¤¹. + + ´Ø¿ô mfontset ¤Ï̾Á°$ NAME ¤ò»ý¤Ä¥Õ¥©¥ó¥È¥»¥Ã¥È¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î¥Ý¥¤ + ¥ó¥¿¤òÊÖ¤¹¡£ $NAME ¤¬ @c NULL ¤Ê¤é¤Ð¡¢¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¥»¥Ã¥È¤Ø¤Î + ¥Ý¥¤¥ó¥¿¤òÊÖ¤¹¡£ + + $NAME ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥Õ¥©¥ó¥È¥»¥Ã¥È¤¬¤Ê¤±¤ì¤Ð¡¢¿·¤·¤¤¤â¤Î¤¬ºî¤é¤ì + ¤ë¡£¤½¤ÎºÝ¡¢m17n ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë \<@c fontset, $NAME\> ¤È¤¤¤¦¥Ç¡¼¥¿ + ¤¬¤¢¤ì¤Ð¡¢¥Õ¥©¥ó¥È¥»¥Ã¥È¤Ï¤½¤Î¥Ç¡¼¥¿¤Ë±è¤Ã¤Æ½é´ü²½¤µ¤ì¤ë¡£¤Ê¤±¤ì¤Ð¡¢ + ¶õ¤Î¤Þ¤Þ¤Ë¤µ¤ì¤ë¡£ + + ¥Þ¥¯¥í M17N_INIT () ¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥©¥ó¥È¥»¥Ã¥È¤òºî¤ë¡£¥¢¥×¥ê¥±¡¼ + ¥·¥ç¥ó¥×¥í¥°¥é¥à¤Ï mframe () ¤ò½é¤á¤Æ¸Æ¤Ö¤Þ¤Ç¤Ï¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È + ¥»¥Ã¥È¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£ + + @return + ¤³¤Î´Ø¿ô¤Ï¸«¤Ä¤«¤Ã¤¿¡¢¤¢¤ë¤¤¤Ïºî¤Ã¤¿¥Õ¥©¥ó¥È¥»¥Ã¥È¤Ø¤Î¥Ý¥¤¥ó¥¿¤òÊÖ¤¹¡£ + */ MFontset * mfontset (char *name) @@ -635,9 +662,13 @@ mfontset (char *name) /*=*/ /***en - @brief Return the name of a fontset + @brief Return the name of a fontset. + + The mfontset_name () function returns the name of fontset$FONTSET. */ +/***ja + @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤Î̾Á°¤òÊÖ¤¹. - The mfontset_name () function returns the name of $FONTSET. */ + ´Ø¿ô mfontset_name () ¤Ï¥Õ¥©¥ó¥È¥»¥Ã¥È $FONTSET ¤Î̾Á°¤òÊÖ¤¹¡£ */ MSymbol mfontset_name (MFontset *fontset) { @@ -647,12 +678,19 @@ mfontset_name (MFontset *fontset) /*=*/ /***en - @brief Make a copy a fontset + @brief Make a copy a fontset. - The mfontset_copy () function makes a copy of $FONTSET, gives it a + The mfontset_copy () function makes a copy of fontset $FONTSET, gives it a name $NAME, and returns a pointer to the created copy. $NAME must - not be a name of existing fontset. Otherwise, this function + not be a name of existing fontset. In such case, this function returns NULL without making a copy. */ +/***ja + @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤Î¥³¥Ô¡¼¤òºî¤ë. + + ´Ø¿ô mfontset_copy () ¤Ï¥Õ¥©¥ó¥È¥»¥Ã¥È $FONTSET ¤Î¥³¥Ô¡¼¤òºî¤Ã¤Æ¡¢ + ̾Á° $NAME ¤òÍ¿¤¨¡¢¤½¤Î¥³¥Ô¡¼¤Ø¤Î¥Ý¥¤¥ó¥¿¤òÊÖ¤¹¡£$NAME ¤Ï´û¸¤Î + ¥Õ¥©¥ó¥È¥»¥Ã¥È¤Î̾Á°¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£¤½¤Î¾ì¹ç¤Ë¤Ï¥³¥Ô¡¼¤òºî¤é¤º + NULL ¤òÊÖ¤¹¡£ */ MFontset * mfontset_copy (MFontset *fontset, char *name) @@ -719,12 +757,11 @@ mfontset_copy (MFontset *fontset, char *name) charset. If both $SCRIPT and $CHARSET are not @c Mnil, two copies of $FONT - are created. Then one is associated with the script/language pair - and the other with the charset. + are created. Then one is associated with the $SCRIPT / $LANGUAGE + pair and the other with that charset. - If both $SCRIPT and $CHARSET are @c Mnil, $FONT is associated - with @c Mnil. This kind of fonts are called fallback - fonts. + If both $SCRIPT and $CHARSET are @c Mnil, $FONT is associated with + @c Mnil. This kind of fonts are called @e fallback @e fonts. The argument $HOW specifies the priority of $FONT. If $HOW is positive, $FONT has the highest priority in the group of fonts @@ -743,21 +780,44 @@ mfontset_copy (MFontset *fontset, char *name) Otherwise it returns -1 and assigns an error code to the external variable @c merror_code. */ -/***oldja - @brief ¸À¸ì¤È¥¹¥¯¥ê¥×¥È¤ÎÁȤ߹ç¤ï¤»¤Ë¥Õ¥©¥ó¥È¤ò´ØÏ¢ÉÕ¤±¤ë +/***ja + @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤ÎÆâÍƤòÊѹ¹¤¹¤ë. - ´Ø¿ô mfontset_set_language_script () ¤Ï¡¢$LANGUAGE ¤È $SCRIPT ¤ÎÁÈ - ¤ß¹ç¤ï¤»¤ËÂФ·¤Æ¥Õ¥©¥ó¥È $FONT ¤ò»È¤¦¤è¤¦¡¢¥Õ¥©¥ó¥È¥»¥Ã¥È $FONTSET - ¤òÀßÄꤹ¤ë¡£$LANGUAGE ¤È $SCRIPT ¤Ï¡¢¤½¤ì¤¾¤ì¸À¸ì¤È¥¹¥¯¥ê¥×¥È¤ò»Ø - Äꤹ¤ë¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¡£ + ´Ø¿ô The mfontset_modify_entry () ¤Ï¡¢$LANGUAGE ¤È $SCRIPT ¤ÎÁÈ¤ß + ¹ç¤ï¤»¤Þ¤¿¤Ï $CHARSET ¤ËÂФ·¤Æ $FONT ¤Î¥³¥Ô¡¼¤ò»È¤¦¤è¤¦¤Ë¡¢¥Õ¥©¥ó + ¥È¥»¥Ã¥È $FONTSET ¤òÀßÄꤹ¤ë¡£ - ¸À¸ì¤È¥¹¥¯¥ê¥×¥È¤ÎÁȤ߹ç¤ï¤»°ì¤Ä¤ËÂФ·¤ÆÊ£¿ô¤Î¥Õ¥©¥ó¥È¤òÀßÄꤹ¤ë¤³ - ¤È¤â¤Ç¤­¤ë¡£$PREPEND_P ¤¬ 0 °Ê³°¤Ê¤é¤Ð¡¢$FONT ¤Ï¤½¤ÎÁȤ߹ç¤ï¤»¤ËÂÐ - ¤·¤ÆºÇÍ¥Àè¤ÇÍѤ¤¤é¤ì¤ë¤â¤Î¤È¤Ê¤ë¡£¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢Í¥ÀèÅÙºÇÄã¤Î¥Õ¥© - ¥ó¥È¤È¤·¤ÆÅÐÏ¿¤µ¤ì¤ë¡£ + ¥Õ¥©¥ó¥È¥»¥Ã¥È¤Î³Æ¥Õ¥©¥ó¥È¤Ï¡¢ÆÃÄê¤Î¥¹¥¯¥ê¥×¥È¤È¸À¸ì¤Î¥Ú¥¢¡¢ÆÃÄê¤Î + ʸ»ú¥»¥Ã¥È¡¢¥·¥ó¥Ü¥ë @c Mnil ¤Î¤¤¤º¤ì¤«¤È´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¡£Æ±¤¸ + ¤â¤Î¤È´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥Õ¥©¥ó¥È¤Ï¥°¥ë¡¼¥×¤ò¹½À®¤¹¤ë¡£ - @return - ½èÍý¤¬À®¸ù¤·¤¿¤È¤­¡¢mfontset_set_language_script () ¤Ï 0 ¤òÊÖ¤¹¡£ + $SCRIPT ¤Ï @c Mnil ¤Ç¤¢¤ë¤«¡¢¥¹¥¯¥ê¥×¥È¤òÆÃÄꤹ¤ë¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¡£ + ¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢$LANGUAGE ¤Ï¸À¸ì¤òÆÃÄꤹ¤ë¥·¥ó¥Ü¥ë¤«@c + Mnil ¤Ç¤¢¤ê¡¢$FONT ¤Ïthe $SCRIPT / $LANGUAGE ¥Ú¥¢¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤ë¡£ + + $CHARSET ¤Ï @c Mnil ¤Ç¤¢¤ë¤«¡¢Ê¸»ú¥»¥Ã¥È¥ª¥Ö¥¸¥§¥¯¥È¤òɽ¤¹¥·¥ó¥Ü¥ë + ¤Ç¤¢¤ë¡£¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¾ì¹ç¤Ë¤Ï$FONT ¤Ï¤½¤Îʸ»ú¥»¥Ã¥È¤È´ØÏ¢ÉÕ¤±¤é¤ì + ¤ë¡£ + + $SCRIPT ¤È $CHARSET ¤ÎÁÐÊý¤¬ @c Mnil ¤Ç¤Ê¤¤¾ì¹ç¤Ë¤Ï $FONT ¤Î¥³¥Ô¡¼ + ¤¬£²¤Äºî¤é¤ì¡¢¤½¤ì¤¾¤ì $SCRIPT / $LANGUAGE ¥Ú¥¢¤Èʸ»ú¥»¥Ã¥È¤Ë´ØÏ¢ + ÉÕ¤±¤é¤ì¤ë¡£ + + $SCRIPT ¤È $CHARSET ¤ÎÁÐÊý¤¬ @c Mnil ¤Ê¤é¤Ð¡¢ $FONT ¤Ï@c Mnil ¤È´Ø + Ï¢ÉÕ¤±¤é¤ì¤ë¡£¤³¤Î¼ï¤Î¥Õ¥©¥ó¥È¤Ï @e fallback @e font ¤È¸Æ¤Ð¤ì¤ë¡£ + + °ú¿ô $HOW ¤Ï $FONT ¤ÎÍ¥ÀèÅÙ¤ò»ØÄꤹ¤ë¡£$HOW ¤¬Àµ¤Ê¤é¤Ð¡¢$FONT ¤ÏƱ + ¤¸¤â¤Î¤È´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥°¥ë¡¼¥×Ãæ¤ÇºÇ¹â¤ÎÍ¥ÀèÅÙ¤ò»ý¤Ä¡£$HOW ¤¬Éé¤Ê + ¤é¤Ð¡¢ºÇÄã¤ÎÍ¥ÀèÅÙ¤ò»ý¤Ä¡£$HOW ¤¬ 0 ¤Ê¤é¤Ð¡¢$FONT ¤Ï´ØÏ¢ÉÕ¤±¤é¤ì¤¿ + ¤â¤Î¤ËÂФ¹¤ëÍ£°ì¤ÎÍøÍѲÄǽ¤Ê¥Õ¥©¥ó¥È¤È¤Ê¤ê¡¢Â¾¤Î¥Õ¥©¥ó¥È¤Ï¥°¥ë¡¼¥× + ¤«¤é¼è¤ê½ü¤«¤ì¤ë¡£ + + $LAYOUTER_NAME ¤Ï @c Mnil ¤Ç¤¢¤ë¤«¡¢@ref flt ¤ò¼¨¤¹¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¡£ + ¥·¥ó¥Ü¥ë¤Ç¤¢¤ì¤Ð¡¢$FONT ¤òÍѤ¤¤ÆM-text ¤òɽ¼¨¤¹¤ëºÝ¤Ë¤Ï¡¢¤½¤Î font + layout table ¤ò»È¤Ã¤Æʸ»úÎ󤫤饰¥ê¥Õ¥³¡¼¥ÉÎó¤òÀ¸À®¤¹¤ë¡£ + + @return + ½èÍý¤¬À®¸ù¤·¤¿¤È¤­¡¢mfontset_modify_entry () ¤Ï 0 ¤òÊÖ¤¹¡£ ¼ºÇÔ¤·¤¿¤È¤­¤Ï -1 ¤òÊÖ¤·¡¢³°ÉôÊÑ¿ô @c merror_code ¤Ë¥¨¥é¡¼¥³¡¼¥É¤ò ÀßÄꤹ¤ë¡£ */ @@ -843,14 +903,23 @@ mfontset_modify_entry (MFontset *fontset, /*** @{ */ /***en - @brief Dump a fontset + @brief Dump a fontset. - The mdebug_dump_fontset () function prints $FONTSET in a human readable + The mdebug_dump_fontset () function prints fontset $FONTSET in a human readable way to the stderr. $INDENT specifies how many columns to indent the lines but the first one. @return This function returns $FONTSET. */ +/***ja + @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤ò¥À¥ó¥×¤¹¤ë. + + ´Ø¿ô mdebug_dump_face () ¤Ï¥Õ¥©¥ó¥È¥»¥Ã¥È $FONTSET ¤ò stderr ¤Ë¿Í + ´Ö¤Ë²ÄÆɤʷÁ¤Ç°õºþ¤¹¤ë¡£ $INDENT ¤Ï£²¹ÔÌܰʹߤΥ¤¥ó¥Ç¥ó¥È¤ò»ØÄꤹ + ¤ë¡£ + + @return + ¤³¤Î´Ø¿ô¤Ï $FONTSET ¤òÊÖ¤¹¡£ */ MFontset * mdebug_dump_fontset (MFontset *fontset, int indent) diff --git a/src/input-gui.c b/src/input-gui.c index dc32bfd..c9ebb84 100644 --- a/src/input-gui.c +++ b/src/input-gui.c @@ -37,7 +37,7 @@ /***ja @addtogroup m17nInputMethodWin - @brief ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¾å¤ÎÆþÎϥ᥽¥Ã¥É¤Î¥µ¥Ý¡¼¥È + @brief ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¾å¤ÎÆþÎϥ᥽¥Ã¥É¤Î¥µ¥Ý¡¼¥È. ÆþÎϥɥ饤¥Ð @c minput_gui_driver ¤Ï¡¢¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¾å¤ÇÍѤ¤¤é ¤ì¤ëÆâÉôÆþÎϥ᥽¥Ã¥ÉÍѤǤ¢¤ë¡£¤³¤Î¥É¥é¥¤¥Ð¤ÏÆþÎÏ¥¹¥Ý¥Ã¥È¤Ë preedit @@ -656,7 +656,7 @@ MInputDriver minput_gui_driver; At last, a symbol who has the name is returned. */ /***ja - @brief ¥¤¥Ù¥ó¥È¤òÆþÎÏ¥­¡¼¤ËÊÑ´¹¤¹¤ë + @brief ¥¤¥Ù¥ó¥È¤òÆþÎÏ¥­¡¼¤ËÊÑ´¹¤¹¤ë. ´Ø¿ô minput_name_to_key () ¤Ï¡¢$FRAME ¤Î¥¤¥Ù¥ó¥È $EVENT ¤ËÂбþ¤¹¤ë ÆþÎÏ¥­¡¼¤òÊÖ¤¹¡£¤³¤³¤Ç¤Î¡ÖÂбþ¡×¤Ï¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à°Í¸¤Ç¤¢¤ë¡£ diff --git a/src/input.c b/src/input.c index a3ef38e..d126f28 100644 --- a/src/input.c +++ b/src/input.c @@ -22,7 +22,7 @@ /***en @addtogroup m17nInputMethod - @brief API for Input method + @brief API for Input method. An input method is an object to enable inputting various characters. An input method is identified by a pair of symbols, @@ -80,7 +80,7 @@ /*=*/ /***ja @addtogroup m17nInputMethod - @brief ÆþÎϥ᥽¥Ã¥ÉÍÑAPI + @brief ÆþÎϥ᥽¥Ã¥ÉÍÑAPI. ÆþÎϥ᥽¥Ã¥É¤Ï¿ÍͤÊʸ»ú¤òÆþÎϤ¹¤ë¤¿¤á¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¢¤ë¡£ÆþÎÏ¥á ¥½¥Ã¥É¤Ï¥·¥ó¥Ü¥ë LANGUAGE ¤È NAME ¤ÎÁȤˤè¤Ã¤Æ¼±Ê̤µ¤ì¡¢¤³¤ÎÁȤˤè¤Ã diff --git a/src/locale.c b/src/locale.c index 1a1d253..6ec43e2 100644 --- a/src/locale.c +++ b/src/locale.c @@ -22,14 +22,14 @@ /***en @addtogroup m17nLocale - @brief Locale objects and API for them + @brief Locale objects and API for them. The m17n library represents locale related information as objects of type #MLocale. */ /***ja @addtogroup m17nLocale - @brief ¥í¥±¡¼¥ë¥ª¥Ö¥¸¥§¥¯¥È¤È¤½¤ì¤Ë´Ø¤¹¤ë API + @brief ¥í¥±¡¼¥ë¥ª¥Ö¥¸¥§¥¯¥È¤È¤½¤ì¤Ë´Ø¤¹¤ë API. m17n ¥é¥¤¥Ö¥é¥ê¤Ï¥í¥±¡¼¥ë´ØÏ¢¾ðÊó¤ò #MLocale ·¿¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ç ɽ¸½¤¹¤ë¡£ */ @@ -432,7 +432,7 @@ mlocale_set (int category, const char *name) #Mterritory, #Mcodeset, #Mmodifier, or #Mcoding. */ /***ja - @brief ¥í¥±¡¼¥ë¥×¥í¥Ñ¥Æ¥£¤ÎÃͤòÆÀ¤ë + @brief ¥í¥±¡¼¥ë¥×¥í¥Ñ¥Æ¥£¤ÎÃͤòÆÀ¤ë. ´Ø¿ô mlocale_get_prop () ¤Ï¡¢¥í¥±¡¼¥ë $LOCALE ¤Î $KEY ¥×¥í¥Ñ¥Æ¥£¤Î ÃͤòÊÖ¤¹¡£ $KEY ¤Ï #Mname, #Mlanguage, #Mterritory, #Mcodeset, diff --git a/src/m17n-X.c b/src/m17n-X.c index fa1b348..966e102 100644 --- a/src/m17n-X.c +++ b/src/m17n-X.c @@ -2169,7 +2169,7 @@ MSymbol Mdisplay, Mscreen, Mdrawable, Mdepth, Mwidget, Mcolormap; $KEY is ignored. */ /***ja - @brief XIMÍÑÆþÎϥɥ饤¥Ð + @brief XIMÍÑÆþÎϥɥ饤¥Ð. ¥É¥é¥¤¥Ð #minput_xim_driver ¤Ï #Mxim ¤ò̾Á°¤È¤·¤Æ»ý¤Ä³°ÉôÆþÎϥ᥽¥Ã ¥ÉÍѤǤ¢¤ê¡¢ XIM (X Input Methods) ¤ò¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤ÎÆþÎÏ¥¨¥ó¥¸ diff --git a/src/m17n-X.h b/src/m17n-X.h index ed0b133..b2d4167 100644 --- a/src/m17n-X.h +++ b/src/m17n-X.h @@ -48,7 +48,7 @@ extern MSymbol Mxim; /*** @ingroup m17nInputMethodWin */ /***en - @brief Structure pointed to by the argument $ARG of the function + @brief Structure pointed to by the argument $ARG of the function. input_open_im (). The type #MInputXIMArgIM is the structure pointed to by the @@ -56,7 +56,7 @@ extern MSymbol Mxim; input method of name #Mxim. */ /***ja - @brief ´Ø¿ô minput_open_im () ¤Î°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂÎ + @brief ´Ø¿ô minput_open_im () ¤Î°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂÎ. #MInputXIMArgIM ·¿¤Ï¡¢´Ø¿ô minput_open_im () ¤¬Ì¾Á° #Mxim ¤ò»ý ¤Ä³°ÉôÆþÎϥ᥽¥Ã¥É¤òÀ¸À®¤¹¤ëºÝ¤Ë°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂÎ¤Ç @@ -97,7 +97,7 @@ typedef struct /*** @ingroup m17nInputMethodWin */ /***en - @brief Structure pointed to by the argument $ARG of the function + @brief Structure pointed to by the argument $ARG of the function. minput_create_ic. The type #MInputXIMArgIC is the structure pointed to by the @@ -105,7 +105,7 @@ typedef struct input method of name #Mxim. */ /***ja - @brief ´Ø¿ô minput_create_ic () ¤Î°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂÎ + @brief ´Ø¿ô minput_create_ic () ¤Î°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½Â¤ÂÎ. #MInputXIMArgIC ·¿¤Ï¡¢´Ø¿ô minput_create_ic () ¤¬Ì¾Á° #Mxim ¤ò »ý¤Ä³°ÉôÆþÎϥ᥽¥Ã¥ÉÍѤ˸ƤФì¤ëºÝ¤Ë¡¢°ú¿ô $ARG ¤Ë¤è¤Ã¤Æ»Ø¤µ¤ì¤ë¹½ diff --git a/src/m17n-core.c b/src/m17n-core.c index c66814d..c3e52d1 100644 --- a/src/m17n-core.c +++ b/src/m17n-core.c @@ -22,7 +22,7 @@ /***en @addtogroup m17nIntro - @brief Introduction to the m17n library + @brief Introduction to the m17n library. API LEVELS @@ -121,7 +121,7 @@ /***ja @addtogroup m17nIntro - @brief m17n ¥é¥¤¥Ö¥é¥ê ¥¤¥ó¥È¥í¥À¥¯¥·¥ç¥ó + @brief m17n ¥é¥¤¥Ö¥é¥ê ¥¤¥ó¥È¥í¥À¥¯¥·¥ç¥ó. @em API¤Î¥ì¥Ù¥ë @@ -761,7 +761,7 @@ m17n_object_unref (void *object) /***ja @addtogroup m17nError ¥¨¥é¡¼½èÍý - @brief m17n ¥é¥¤¥Ö¥é¥ê¤Î¥¨¥é¡¼½èÍý + @brief m17n ¥é¥¤¥Ö¥é¥ê¤Î¥¨¥é¡¼½èÍý. m17n ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô¤Ç¤Ï¡¢£²¤Ä¤Î¼ïÎà¤Î¥¨¥é¡¼¤¬µ¯¤³¤êÆÀ¤ë¡£ @@ -780,7 +780,8 @@ m17n_object_unref (void *object) /*=*/ -/***en @brief External variable to hold error code of the m17n library +/***en + @brief External variable to hold error code of the m17n library. The external variable #merror_code holds an error code of the m17n library. When a library function is called with an invalid @@ -788,7 +789,8 @@ m17n_object_unref (void *object) This variable initially has the value 0. */ -/***ja @brief m17n ¥é¥¤¥Ö¥é¥ê¤Î¥¨¥é¡¼¥³¡¼¥É¤òÊÝ»ý¤¹¤ë³°ÉôÊÑ¿ô +/***ja + @brief m17n ¥é¥¤¥Ö¥é¥ê¤Î¥¨¥é¡¼¥³¡¼¥É¤òÊÝ»ý¤¹¤ë³°ÉôÊÑ¿ô. ³°ÉôÊÑ¿ô #merror_code ¤Ï¡¢m17n ¥é¥¤¥Ö¥é¥ê¤Î¥¨¥é¡¼¥³¡¼¥É¤òÊÝ»ý¤¹¤ë¡£ ¥é¥¤¥Ö¥é¥ê´Ø¿ô¤¬ÂÅÅö¤Ç¤Ê¤¤°ú¿ô¤È¤È¤â¤Ë¸Æ¤Ð¤ì¤¿ºÝ¤Ë¤Ï¡¢¤³¤ÎÊÑ¿ô¤ò @@ -800,7 +802,8 @@ enum MErrorCode merror_code; /*=*/ -/***en @brief Memory allocation error handler +/***en + @brief Memory allocation error handler. The external variable #m17n_memory_full_handler holds a pointer to the function to call when a library function failed to allocate @@ -813,7 +816,8 @@ enum MErrorCode merror_code; An application program that needs a different error handling can change this variable to point a proper function. */ -/***ja @brief ¥á¥â¥ê³äÅö¤Æ¥¨¥é¡¼¥Ï¥ó¥É¥é +/***ja + @brief ¥á¥â¥ê³äÅö¤Æ¥¨¥é¡¼¥Ï¥ó¥É¥é. ÊÑ¿ô #m17n_memory_full_handler ¤Ï¡¢¥é¥¤¥Ö¥é¥ê´Ø¿ô¤¬¥á¥â¥ê³äÅö¤Æ ¤Ë¼ºÇÔ¤·¤¿ºÝ¤Ë¸Æ¤Ö¤Ù¤­´Ø¿ô¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤¢¤ë¡£$ERR ¤Ï @c enum @@ -890,7 +894,7 @@ void (*m17n_memory_full_handler) (enum MErrorCode err); */ /***ja @addtogroup m17nDebug - @brief m17n ¥é¥¤¥Ö¥é¥ê¥æ¡¼¥¶¤Î¤¿¤á¤Î¥×¥í¥°¥é¥à¥Ç¥Ð¥Ã¥°¥µ¥Ý¡¼¥È + @brief m17n ¥é¥¤¥Ö¥é¥ê¥æ¡¼¥¶¤Î¤¿¤á¤Î¥×¥í¥°¥é¥à¥Ç¥Ð¥Ã¥°¥µ¥Ý¡¼¥È. m17n ¥é¥¤¥Ö¥é¥ê¤Ï¡¢¤½¤Î¥æ¡¼¥¶¤¬¼«Ê¬¤Î¥×¥í¥°¥é¥à¤ò¥Ç¥Ð¥Ã¥°¤¹¤ë¤¿¤á ¤Ë¡¢°Ê²¼¤Îµ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¡£ diff --git a/src/m17n-core.h b/src/m17n-core.h index 0e4f4bf..0301f14 100644 --- a/src/m17n-core.h +++ b/src/m17n-core.h @@ -107,7 +107,7 @@ extern int m17n_object_unref (void *object); structure is concealed from application programs. */ /***ja - @brief ¥·¥ó¥Ü¥ë¤Î·¿Àë¸À + @brief ¥·¥ó¥Ü¥ë¤Î·¿Àë¸À. #MSymbol ¤Ï¥·¥ó¥Ü¥ë¥ª¥Ö¥¸¥§¥¯¥È¤Î·¿¤Ç¤¢¤ë¡£ÆâÉô¹½Â¤¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç ¥ó¥×¥í¥°¥é¥à¤«¤é¤Ï¸«¤¨¤Ê¤¤¡£ */ @@ -240,7 +240,7 @@ extern MSymbol Mchar_table; internal structure is concealed from application programs. */ /***ja - @brief ʸ»ú¥Æ¡¼¥Ö¥ë¤Î·¿Àë¸À + @brief ʸ»ú¥Æ¡¼¥Ö¥ë¤Î·¿Àë¸À. #MCharTable ¤Ï @e ʸ»ú¥Æ¡¼¥Ö¥ë (chartable) ¥ª¥Ö¥¸¥§¥¯¥È¤Î·¿¤Ç¤¢¤ë¡£ ÆâÉô¹½Â¤¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é¥à¤«¤é¤Ï¸«¤¨¤Ê¤¤¡£ */ @@ -289,7 +289,7 @@ extern void mchartable_range (MCharTable *table, int *from, int *to); structure is concealed from application programs. */ /***ja - @brief @e MText ¤Î·¿Àë¸À + @brief @e MText ¤Î·¿Àë¸À. #Mtext ¤Ï @e M-text ¥ª¥Ö¥¸¥§¥¯¥È¤Î·¿¤Ç¤¢¤ë¡£ ÆâÉô¹½Â¤¤Ï¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥°¥é¥à¤«¤é¤Ï¸«¤¨¤Ê¤¤¡£ diff --git a/src/m17n-gui.c b/src/m17n-gui.c index a7af601..6388dc2 100644 --- a/src/m17n-gui.c +++ b/src/m17n-gui.c @@ -282,7 +282,7 @@ MSymbol Mfont_descent; newly created frame. Otherwise, it returns @c NULL. */ /***ja - @brief ¿·¤·¤¤¥Õ¥ì¡¼¥à¤òºî¤ë + @brief ¿·¤·¤¤¥Õ¥ì¡¼¥à¤òºî¤ë. ´Ø¿ô mframe () ¤Ï $PLIST Ãæ¤Î¥Ñ¥é¥á¡¼¥¿¤ò»ý¤Ä¿·¤·¤¤¥Õ¥ì¡¼¥à¤òºî¤ë¡£ @@ -491,7 +491,7 @@ mframe_get_prop (MFrame *frame, MSymbol key) default frame that is created by the first call of mframe (). */ /***ja - ¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥ì¡¼¥à + @brief ¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥ì¡¼¥à. ³°ÉôÊÑ¿ô #mframe_default ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥ì¡¼¥à¤Ø¤Î¥Ý¥¤¥ó¥¿¤ò»ý ¤Ä¡£¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥ì¡¼¥à¤Ï¡¢ºÇ½é¤Ë mframe () ¤¬¸Æ¤Ó½Ð¤µ¤ì¤¿¤È¤­¤Ë diff --git a/src/m17n-gui.h b/src/m17n-gui.h index 079a4b2..c2b43ca 100644 --- a/src/m17n-gui.h +++ b/src/m17n-gui.h @@ -63,7 +63,7 @@ extern void m17n_fini_win (void); @e display and @e screen in the X Window System. */ /***ja - @brief ¥Õ¥ì¡¼¥à¤Î·¿Àë¸À + @brief ¥Õ¥ì¡¼¥à¤Î·¿Àë¸À. #MFrame ¤Ï¡¢@e ¥Õ¥ì¡¼¥à ¥ª¥Ö¥¸¥§¥¯¥ÈÍѤη¿¤Ç¤¢¤ë¡£¸Ä¡¹¤Î¥Õ¥ì¡¼¥à¤Ï¡¢ ¤½¤ì¤¬Âбþ¤¹¤ëʪÍýŪ¤Êɽ¼¨¡¿ÆþÎϥǥХ¤¥¹¤Î³Æ¼ï¾ðÊó¤òÊÝ»ý¤¹¤ë¡£ @@ -180,7 +180,7 @@ extern int mfont_set_encoding (MFont *font, font not greater than the #Msize property of $SPEC. */ /***ja - @brief ¥Õ¥©¥ó¥È¤òõ¤¹ + @brief ¥Õ¥©¥ó¥È¤òõ¤¹. ´Ø¿ô mfont_find () ¤Ï¡¢¥Õ¥ì¡¼¥à $FRAME ¾å¤Ç¥Õ¥©¥ó¥ÈÄêµÁ $SPEC ¤Ë¤â¤Ã ¤È¤â¹çÃפ¹¤ë»ÈÍѲÄǽ¤Ê¥Õ¥©¥ó¥È¤Ø¤Î¥Ý¥¤¥ó¥¿¤òÊÖ¤¹¡£ @@ -407,7 +407,8 @@ extern void mface_update (MFrame *frame, MFace *face); What it actually points depends on a window system. A program that uses the m17n-X library must coerce the type @c Drawable to this type. */ -/***ja ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¤Ë°Í¸¤¹¤ë¡¢¥¦¥£¥ó¥É¥¦¤Î·¿Àë¸À. +/***ja + @brief ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¤Ë°Í¸¤¹¤ë¡¢¥¦¥£¥ó¥É¥¦¤Î·¿Àë¸À. #MDrawWindow ¤Ï¥¦¥£¥ó¥É¥¦¡¢¤¹¤Ê¤ï¤Á´ö¤Ä¤«¤ÎÅÀ¤Ç¥¹¥¯¥ê¡¼¥ó¤Î¥ß¥Ë¥Á¥å ¥¢¤È¤·¤ÆƯ¤¯¶ë·ÁÎΰèÍѤη¿¤Ç¤¢¤ë¡£ @@ -430,7 +431,7 @@ typedef void *MDrawWindow; that uses the m17n-X library must coerce the type @c Region to this type. */ /***ja - @brief ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¤Ë°Í¸¤¹¤ë¡¢Îΰè¤Î·¿Àë¸À. + @brief ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¤Ë°Í¸¤¹¤ë¡¢Îΰè¤Î·¿Àë¸À. #MDrawRegion ¤ÏÎΰ衢¤¹¤Ê¤ï¤Á¥¹¥¯¥ê¡¼¥ó¾å¤ÎǤ°Õ¤Î¥Ô¥¯¥»¥ë¤Î½¸¹ç ¡Êŵ·¿Åª¤Ë¤Ï¶ë·ÁÎΰè¡ËÍѤη¿¤Ç¤¢¤ë¡£ diff --git a/src/m17n-misc.h b/src/m17n-misc.h index 8e6d7a3..5faf237 100644 --- a/src/m17n-misc.h +++ b/src/m17n-misc.h @@ -45,7 +45,7 @@ of these values as an argument. */ /***ja - @brief m17n ¥é¥¤¥Ö¥é¥ê¥¨¥é¡¼¥³¡¼¥É¤ÎÎóµó + @brief m17n ¥é¥¤¥Ö¥é¥ê¥¨¥é¡¼¥³¡¼¥É¤ÎÎóµó. m17n ¥é¥¤¥Ö¥é¥ê¥¨¥é¡¼¥³¡¼¥É¤ÎÎóµó diff --git a/src/m17n.h b/src/m17n.h index 5d87d16..f681c65 100644 --- a/src/m17n.h +++ b/src/m17n.h @@ -424,8 +424,10 @@ typedef struct /*=*/ /*** @ingroup m17nConv */ -/***en @brief Types of coding system. */ -/***ja @brief ¥³¡¼¥É·Ï¤Î¥¿¥¤¥×. */ +/***en + @brief Types of coding system. */ +/***ja + @brief ¥³¡¼¥É·Ï¤Î¥¿¥¤¥×. */ enum MCodingType { @@ -502,10 +504,10 @@ enum MCodingType /*=*/ /*** @ingroup m17nConv */ -/***en @brief Bit-masks to specify the detail of coding system whose type is - MCODING_TYPE_ISO_2022. */ -/***ja @brief MCODING_TYPE_ISO_2022 ¥¿¥¤¥×¤Î¥³¡¼¥É·Ï¤Î¾ÜºÙ¤òɽ¤ï¤¹¥Ó¥Ã¥È¥Þ¥¹ - ¥¯. */ +/***en + @brief Bit-masks to specify the detail of coding system whose type is MCODING_TYPE_ISO_2022. */ +/***ja + @brief MCODING_TYPE_ISO_2022 ¥¿¥¤¥×¤Î¥³¡¼¥É·Ï¤Î¾ÜºÙ¤òɽ¤ï¤¹¥Ó¥Ã¥È¥Þ¥¹¥¯. */ enum MCodingFlagISO2022 { @@ -632,8 +634,7 @@ enum MCodingFlagISO2022 MCODING_TYPE_ISO_2022. */ /***ja - @brief MCODING_TYPE_ISO_2022 ¥¿¥¤¥×¤Î¥³¡¼¥É·Ï¤ÇɬÍפÊÉղþðÊóÍÑ - ¹½Â¤ÂÎ. + @brief MCODING_TYPE_ISO_2022 ¥¿¥¤¥×¤Î¥³¡¼¥É·Ï¤ÇɬÍפÊÉղþðÊóÍѹ½Â¤ÂÎ. MCODING_TYPE_ISO_2022 ¥¿¥¤¥×¤Î¥³¡¼¥É·Ï¤ÇɬÍפÊÉղþðÊóÍѤòÊÝ»ý¤¹¤ë ¤¿¤á¤Î¹½Â¤ÂΡ£ @@ -696,8 +697,7 @@ typedef struct /*** @ingroup m17nConv */ /***en - @brief Structure for extra information about a coding system of - type #MCODING_TYPE_UTF. + @brief Structure for extra information about a coding system of type #MCODING_TYPE_UTF. */ /***ja @@ -826,7 +826,7 @@ extern MText *mconv_gets (MConverter *converter, MText *mt); /*=*/ /***en - @brief @c struct @c MLocale + @brief @c struct @c MLocale. The structure @c MLocale is used to hold information about name, language, territory, modifier, codeset, and the corresponding @@ -836,7 +836,7 @@ extern MText *mconv_gets (MConverter *converter, MText *mt); internal structure is concealed from application programs. */ /***ja - @brief @c MLocale ¹½Â¤ÂÎ + @brief @c MLocale ¹½Â¤ÂÎ. @c MLocale ¹½Â¤ÂΤϡ¢¥í¥±¡¼¥ë¤Î̾Á°¡¢¸À¸ì¡¢ÃÏ°è¡¢¥â¥Ç¥£¥Õ¥¡¥¤¥¢¡¢ ¥³¡¼¥É¥»¥Ã¥È¡¢¤ª¤è¤ÓÂбþ¤¹¤ë¥³¡¼¥É·Ï¤Ë´Ø¤¹¤ë¾ðÊó¤òÊÝ»ý¤¹¤ë¤¿¤á¤ËÍÑ diff --git a/src/mtext.c b/src/mtext.c index 7285c7b..8b0e72e 100644 --- a/src/mtext.c +++ b/src/mtext.c @@ -1233,7 +1233,7 @@ mtext_ref_char (MText *mt, int pos) variable #merror_code. */ /***ja - @brief M-text ¤Ë°ìʸ»ú¤òÀßÄꤹ¤ë + @brief M-text ¤Ë°ìʸ»ú¤òÀßÄꤹ¤ë. ´Ø¿ô mtext_set_char () ¤Ï¡¢¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£Ìµ¤·¤Îʸ»ú $C ¤ò M-text $MT ¤Î°ÌÃÖ $POS ¤ËÀßÄꤹ¤ë¡£ @@ -1876,8 +1876,7 @@ mtext_character (MText *mt, int from, int to, int c) /*=*/ /***en - @brief Return the position of the first occurrence of a - character in an M-text. + @brief Return the position of the first occurrence of a character in an M-text. The mtext_chr () function searches M-text $MT for character $C. Search starts from the beginning of $MT and goes toward the end. @@ -1914,8 +1913,7 @@ mtext_chr (MText *mt, int c) /*=*/ /***en - @brief Return the position of the last occurrence of a - character in an M-text. + @brief Return the position of the last occurrence of a character in an M-text. The mtext_rchr () function searches M-text $MT for character $C. Search starts from the end of $MT and goes backwardly toward the @@ -1926,7 +1924,7 @@ mtext_chr (MText *mt, int c) returns -1. */ /***ja - @brief M-text Ãæ¤Ç»ØÄꤵ¤ì¤¿Ê¸»ú¤¬ºÇ¸å¤Ë¸½¤ì¤ë°ÌÃÖ¤òÊÖ¤¹ + @brief M-text Ãæ¤Ç»ØÄꤵ¤ì¤¿Ê¸»ú¤¬ºÇ¸å¤Ë¸½¤ì¤ë°ÌÃÖ¤òÊÖ¤¹. ´Ø¿ô mtext_rchr () ¤Ï M-text $MT Ãæ¤Çʸ»ú $C ¤òõ¤¹¡£Ãµº÷¤Ï $MT ¤Î ºÇ¸å¤«¤éÀèƬÊý¸þ¤Ø¤È¸å¸þ¤­¤Ë¿Ê¤à¡£ @@ -2001,7 +1999,7 @@ mtext_cmp (MText *mt1, MText *mt2) equal to, or less than $MT2, respectively. */ /***ja - @brief Æó¤Ä¤Î M-text ¤ÎÀèƬÉôʬ¤òʸ»úñ°Ì¤ÇÈæ³Ó¤¹¤ë + @brief Æó¤Ä¤Î M-text ¤ÎÀèƬÉôʬ¤òʸ»úñ°Ì¤ÇÈæ³Ó¤¹¤ë. ´Ø¿ô mtext_ncmp () ¤Ï¡¢´Ø¿ô mtext_cmp () ƱÍͤΠM-text Ʊ»Î¤ÎÈæ³Ó ¤òÀèƬ¤«¤éºÇÂç $N ʸ»ú¤Þ¤Ç¤Ë´Ø¤·¤Æ¹Ô¤Ê¤¦¡£ diff --git a/src/plist.c b/src/plist.c index a07dde2..763ba01 100644 --- a/src/plist.c +++ b/src/plist.c @@ -767,9 +767,9 @@ MSymbol Mplist; M-text. */ /***ja - @brief "text" ¤ò̾Á°¤È¤·¤Æ»ý¤Ä¥·¥ó¥Ü¥ë + @brief "mtext" ¤ò̾Á°¤È¤·¤Æ»ý¤Ä¥·¥ó¥Ü¥ë. - ¥·¥ó¥Ü¥ë @c Mtext ¤Ï "text" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä´ÉÍý¥­¡¼¤Ç¤¢ + ¥·¥ó¥Ü¥ë @c Mtext ¤Ï "mtext" ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä´ÉÍý¥­¡¼¤Ç¤¢ ¤ë¡£¥­¡¼¤¬ @c Mtext ¤Ç¤¢¤ë¥×¥í¥Ñ¥Æ¥£¤ÎÃÍ¤Ï M-text ¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê ¤¤¡£ */ @@ -822,7 +822,7 @@ mplist () @errors This function never fails. */ /***ja - @brief ¥×¥í¥Ñ¥Æ¥£¥ê¥¹¥È¤ò¥³¥Ô¡¼¤¹¤ë. + @brief ¥×¥í¥Ñ¥Æ¥£¥ê¥¹¥È¤ò¥³¥Ô¡¼¤¹¤ë. ´Ø¿ô mplist_copy () ¤Ï¥×¥í¥Ñ¥Æ¥£¥ê¥¹¥È $PLIST ¤ò¥³¥Ô¡¼¤¹¤ë¡£¥³¥Ô¡¼¤Î¤¹¤Ù¤Æ¤Î Ãͤϥ³¥Ô¡¼¸µ $PLIST ¤ÎÃͤÈƱ¤¸¤Ç¤¢¤ë¡£ @@ -1163,7 +1163,7 @@ mplist_next (MPlist *plist) If the operation was successful, mplist_set () returns $PLIST. Otherwise, it returns @c NULL. */ /***ja - @brief ¥×¥í¥Ñ¥Æ¥£¥ê¥¹¥ÈºÇ½é¤Î¥×¥í¥Ñ¥Æ¥£¤òÀßÄꤹ¤ë¡£ + @brief ¥×¥í¥Ñ¥Æ¥£¥ê¥¹¥È¤ÎºÇ½é¤Î¥×¥í¥Ñ¥Æ¥£¤òÀßÄꤹ¤ë. ´Ø¿ô mplist_set () ¤Ï¥×¥í¥Ñ¥Æ¥£¥ê¥¹¥È $PLIST ¤ÎºÇ½é¤Î¥×¥í¥Ñ¥Æ¥£¤Î ¥­¡¼¤ÈÃͤò¤½¤ì¤¾¤ì $KEY ¤È $VALUE ¤ËÀßÄꤹ¤ë¡£$KEY ¤È $VAL ¤ËÂФ¹ diff --git a/src/textprop.c b/src/textprop.c index 42a026a..0158314 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1519,7 +1519,7 @@ mtext_get_prop (MText *mt, int pos, MSymbol key) /*=*/ /***en - @brief Get multiple values of a text property + @brief Get multiple values of a text property. The mtext_get_prop_values () function searches the character at $POS in M-text $MT for the property whose key is $KEY. If such @@ -1970,7 +1970,7 @@ mtext_push_prop (MText *mt, int from, int to, /*=*/ /***en - @brief Pop a text property + @brief Pop a text property. The mtext_pop_prop () function removes the topmost text property whose key is $KEY from the characters between $FROM (inclusive) @@ -2518,7 +2518,7 @@ mtext_attach_property (MText *mt, int from, int to, MTextProperty *prop) @return This function always returns 0. */ /***ja - @brief M-text ¤«¤é¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤òʬΥ¤¹¤ë¡£ + @brief M-text ¤«¤é¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤òʬΥ¤¹¤ë. ´Ø¿ô mtext_detach_property () ¤Ï¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£ $PROP ¤òʬΥ¤¹¤ë¡£