From f8657b39d37624a7d3aa7cd496f363a7ab76458f Mon Sep 17 00:00:00 2001
From: Kenichi Handa <handa@m17n.org>
Date: Mon, 19 Jun 2006 12:44:41 +0000
Subject: [PATCH] (QCspacing, QCdpi): Extern them. (enum font_spacing): New
 enum. (FONT_PIXEL_SIZE_QUANTUM): New macro.

---
 src/font.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/font.h b/src/font.h
index f3bf8451162..34416bbf9ad 100644
--- a/src/font.h
+++ b/src/font.h
@@ -128,7 +128,7 @@ enum font_property_index
     FONT_ENTITY_MAX
   };
 
-extern Lisp_Object QCotf, QClanguage, QCscript;
+extern Lisp_Object QCspacing, QCdpi, QCotf, QClanguage, QCscript;
 
 /* Important character set symbols.  */
 extern Lisp_Object Qiso8859_1, Qiso10646_1, Qunicode_bmp;
@@ -176,6 +176,14 @@ struct font
      font-driver.  */
 };
 
+enum font_spacing
+  {
+    FONT_SPACING_PROPORTIONAL = 0,
+    FONT_SPACING_DUAL = 90,
+    FONT_SPACING_MONO = 100,
+    FONT_SPACING_CHARCELL = 110
+  };
+
 struct font_metrics
 {
   short lbearing, rbearing, width, ascent, descent;
@@ -223,6 +231,10 @@ struct font_bitmap
     font = XSAVE_VALUE (x)->pointer;					\
   } while (0)
 
+/* Ignore the difference of font pixel sizes less than or equal to
+   this value.  */
+#define FONT_PIXEL_SIZE_QUANTUM 1
+
 struct face;
 struct composition;
 
-- 
2.39.5