X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-gui.h;h=b3f3dd28b5f09a802237653cd25c86ce4ad778c6;hb=5f8f274062adc55ae40c775de26aa10a2186ba78;hp=5878d92fc489d58530b95db6f576b13f5b3d0221;hpb=c07101285809cd18a120088bb4828350f51e0708;p=m17n%2Fm17n-lib.git

diff --git a/src/m17n-gui.h b/src/m17n-gui.h
index 5878d92..b3f3dd2 100644
--- a/src/m17n-gui.h
+++ b/src/m17n-gui.h
@@ -17,20 +17,21 @@
 
    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_
 #define _M17N_GUI_H_
 
+#ifndef _M17N_FLT_H_
+#include <m17n-flt.h>
+#endif
+
 #ifndef _M17N_H_
 #include <m17n.h>
 #endif
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+M17N_BEGIN_HEADER
 
 #if !defined (FOR_DOXYGEN) || defined (DOXYGEN_INTERNAL_MODULE)
 
@@ -155,7 +156,7 @@ extern char *mfont_unparse_name (MFont *font, MSymbol format);
 
 /* These two are obsolete (from 1.1.0).  */
 extern char *mfont_name (MFont *font);
-extern MFont *mfont_from_name (char *name);
+extern MFont *mfont_from_name (const char *name);
 
 extern MSymbol Mfoundry;
 extern MSymbol Mfamily;
@@ -163,9 +164,12 @@ extern MSymbol Mweight;
 extern MSymbol Mstyle;
 extern MSymbol Mstretch;
 extern MSymbol Madstyle;
+extern MSymbol Mspacing;
 extern MSymbol Mregistry;
 extern MSymbol Msize;
 extern MSymbol Mresolution;
+extern MSymbol Mmax_advance;
+extern MSymbol Motf;
 extern MSymbol Mfontfile;
 
 extern MSymbol Mfontconfig;
@@ -209,7 +213,6 @@ extern int mfont_set_encoding (MFont *font,
 
 extern MFont *mfont_find (MFrame *frame, MFont *spec,
 			  int *score, int limited_size);
-
 extern MSymbol *mfont_selection_priority ();
 
 extern int mfont_set_selection_priority (MSymbol *keys);
@@ -218,11 +221,20 @@ extern int mfont_resize_ratio (MFont *font);
 
 extern MPlist *mfont_list (MFrame *frame, MFont *font, MSymbol language,
 			   int maxnum);
+extern MPlist *mfont_list_family_names (MFrame *frame);
 
 typedef struct MFontset MFontset;
 
-extern int mfont_check (MFrame *frame, MFontset *fontset, MFont *font,
-			MSymbol script, MSymbol language);
+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 */
 /*=*/
@@ -399,15 +411,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);
 /*=*/
 
@@ -415,6 +423,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 */
@@ -689,6 +701,8 @@ typedef struct
 
 } MDrawControl;
 
+extern int mdraw_line_break_option;
+
 /*=*/
 
 /*** @ingroup m17nDraw */
@@ -752,8 +766,8 @@ typedef struct
       next_from because they must be the same as the members from and
       to respectively.  */
   /***ja ÏÀÍýŪ¤ÊÁ°¸å¤Î¥°¥ê¥Õ¤ËÂбþ¤¹¤ëʸ»ú¤ÎÈÏ°Ï¡£¥á¥ó¥Ð prev_to ¤È
-      next_from ¤Ï¡¢¤½¤ì¤¾¤ì¥á¥ó¥Ð from ¤Èto 
-      ¤ÈƱ¤¸¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¤¿¤áÉÔÍפǤ¢¤ë¡£  */
+      next_from ¤Ï¡¢¤½¤ì¤¾¤ì¥á¥ó¥Ð from ¤È to ¤ÈƱ¤¸¤Ç¤¢¤ë¤Ï¤º¤Ê¤Î¤ÇÉÔ
+      ÍפǤ¢¤ë¡£  */
   int prev_from, next_to;
 
   /***en Character ranges corresponding to visually left and right
@@ -974,9 +988,7 @@ extern MFace *mdebug_dump_face (MFace *face, int indent);
 extern MFont *mdebug_dump_font (MFont *font);
 extern MFontset *mdebug_dump_fontset (MFontset *fontset, int indent);
 
-#ifdef __cplusplus
-}
-#endif
+M17N_END_HEADER
 
 #endif /* _M17N_GUI_H_ */