(enum MTextLineBreakOption): New enum.

[m17n/m17n-lib.git] / src / m17n-gui.h

diff --git a/src/m17n-gui.h b/src/m17n-gui.h
index befc3cc..794b71a 100644 (file)
--- a/src/m17n-gui.h
+++ b/src/m17n-gui.h
@@ -149,13 +149,13 @@ extern MFont *mfont ();
 
 extern MFont *mfont_copy (MFont *font);
 
-extern MFont *mfont_parse_name (char *name, MSymbol format);
+extern MFont *mfont_parse_name (const char *name, MSymbol format);
 
 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 +163,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 Mfontfile;
 
 extern MSymbol Mfontconfig;
 
@@ -218,6 +221,10 @@ extern int mfont_resize_ratio (MFont *font);
 extern MPlist *mfont_list (MFrame *frame, MFont *font, MSymbol language,
                           int maxnum);
 
+typedef struct MFontset MFontset;
+
+extern int mfont_check (MFrame *frame, MFontset *fontset, MFont *font,
+                       MSymbol script, MSymbol language);
 
 /* end of font module */
 /*=*/
@@ -228,8 +235,6 @@ extern MPlist *mfont_list (MFrame *frame, MFont *font, MSymbol language,
 /*=*/
 /*** @addtogroup m17nFontset
      @{   */
-typedef struct MFontset MFontset;
-
 extern MFontset *mfontset (char *name);
 
 extern MSymbol mfontset_name (MFontset *fontset);
@@ -310,6 +315,8 @@ extern MSymbol Mface;
 
 extern MFace *mface ();
 
+extern int mface_equal (MFace *face1, MFace *face2);
+
 extern MFace *mface_copy (MFace *face);
 
 extern MFace *mface_merge (MFace *dst, MFace *src);
@@ -747,8 +754,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