(QCspacing, QCdpi): Extern them.

(enum font_spacing): New enum.
(FONT_PIXEL_SIZE_QUANTUM): New macro.

diff --git a/src/font.h b/src/font.h
index f3bf84511624638538ec907e06ba04295d26c96a..34416bbf9ad992ba2f6fd14ecb4b4ea9ae352f47 100644 (file)
--- 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;