Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-54

[gnu-emacs] / src / fontset.h

diff --git a/src/fontset.h b/src/fontset.h
index f33f4f38ef1a57cf99b9370825dcf79265da1e4b..ec9552ef436d807ed8153e49bc38265a8b7fa557 100644 (file)
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -1,6 +1,9 @@
 /* Header for fontset handler.
-   Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
-     Licensed to the Free Software Foundation.
+   Copyright (C) 1998, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
    Copyright (C) 2003
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
@@ -19,8 +22,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef EMACS_FONTSET_H
 #define EMACS_FONTSET_H
@@ -60,6 +63,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.  */
@@ -198,6 +207,7 @@ 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 void set_default_ascii_font 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);