From 1ab33ed5c1e79787a370878da282682d49b1ba46 Mon Sep 17 00:00:00 2001 From: nisikimi Date: Fri, 30 Apr 2004 02:42:44 +0000 Subject: [PATCH] *** empty log message *** --- src/coding.c | 10 +++++----- src/font.c | 2 +- src/fontset.c | 41 +++++++++++++++++++++-------------------- src/m17n-misc.h | 4 ++-- src/mtext.c | 22 +++++++++++----------- 5 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/coding.c b/src/coding.c index cea77b5..52c5fb2 100644 --- a/src/coding.c +++ b/src/coding.c @@ -4139,8 +4139,8 @@ mconv_buffer_converter (MSymbol name, unsigned char *buf, int n) @return If the operation was successful, mconv_stream_converter () returns the created code converter. Otherwise it returns @c NULL - and assigns an error code to the external variable @c - merror_code. */ + and assigns an error code to the external variable + #merror_code. */ /***ja @brief ¥¹¥È¥ê¡¼¥à¤Ë·ë¤ÓÉÕ¤±¤é¤ì¤¿¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤òºî¤ë. @@ -5009,8 +5009,8 @@ mconv_putc (MConverter *converter, int c) If the operation was successful, mconv_gets () returns the modified $MT. If it encounters EOF without reading a single character, it returns $MT without changing it. If an error is - detected, it returns @c NULL and assigns an error code to @c - merror_code. */ + detected, it returns @c NULL and assigns an error code to + #merror_code. */ /***ja @brief ¥³¡¼¥É¥³¥ó¥Ð¡¼¥¿¤ò»È¤Ã¤Æ1¹ÔÆɤà. @@ -5048,7 +5048,7 @@ mconv_gets (MConverter *converter, MText *mt) mtext_cat_char (mt, c); } if (c == EOF && converter->result != MCONVERSION_RESULT_SUCCESS) - /* mconv_getc () sets merror_code */ + /* mconv_getc () sets #merror_code */ return NULL; return mt; } diff --git a/src/font.c b/src/font.c index 3ea0824..194af7e 100644 --- a/src/font.c +++ b/src/font.c @@ -1782,7 +1782,7 @@ mfont_find (MFrame *frame, MFont *spec, int *score, int limited_size) @return If the operation was successful, this function returns 0. Otherwise it returns -1 and assigns an error code to the external - variable @c merror_code. */ + variable #merror_code. */ /***ja @brief ¥Õ¥©¥ó¥È¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òÀßÄꤹ¤ë. diff --git a/src/fontset.c b/src/fontset.c index 4f7e672..4924acf 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -607,8 +607,8 @@ mfont__lookup_fontset (MRealizedFontset *realized, MGlyph *g, int *num, vacant. The macro M17N_INIT () creates the default fontset. An - application program can modify it before the first call of mframe - (). + application program can modify it before the first call of + mframe (). @return This function returns a pointer to the found or newly created @@ -616,9 +616,9 @@ mfont__lookup_fontset (MRealizedFontset *realized, MGlyph *g, int *num, /***ja @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤òÊÖ¤¹. - ´Ø¿ô mfontset ¤Ï̾Á°$ NAME ¤ò»ý¤Ä¥Õ¥©¥ó¥È¥»¥Ã¥È¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î¥Ý¥¤ - ¥ó¥¿¤òÊÖ¤¹¡£ $NAME ¤¬ @c NULL ¤Ê¤é¤Ð¡¢¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¥»¥Ã¥È¤Ø¤Î - ¥Ý¥¤¥ó¥¿¤òÊÖ¤¹¡£ + ´Ø¿ô mfontset () ¤Ï̾Á° $NAME ¤ò»ý¤Ä¥Õ¥©¥ó¥È¥»¥Ã¥È¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î + ¥Ý¥¤¥ó¥¿¤òÊÖ¤¹¡£ $NAME ¤¬ @c NULL ¤Ê¤é¤Ð¡¢¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¥»¥Ã¥È + ¤Ø¤Î¥Ý¥¤¥ó¥¿¤òÊÖ¤¹¡£ $NAME ¤È¤¤¤¦Ì¾Á°¤ò»ý¤Ä¥Õ¥©¥ó¥È¥»¥Ã¥È¤¬¤Ê¤±¤ì¤Ð¡¢¿·¤·¤¤¤â¤Î¤¬ºî¤é¤ì ¤ë¡£¤½¤ÎºÝ¡¢m17n ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë \<@c fontset, $NAME\> ¤È¤¤¤¦¥Ç¡¼¥¿ @@ -664,7 +664,7 @@ mfontset (char *name) /***en @brief Return the name of a fontset. - The mfontset_name () function returns the name of fontset$FONTSET. */ + The mfontset_name () function returns the name of fontset $FONTSET. */ /***ja @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤Î̾Á°¤òÊÖ¤¹. @@ -678,7 +678,7 @@ mfontset_name (MFontset *fontset) /*=*/ /***en - @brief Make a copy a fontset. + @brief Make a copy of a fontset. 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 @@ -739,8 +739,9 @@ mfontset_copy (MFontset *fontset, char *name) /***en @brief Modify the contents of a fontset. - The mfontset_modify_entry () function associates, in $FONTSET, a - copy of $FONT with the $SCRIPT / $LANGUAGE pair or with $CHARSET. + The mfontset_modify_entry () function associates, in fontset + $FONTSET, a copy of $FONT with the $SCRIPT / $LANGUAGE pair or + with $CHARSET. Each font in a fontset is associated with a particular script/language pair, with a particular charset, or with the @@ -778,33 +779,33 @@ mfontset_copy (MFontset *fontset, char *name) @return If the operation was successful, mfontset_modify_entry () returns 0. Otherwise it returns -1 and assigns an error code to the external - variable @c merror_code. */ + variable #merror_code. */ /***ja @brief ¥Õ¥©¥ó¥È¥»¥Ã¥È¤ÎÆâÍƤòÊѹ¹¤¹¤ë. - ´Ø¿ô The mfontset_modify_entry () ¤Ï¡¢$LANGUAGE ¤È $SCRIPT ¤ÎÁÈ¤ß - ¹ç¤ï¤»¤Þ¤¿¤Ï $CHARSET ¤ËÂФ·¤Æ $FONT ¤Î¥³¥Ô¡¼¤ò»È¤¦¤è¤¦¤Ë¡¢¥Õ¥©¥ó - ¥È¥»¥Ã¥È $FONTSET ¤òÀßÄꤹ¤ë¡£ + ´Ø¿ô mfontset_modify_entry () ¤Ï¡¢$LANGUAGE ¤È $SCRIPT ¤ÎÁȤ߹ç¤ï + ¤»¤Þ¤¿¤Ï $CHARSET ¤ËÂФ·¤Æ $FONT ¤Î¥³¥Ô¡¼¤ò»È¤¦¤è¤¦¤Ë¡¢¥Õ¥©¥ó¥È¥»¥Ã + ¥È $FONTSET ¤òÀßÄꤹ¤ë¡£ ¥Õ¥©¥ó¥È¥»¥Ã¥È¤Î³Æ¥Õ¥©¥ó¥È¤Ï¡¢ÆÃÄê¤Î¥¹¥¯¥ê¥×¥È¤È¸À¸ì¤Î¥Ú¥¢¡¢ÆÃÄê¤Î ʸ»ú¥»¥Ã¥È¡¢¥·¥ó¥Ü¥ë @c Mnil ¤Î¤¤¤º¤ì¤«¤È´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¡£Æ±¤¸ ¤â¤Î¤È´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥Õ¥©¥ó¥È¤Ï¥°¥ë¡¼¥×¤ò¹½À®¤¹¤ë¡£ $SCRIPT ¤Ï @c Mnil ¤Ç¤¢¤ë¤«¡¢¥¹¥¯¥ê¥×¥È¤òÆÃÄꤹ¤ë¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¡£ - ¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢$LANGUAGE ¤Ï¸À¸ì¤òÆÃÄꤹ¤ë¥·¥ó¥Ü¥ë¤«@c + ¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢$LANGUAGE ¤Ï¸À¸ì¤òÆÃÄꤹ¤ë¥·¥ó¥Ü¥ë¤« @c Mnil ¤Ç¤¢¤ê¡¢$FONT ¤Ïthe $SCRIPT / $LANGUAGE ¥Ú¥¢¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤ë¡£ $CHARSET ¤Ï @c Mnil ¤Ç¤¢¤ë¤«¡¢Ê¸»ú¥»¥Ã¥È¥ª¥Ö¥¸¥§¥¯¥È¤òɽ¤¹¥·¥ó¥Ü¥ë - ¤Ç¤¢¤ë¡£¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¾ì¹ç¤Ë¤Ï$FONT ¤Ï¤½¤Îʸ»ú¥»¥Ã¥È¤È´ØÏ¢ÉÕ¤±¤é¤ì + ¤Ç¤¢¤ë¡£¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¾ì¹ç¤Ë¤Ï $FONT ¤Ï¤½¤Îʸ»ú¥»¥Ã¥È¤È´ØÏ¢ÉÕ¤±¤é¤ì ¤ë¡£ $SCRIPT ¤È $CHARSET ¤ÎÁÐÊý¤¬ @c Mnil ¤Ç¤Ê¤¤¾ì¹ç¤Ë¤Ï $FONT ¤Î¥³¥Ô¡¼ ¤¬£²¤Äºî¤é¤ì¡¢¤½¤ì¤¾¤ì $SCRIPT / $LANGUAGE ¥Ú¥¢¤Èʸ»ú¥»¥Ã¥È¤Ë´ØÏ¢ ÉÕ¤±¤é¤ì¤ë¡£ - $SCRIPT ¤È $CHARSET ¤ÎÁÐÊý¤¬ @c Mnil ¤Ê¤é¤Ð¡¢ $FONT ¤Ï@c Mnil ¤È´Ø - Ï¢ÉÕ¤±¤é¤ì¤ë¡£¤³¤Î¼ï¤Î¥Õ¥©¥ó¥È¤Ï @e fallback @e font ¤È¸Æ¤Ð¤ì¤ë¡£ + $SCRIPT ¤È $CHARSET ¤ÎÁÐÊý¤¬ @c Mnil ¤Ê¤é¤Ð¡¢ $FONT ¤Ï @c Mnil ¤È + ´ØÏ¢ÉÕ¤±¤é¤ì¤ë¡£¤³¤Î¼ï¤Î¥Õ¥©¥ó¥È¤Ï @e fallback @e font ¤È¸Æ¤Ð¤ì¤ë¡£ °ú¿ô $HOW ¤Ï $FONT ¤ÎÍ¥ÀèÅÙ¤ò»ØÄꤹ¤ë¡£$HOW ¤¬Àµ¤Ê¤é¤Ð¡¢$FONT ¤ÏƱ ¤¸¤â¤Î¤È´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥°¥ë¡¼¥×Ãæ¤ÇºÇ¹â¤ÎÍ¥ÀèÅÙ¤ò»ý¤Ä¡£$HOW ¤¬Éé¤Ê @@ -813,12 +814,12 @@ mfontset_copy (MFontset *fontset, char *name) ¤«¤é¼è¤ê½ü¤«¤ì¤ë¡£ $LAYOUTER_NAME ¤Ï @c Mnil ¤Ç¤¢¤ë¤«¡¢@ref flt ¤ò¼¨¤¹¥·¥ó¥Ü¥ë¤Ç¤¢¤ë¡£ - ¥·¥ó¥Ü¥ë¤Ç¤¢¤ì¤Ð¡¢$FONT ¤òÍѤ¤¤ÆM-text ¤òɽ¼¨¤¹¤ëºÝ¤Ë¤Ï¡¢¤½¤Î font - layout table ¤ò»È¤Ã¤Æʸ»úÎ󤫤饰¥ê¥Õ¥³¡¼¥ÉÎó¤òÀ¸À®¤¹¤ë¡£ + ¥·¥ó¥Ü¥ë¤Ç¤¢¤ì¤Ð¡¢$FONT ¤òÍѤ¤¤ÆM-text ¤òɽ¼¨¤¹¤ëºÝ¤Ë¤Ï¡¢¤½¤Î FONT + LAYOUT TABLE ¤ò»È¤Ã¤Æʸ»úÎ󤫤饰¥ê¥Õ¥³¡¼¥ÉÎó¤òÀ¸À®¤¹¤ë¡£ @return ½èÍý¤¬À®¸ù¤·¤¿¤È¤­¡¢mfontset_modify_entry () ¤Ï 0 ¤òÊÖ¤¹¡£ - ¼ºÇÔ¤·¤¿¤È¤­¤Ï -1 ¤òÊÖ¤·¡¢³°ÉôÊÑ¿ô @c merror_code ¤Ë¥¨¥é¡¼¥³¡¼¥É¤ò + ¼ºÇÔ¤·¤¿¤È¤­¤Ï -1 ¤òÊÖ¤·¡¢³°ÉôÊÑ¿ô #merror_code ¤Ë¥¨¥é¡¼¥³¡¼¥É¤ò ÀßÄꤹ¤ë¡£ */ /*** diff --git a/src/m17n-misc.h b/src/m17n-misc.h index 4ce46fe..54505eb 100644 --- a/src/m17n-misc.h +++ b/src/m17n-misc.h @@ -49,8 +49,8 @@ m17n ¥é¥¤¥Ö¥é¥ê¥¨¥é¡¼¥³¡¼¥É¤ÎÎóµó - ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô¤¬ÂÅÅö¤Ç¤Ê¤¤°ú¿ô¤È¤È¤â¤Ë¸Æ¤Ð¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢ÊÑ¿ô @c - merror_code ¤ò¤³¤ì¤é¤ÎÃͤΤɤ줫¤Ë¥»¥Ã¥È¤¹¤ë¡£¤¹¤Ù¤Æ¤Î¥¨¥é¡¼¥³¡¼¥É + ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô¤¬ÂÅÅö¤Ç¤Ê¤¤°ú¿ô¤È¤È¤â¤Ë¸Æ¤Ð¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢ÊÑ¿ô + #merror_code ¤ò¤³¤ì¤é¤ÎÃͤΤɤ줫¤Ë¥»¥Ã¥È¤¹¤ë¡£¤¹¤Ù¤Æ¤Î¥¨¥é¡¼¥³¡¼¥É ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤¢¤ë¡£ ¥á¥â¥ê³äÅö¤Æ¥¨¥é¡¼¤ÎºÝ¤Ë¤Ï¡¢³°ÉôÊÑ¿ô #m17n_memory_full_handler ¤Î»Ø diff --git a/src/mtext.c b/src/mtext.c index 024ef95..13626de 100644 --- a/src/mtext.c +++ b/src/mtext.c @@ -1426,11 +1426,11 @@ mtext_cat (MText *mt1, MText *mt2) text properties. If the length of $MT2 is less than $N, all characters are copied. $MT2 is not modified. - @return - If the operation was successful, mtext_ncat () returns a pointer - to the resulting M-text $MT1. If an error is detected, it returns - @c NULL and assigns an error code to the global variable @c - merror_code. */ + @return + If the operation was successful, mtext_ncat () returns a + pointer to the resulting M-text $MT1. If an error is detected, it + returns @c NULL and assigns an error code to the global variable + #merror_code. */ /***ja @@ -1443,8 +1443,8 @@ mtext_cat (MText *mt1, MText *mt2) @return ½èÍý¤¬À®¸ù¤·¤¿¾ì¹ç¡¢mtext_ncat () ¤ÏÊѹ¹¤µ¤ì¤¿ M-text $MT1 ¤Ø¤Î¥Ý - ¥¤¥ó¥¿¤òÊÖ¤¹¡£¥¨¥é¡¼¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¤Ï @c NULL ¤òÊÖ¤·¡¢³°ÉôÊÑ¿ô @c - merror_code ¤Ë¥¨¥é¡¼¥³¡¼¥É¤òÀßÄꤹ¤ë¡£ + ¥¤¥ó¥¿¤òÊÖ¤¹¡£¥¨¥é¡¼¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¤Ï @c NULL ¤òÊÖ¤·¡¢³°ÉôÊÑ¿ô + #merror_code ¤Ë¥¨¥é¡¼¥³¡¼¥É¤òÀßÄꤹ¤ë¡£ @latexonly \IPAlabel{mtext_ncat} @endlatexonly */ @@ -1515,8 +1515,8 @@ mtext_cpy (MText *mt1, MText *mt2) @return If the operation was successful, mtext_ncpy () returns a pointer to the resulting M-text $MT1. If an error is detected, it returns - @c NULL and assigns an error code to the global variable @c - merror_code. */ + @c NULL and assigns an error code to the global variable + #merror_code. */ /***ja @brief M-text ¤Ë´Þ¤Þ¤ì¤ëºÇ½é¤Î²¿Ê¸»ú¤«¤ò¥³¥Ô¡¼¤¹¤ë. @@ -1528,8 +1528,8 @@ mtext_cpy (MText *mt1, MText *mt2) @return ½èÍý¤¬À®¸ù¤·¤¿¾ì¹ç¡¢mtext_ncpy () ¤ÏÊѹ¹¤µ¤ì¤¿ M-text $MT1 ¤Ø¤Î¥Ý - ¥¤¥ó¥¿¤òÊÖ¤¹¡£¥¨¥é¡¼¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¤Ï @c NULL ¤òÊÖ¤·¡¢³°ÉôÊÑ¿ô @c - merror_code ¤Ë¥¨¥é¡¼¥³¡¼¥É¤òÀßÄꤹ¤ë¡£ + ¥¤¥ó¥¿¤òÊÖ¤¹¡£¥¨¥é¡¼¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¤Ï @c NULL ¤òÊÖ¤·¡¢³°ÉôÊÑ¿ô + #merror_code ¤Ë¥¨¥é¡¼¥³¡¼¥É¤òÀßÄꤹ¤ë¡£ @latexonly \IPAlabel{mtext_ncpy} @endlatexonly */ -- 1.7.10.4