From: handa <handa>
Date: Mon, 22 Aug 2005 01:16:10 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-3-0~246
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ebe3307e5ffe8fa4f5a3151a861ba5ad9625dc7;p=m17n%2Fm17n-lib.git

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

diff --git a/example/ChangeLog b/example/ChangeLog
index 598b2f1..fb50516 100644
--- a/example/ChangeLog
+++ b/example/ChangeLog
@@ -1,3 +1,17 @@
+2005-08-22  Kenichi Handa  <handa@m17n.org>
+
+	* mdump.c: Don't include config.h.
+
+	* medit.c: Likewise.
+
+	* mview.c: Likewise.
+
+	* mimx-anthy.c: Likewise.
+
+	* mimx-ispell.c: Likewise.
+
+	* Makefile.am (AM_CPPFLAGS): Set it to @CONFIG_FLAGS@.
+
 2005-08-18  Kenichi Handa  <handa@m17n.org>
 
 	* medit.c (main): Adjusted for the change of symbol's language
diff --git a/src/font.c b/src/font.c
index 4c022ed..eb8665f 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2236,19 +2236,23 @@ mfont_copy (MFont *font)
     The mfont_get_prop () function gets the value of $KEY property of
     font $FONT.  $KEY must be one of the following symbols:
 
-	@c Mfamily, @c Mweight, @c Mstyle, @c Mstretch,
-	@c Madstyle, @c Mregistry, @c Msize, @c Mresolution, @c Mspacing.
-
-    @return
-    If $KEY is @c Mfamily, @c Mweight, @c Mstyle, @c Mstretch, @c
-    Madstyle, @c Mregistry, or @c Mspacing, this function returns the
-    corresponding value as a symbol.  If the font does not have $KEY
-    property, it returns @c Mnil.
-    If $KEY is @c Msize or @c Mresolution, this function returns the
-    corresponding value as an integer.  If the font does not have $KEY
-    property, it returns 0.
-    If $KEY is something else, it returns @c NULL and assigns an error
-    code to the external variable #merror_code.  */
+	@c Mfamily, @c Mweight, @c Mstyle, @c Mstretch, @c Madstyle,
+	@c Mregistry, @c Msize, @c Mresolution, @c Mspacing.
+
+    If $FONT is a return value of mfont_find (), $KEY can also be one
+    of the following symbols:
+
+	@c Mascent, @c Mdescent, @c Mmax_advance.
+
+    @return If $KEY is @c Mfamily, @c Mweight, @c Mstyle, @c Mstretch,
+    @c Madstyle, @c Mregistry, or @c Mspacing, this function returns
+    the corresponding value as a symbol.  If the font does not have
+    $KEY property, it returns @c Mnil.  If $KEY is @c Msize, @c
+    Mresolution, @c Mascent, @c Mdescent, or @c Mmax_advance, this
+    function returns the corresponding value as an integer.  If the
+    font does not have $KEY property, it returns 0.  If $KEY is
+    something else, it returns @c NULL and assigns an error code to
+    the external variable #merror_code.  */
  
 /***ja
     @brief ¥Õ¥©¥ó¥È¤Î¥×¥í¥Ñ¥Æ¥£¤ÎÃͤòÆÀ¤ë.