From: nisikimi Date: Thu, 22 Apr 2004 01:27:43 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: withdl~276 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f11f425daecdd8525cb50d8c979c574fefc4338;p=m17n%2Fm17n-lib.git *** empty log message *** --- diff --git a/src/mtext.c b/src/mtext.c index acf8980..d2ef32b 100644 --- a/src/mtext.c +++ b/src/mtext.c @@ -1852,11 +1852,11 @@ mtext_ins_char (MText *mt, int pos, int c, int n) @brief Search a character in an M-text. The mtext_character () function searches M-text $MT for character - $C. If $FROM < $TO, search begins at position $FROM and goes - forward but does not exceed ($TO - 1). Otherwise, search begins - at position ($FROM - 1) and goes backward but does not exceed $TO. - An invalid position specification is regarded as both $FROM and - $TO being 0. + $C. If $FROM is less than $TO, search begins at position $FROM + and goes forward but does not exceed ($TO - 1). Otherwise, search + begins at position ($FROM - 1) and goes backward but does not + exceed $TO. An invalid position specification is regarded as both + $FROM and $TO being 0. @return If $C is found, mtext_character () returns the position of its @@ -1868,10 +1868,10 @@ mtext_ins_char (MText *mt, int pos, int c, int n) @brief M-text Ãæ¤Çʸ»ú¤òõ¤¹. ´Ø¿ô mtext_character () ¤Ï M-text $MT Ãæ¤Çʸ»ú $C ¤òõ¤¹¡£¤â¤· - $FROM < $TO ¤Ê¤é¤Ð¡¢Ãµº÷¤Ï°ÌÃÖ $FROM ¤«¤éËöÈøÊý¸þ¤Ø¡¢ºÇÂç ($TO - - 1) ¤Þ¤Ç¿Ê¤à¡£¤½¤¦¤Ç¤Ê¤±¤ì¤Ð°ÌÃÖ ($FROM - 1) ¤«¤éÀèƬÊý¸þ¤Ø¡¢ºÇÂç - $TO ¤Þ¤Ç¿Ê¤à¡£°ÌÃ֤λØÄê¤Ë¸í¤ê¤¬¤¢¤ë¾ì¹ç¤Ï¡¢$FROM ¤È $TO ¤ÎξÊý¤Ë - 0 ¤¬»ØÄꤵ¤ì¤¿¤â¤Î¤È¸«¤Ê¤¹¡£ + $FROM ¤¬ $TO ¤è¤ê¾®¤µ¤±¤ì¤Ð¡¢Ãµº÷¤Ï°ÌÃÖ $FROM ¤«¤éËöÈøÊý¸þ¤Ø¡¢ºÇÂç + ($TO - 1) ¤Þ¤Ç¿Ê¤à¡£¤½¤¦¤Ç¤Ê¤±¤ì¤Ð°ÌÃÖ ($FROM - 1) ¤«¤éÀèƬÊý¸þ¤Ø¡¢ + ºÇÂç $TO ¤Þ¤Ç¿Ê¤à¡£°ÌÃ֤λØÄê¤Ë¸í¤ê¤¬¤¢¤ë¾ì¹ç¤Ï¡¢$FROM ¤È $TO ¤Îξ + Êý¤Ë 0 ¤¬»ØÄꤵ¤ì¤¿¤â¤Î¤È¸«¤Ê¤¹¡£ @return ¤â¤· $C ¤¬¸«¤Ä¤«¤ì¤Ð¡¢mtext_character () ¤Ï¤½¤ÎºÇ½é¤Î½Ð¸½°ÌÃÖ¤òÊÖ @@ -2334,15 +2334,22 @@ mtext_text (MText *mt1, int pos, MText *mt2) /***ja @brief M-text Ãæ¤ÎÆÃÄê¤ÎÎΰè¤ÇÊ̤ΠM-text ¤òõ¤¹. - ´Ø¿ô mtext_text () ¤Ï¡¢M-text $MT1 Ãæ¤Ç°ÌÃÖ $POS °Ê¹ß¤Ë¸½¤ï¤ì¤ë - M-text $MT2 ¤ÎºÇ½é¤Î°ÌÃÖ¤òÄ´¤Ù¤ë¡£¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£¤Î°ã¤¤¤Ï̵»ë¤µ - ¤ì¤ë¡£ + ´Ø¿ô mtext_search () ¤Ï¡¢ searches for the first occurrence of + M-text $MT2 in M-text $MT1 in the region $FROM and $TO while + ignoring difference of the text properties. If $FROM is less than + $TO, the forward search starts from $FROM, otherwise the backward + search starts from $TO. + + ´Ø¿ô mtext_text () ¤Ï¡¢M-text $MT1 Ãæ¤Î $FROM ¤«¤é $TO ¤Þ¤Ç¤Î´Ö¤Î + Îΰè¤ÇM-text $MT2 ¤¬ºÇ½é¤Ë¸½¤ï¤ì¤ë°ÌÃÖ¤òÄ´¤Ù¤ë¡£¥Æ¥­¥¹¥È¥×¥í¥Ñ¥Æ¥£ + ¤Î°ã¤¤¤Ï̵»ë¤µ¤ì¤ë¡£¤â¤· $FROM ¤¬ $TO ¤è¤ê¾®¤µ¤±¤ì¤Ðõº÷¤Ï°ÌÃÖ + $FROM ¤«¤éËöÈøÊý¸þ¤Ø¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤Ð $TO ¤«¤éÀèƬÊý¸þ¤ØºÇÂç $TO ¤Þ + ¤Ç¿Ê¤à¡£ @return - $MT1 Ãæ¤Ë $MT2 ¤¬¸«¤Ä¤«¤ì¤Ð¡¢mtext_text() ¤Ï¤½¤ÎºÇ½é¤Î½Ð¸½°ÌÃÖ¤òÊÖ + $MT1 Ãæ¤Ë $MT2 ¤¬¸«¤Ä¤«¤ì¤Ð¡¢mtext_search() ¤Ï¤½¤ÎºÇ½é¤Î½Ð¸½°ÌÃÖ¤òÊÖ ¤¹¡£¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï -1 ¤òÊÖ¤¹¡£¤â¤· $MT2 ¤¬¶õ¤Ê¤é¤Ð 0 ¤òÊÖ¤¹¡£ - - @latexonly \IPAlabel{mtext_text} @endlatexonly */ + */ int mtext_search (MText *mt1, int from, int to, MText *mt2)