summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alla@lysator.liu.se>2001-11-18 20:37:21 +0000
committerAlexander Larsson <alexl@src.gnome.org>2001-11-18 20:37:21 +0000
commit1a13cdaaa5b3105902833d4549843942dad9dd72 (patch)
tree474b21feca09b52c0af3a2067652d228a454def8
parent0f9190e747eff446bd8d1faeccf97d54c760b34a (diff)
downloadpango-1a13cdaaa5b3105902833d4549843942dad9dd72.tar.gz
Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
2001-11-18 Alexander Larsson <alla@lysator.liu.se> * pango/pangoxft-fontmap.c: Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-05
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-25
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/pangoxft-fontmap.c8
8 files changed, 43 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 10f16b3d..6566c476 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-18 Alexander Larsson <alla@lysator.liu.se>
+
+ * pango/pangoxft-fontmap.c:
+ Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
+
2001-11-17 Alexander Larsson <alla@lysator.liu.se>
* configure.in:
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 10f16b3d..6566c476 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+2001-11-18 Alexander Larsson <alla@lysator.liu.se>
+
+ * pango/pangoxft-fontmap.c:
+ Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
+
2001-11-17 Alexander Larsson <alla@lysator.liu.se>
* configure.in:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 10f16b3d..6566c476 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2001-11-18 Alexander Larsson <alla@lysator.liu.se>
+
+ * pango/pangoxft-fontmap.c:
+ Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
+
2001-11-17 Alexander Larsson <alla@lysator.liu.se>
* configure.in:
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 10f16b3d..6566c476 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+2001-11-18 Alexander Larsson <alla@lysator.liu.se>
+
+ * pango/pangoxft-fontmap.c:
+ Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
+
2001-11-17 Alexander Larsson <alla@lysator.liu.se>
* configure.in:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 10f16b3d..6566c476 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2001-11-18 Alexander Larsson <alla@lysator.liu.se>
+
+ * pango/pangoxft-fontmap.c:
+ Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
+
2001-11-17 Alexander Larsson <alla@lysator.liu.se>
* configure.in:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 10f16b3d..6566c476 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2001-11-18 Alexander Larsson <alla@lysator.liu.se>
+
+ * pango/pangoxft-fontmap.c:
+ Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
+
2001-11-17 Alexander Larsson <alla@lysator.liu.se>
* configure.in:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 10f16b3d..6566c476 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2001-11-18 Alexander Larsson <alla@lysator.liu.se>
+
+ * pango/pangoxft-fontmap.c:
+ Add XFT_MATRIX and XFT_MINSPACE macro definitions if missing.
+
2001-11-17 Alexander Larsson <alla@lysator.liu.se>
* configure.in:
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c
index 6715ebb4..b159a56a 100644
--- a/pango/pangoxft-fontmap.c
+++ b/pango/pangoxft-fontmap.c
@@ -29,6 +29,14 @@
#include "X11/Xft/Xft.h"
#include "X11/Xft/XftFreetype.h"
+#ifndef XFT_MINSPACE
+#define XFT_MINSPACE "minspace" /* Bool use minimum line spacing */
+#endif
+
+#ifndef XFT_MATRIX
+#define XFT_MATRIX "matrix" /* XftMatrix */
+#endif
+
/* Number of freed fonts */
#define MAX_FREED_FONTS 16