* keyboard.c (kbd_buffer_get_event): Null-check used_mouse_menu.

[bpt/emacs.git] / src / font.h

diff --git a/src/font.h b/src/font.h
index 17b96cd..c260777 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -68,8 +68,8 @@ struct glyph_string;
 enum font_property_index
   {
     /* FONT-TYPE is a symbol indicating a font backend; currently `x',
-       `xft', `ftx' are available on X, gdi on Windows, and ns under
-       Cocoa / GNUstep.  */
+       `xft', `ftx' are available on X, `uniscribe' and `gdi' on
+       Windows, and `ns' under Cocoa / GNUstep.  */
     FONT_TYPE_INDEX,
 
     /* FONT-FOUNDRY is a foundry name (symbol).  */
@@ -152,7 +152,7 @@ enum font_property_index
     /* In a font-spec, the value is an alist of extra information of a
        font such as name, OpenType features, and language coverage.
        In addition, in a font-entity, the value may contain a pair
-       (font-entity . INFO) where INFO is extra infomation to identify
+       (font-entity . INFO) where INFO is extra information to identify
        a font (font-driver dependent).  */
     FONT_EXTRA_INDEX,          /* alist                alist */
 
@@ -169,7 +169,7 @@ enum font_property_index
 
     /* XLFD name of the font (string). */
     FONT_NAME_INDEX = FONT_ENTITY_MAX,
-    
+
     /* Full name of the font (string).  It is the name extracted from
        the opend font, and may be different from the above.  It may be
        nil if the opened font doesn't give a name.  */
@@ -240,6 +240,9 @@ extern Lisp_Object QCavgwidth, QCfont_entity, QCfc_unknown_spec;
 extern Lisp_Object Qascii_0;
 extern Lisp_Object Qiso8859_1, Qiso10646_1, Qunicode_bmp, Qunicode_sip;
 
+/* Special ADSTYLE properties to avoid fonts used for Latin characters.  */
+extern Lisp_Object Qja, Qko;
+
 /* Structure for a font-spec.  */
 
 struct font_spec
@@ -647,7 +650,7 @@ struct font_driver
      makes some data specific to F and stores it in F by calling
      font_put_frame_data ().  */
   int (*start_for_frame) P_ ((FRAME_PTR f));
-  
+
   /* Optional.
      End using the driver for frame F.  Usually this function free
      some data stored for F.  */
@@ -738,7 +741,7 @@ extern int font_style_to_value P_ ((enum font_property_index prop,
 extern Lisp_Object font_style_symbolic P_ ((Lisp_Object font,
                                            enum font_property_index prop,
                                            int for_face));
-                           
+
 extern int font_match_p P_ ((Lisp_Object spec, Lisp_Object font));
 extern Lisp_Object font_list_entities P_ ((Lisp_Object frame,
                                           Lisp_Object spec));
@@ -762,6 +765,7 @@ extern Lisp_Object font_load_for_lface P_ ((FRAME_PTR f, Lisp_Object *lface,
 extern void font_prepare_for_face P_ ((FRAME_PTR f, struct face *face));
 extern void font_done_for_face P_ ((FRAME_PTR f, struct face *face));
 
+extern Lisp_Object font_open_by_spec P_ ((FRAME_PTR f, Lisp_Object spec));
 extern Lisp_Object font_open_by_name P_ ((FRAME_PTR f, char *name));
 extern void font_close_object (FRAME_PTR f, Lisp_Object font_object);