(function*, case, ecase, typecase, etypecase, progv, lexical-let, lexical-let*,

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

diff --git a/src/fontset.h b/src/fontset.h
index 031fdbb..eee5e51 100644 (file)
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -19,8 +19,8 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifndef _FONTSET_H
-#define _FONTSET_H
+#ifndef EMACS_FONTSET_H
+#define EMACS_FONTSET_H
 
 /* This data type is used for the font_table field of window system
    depending data area (e.g. struct x_display_info on X window).  */
@@ -43,6 +43,11 @@ struct font_info
   /* Charset of characters displayed by the font.  */
   int charset;
 
+#ifdef WINDOWSNT
+  /* Codepage of characters that will be displayed by the font.  */
+  int codepage;
+#endif
+
   /* Maximum bound width over all existing characters of the font.  On
      X window, this is same as (font->max_bounds.width) */
   int size;
@@ -51,6 +56,12 @@ struct font_info
      (font->ascent + font->descent).  */
   int height;
 
+  /* Width of the space glyph of the font.  */
+  int space_width;
+
+  /* Average width of glyphs in the font.  */
+  int average_width;
+
   /* 1 iff `vertical-centering-font-regexp' matches this font name.
      In this case, we render characters at vartical center positions
      of lines.  */
@@ -92,7 +103,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
@@ -178,11 +189,12 @@ extern void (*check_window_system_func) P_ ((void));
 
 struct face;
 
-extern void fs_free_face_fontset P_ ((FRAME_PTR, struct face *));
+extern void free_face_fontset P_ ((FRAME_PTR, struct face *));
 extern Lisp_Object fontset_font_pattern P_ ((FRAME_PTR, int, 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 make_fontset_for_ascii_face P_ ((FRAME_PTR, int));
+extern void set_default_ascii_font P_ ((Lisp_Object));
 extern struct font_info *fs_load_font P_ ((struct frame *, int, char *, int,
                                           struct face *));
 extern int fs_query_fontset P_ ((Lisp_Object, int));
@@ -190,12 +202,10 @@ 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;
-extern Lisp_Object Vhighlight_wrong_size_font;
-extern Lisp_Object Vclip_large_size_font;
 extern Lisp_Object Vvertical_centering_font_regexp;
 
 /* Load a font named FONTNAME for displaying character C.  All fonts
@@ -232,4 +242,7 @@ extern Lisp_Object fontset_name P_ ((int));
 extern Lisp_Object fontset_ascii P_ ((int));
 extern int fontset_height P_ ((int));
 
-#endif /* _FONTSET_H */
+#endif /* EMACS_FONTSET_H */
+
+/* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77
+   (do not change this comment) */