(Ffind_coding_systems_region_internal): Include raw-text and

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

diff --git a/src/fontset.h b/src/fontset.h
index 899f83b..f33f4f3 100644 (file)
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -1,7 +1,7 @@
 /* Header for fontset handler.
    Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
-   Licensed to the Free Software Foundation.
-   Copyright (C) 2001, 2002
+     Licensed to the Free Software Foundation.
+   Copyright (C) 2003
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
@@ -43,7 +43,8 @@ struct font_info
   /* Full name of the font given by a window system.  */
   char *full_name;
 
-  /* Charset of characters displayed by the font.  */
+  /* Charset to encode a character code into a glyph code of the
+     font.  */
   int charset;
 
 #ifdef WINDOWSNT
@@ -90,7 +91,7 @@ struct font_info
      `ascent'.  In other words, the value indicates how many bits
      higher we should draw a character of the font than normal ASCII
      text for a better looking.
-       
+
      We also have to consider the fact that the concept of `baseline'
      differs among languages to which each character belongs.  For
      instance, baseline should be at the bottom most position of all
@@ -193,15 +194,16 @@ struct face;
 extern void free_face_fontset P_ ((FRAME_PTR, struct face *));
 extern Lisp_Object fontset_font_pattern P_ ((FRAME_PTR, struct face *, int));
 extern int face_suitable_for_char_p P_ ((struct face *, int));
-extern int face_for_char P_ ((FRAME_PTR, struct face *, int));
+extern int face_for_char P_ ((FRAME_PTR, struct face *, int,
+                             int, Lisp_Object));
 extern int make_fontset_for_ascii_face P_ ((FRAME_PTR, int, struct face *));
+extern int new_fontset_from_font_name P_ ((Lisp_Object));
 extern struct font_info *fs_load_font P_ ((struct frame *, char *, int));
 extern int fs_query_fontset P_ ((Lisp_Object, int));
 EXFUN (Fquery_fontset, 2);
 extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int));
 
-extern Lisp_Object Qfontset;
-extern Lisp_Object Vuse_default_ascent; 
+extern Lisp_Object Vuse_default_ascent;
 extern Lisp_Object Vignore_relative_composition;
 extern Lisp_Object Valternate_fontname_alist;
 extern Lisp_Object Vfontset_alias_alist;
@@ -212,7 +214,7 @@ extern Lisp_Object Vvertical_centering_font_regexp;
    struct font_info of the loaded font.  If loading fails, return
    NULL.  */
 
-#define FS_LOAD_FONT(f, fontname) fs_load_font (f, fontname, charset_ascii)
+#define FS_LOAD_FONT(f, fontname) fs_load_font (f, fontname, -1)
 
 
 /* Return an immutable id for font_info FONT_INFO on frame F.  The
@@ -236,3 +238,6 @@ extern Lisp_Object fontset_ascii P_ ((int));
 extern int fontset_height P_ ((int));
 
 #endif /* EMACS_FONTSET_H */
+
+/* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77
+   (do not change this comment) */