X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-gui.h;h=d73b7e0f25ce566423098c8ff2a72ba570ff1625;hb=0793e3bffb93b37b42eab1223c19ffc70c4ba1ae;hp=43dc893dee3500400bb50db25fe77d8707e533bf;hpb=c5691bd4c55f9dc3715a78ab9981c5773632192b;p=m17n%2Fm17n-lib.git

diff --git a/src/m17n-gui.h b/src/m17n-gui.h
index 43dc893..d73b7e0 100644
--- a/src/m17n-gui.h
+++ b/src/m17n-gui.h
@@ -17,7 +17,7 @@
 
    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_GUI_H_
@@ -168,6 +168,7 @@ extern MSymbol Mregistry;
 extern MSymbol Msize;
 extern MSymbol Mresolution;
 extern MSymbol Mmax_advance;
+extern MSymbol Motf;
 extern MSymbol Mfontfile;
 
 extern MSymbol Mfontconfig;
@@ -226,6 +227,14 @@ typedef struct MFontset MFontset;
 extern int mfont_check (MFrame *frame, MFontset *fontset,
 			MSymbol script, MSymbol language, MFont *font);
 
+extern int mfont_match_p (MFont *font, MFont *spec);
+
+extern MFont *mfont_open (MFrame *frame, MFont *font);
+
+extern MFont *mfont_encapsulate (MFrame *frame, MSymbol data_type, void *data);
+
+extern int mfont_close (MFont *font);
+
 /* end of font module */
 /*=*/
 
@@ -401,15 +410,11 @@ typedef struct
 /***en
     @brief Type of hook function of face.
 
-    The type #MFaceHookFunc is to specify the #Mhook property of a
-    face.  The value of the property must be function of this
-    type.  */
+    #MFaceHookFunc is a type of a hook function of a face.  */
 /***ja
     @brief ¥Õ¥§¡¼¥¹¤Î¥Õ¥Ã¥¯´Ø¿ô¤Î·¿Àë¸À.
 
-    #MFaceHookFunc ¤Ï¥Õ¥§¡¼¥¹¤Î #Mhook ¥×¥í¥Ñ¥Æ¥£¤ò»ØÄꤹ¤ë·¿¤Ç¤¢¤ë¡£
-    ¤³¤Î¥×¥í¥Ñ¥Æ¥£¤ÎÃͤϡ¢¤³¤Î·¿¤Î´Ø¿ô¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
-      */
+    #MFaceHookFunc ¤Ï¥Õ¥§¡¼¥¹¤Î¥Õ¥Ã¥¯´Ø¿ô¤Î·¿¤Ç¤¢¤ë¡£*/
 typedef void (*MFaceHookFunc) (MFace *face, void *arg, void *info);
 /*=*/
 
@@ -417,6 +422,10 @@ extern void *mface_get_prop (MFace *face, MSymbol key);
 
 extern int mface_put_prop (MFace *face, MSymbol key, void *val);
 
+extern MFaceHookFunc mface_get_hook (MFace *face);
+
+extern int mface_put_hook (MFace *face, MFaceHookFunc func);
+
 extern void mface_update (MFrame *frame, MFace *face);
 
 /* end of face module */