diff -Naur fontconfig-2.6.0.orig/conf.d/30-metric-aliases.conf fontconfig-2.6.0/conf.d/30-metric-aliases.conf
--- fontconfig-2.6.0.orig/conf.d/30-metric-aliases.conf 2007-11-06 00:38:03.000000000 +0100
+++ fontconfig-2.6.0/conf.d/30-metric-aliases.conf 2008-10-03 23:24:26.000000000 +0200
@@ -46,6 +46,12 @@
3) Alias each generic to its specifics.
eg. Arial to Liberation Sans, Albany, and Albany AMT
+
+ However, the AMT fonts are quite ugly and do not
+ render well on-screen, so we avoid matching them if
+ the application said `anymetrics'; in that case, a
+ more generic font with different metrics but better
+ appearance will be used.
-->
@@ -185,7 +191,7 @@
Liberation Sans
Albany
- Albany AMT
+
@@ -194,7 +200,7 @@
Liberation Serif
Thorndale
- Thorndale AMT
+
@@ -203,9 +209,42 @@
Liberation Mono
Cumberland
- Cumberland AMT
+
+
+
+ Times New Roman
+
+
+ true
+
+
+ Thorndale AMT
+
+
+
+
+ Arial
+
+
+ true
+
+
+ Albany AMT
+
+
+
+
+ Courier New
+
+
+ true
+
+
+ Cumberland AMT
+
+
diff -Naur fontconfig-2.6.0.orig/conf.d/30-urw-aliases.conf fontconfig-2.6.0/conf.d/30-urw-aliases.conf
--- fontconfig-2.6.0.orig/conf.d/30-urw-aliases.conf 2007-11-06 00:38:03.000000000 +0100
+++ fontconfig-2.6.0/conf.d/30-urw-aliases.conf 2008-10-03 23:24:26.000000000 +0200
@@ -5,6 +5,13 @@
URW provides metric and shape compatible fonts for some Adobe families.
Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
-->
+
+
+
+
+ Avant Garde
+
+
+ true
+
+
+ URW Gothic L
+
+
+
+
+ Bookman
+
+
+ true
+
+
+ URW Bookman L
+
+
+
+
+ Courier
+
+
+ true
+
+
+ Nimbus Mono L
+
+
+
+
+ Helvetica
+
+
+ true
+
+
+ Nimbus Sans L
+
+
+
+
+ New Century Schoolbook
+
+
+ true
+
+
+ Century Schoolbook L
+
+
+
+
+ Palatino
+
+
+ true
+
+
+ URW Palladio L
+
+
+
+
+ Times
+
+
+ true
+
+
+ Nimbus Roman No9 L
+
+
+
+
+ Zapf Chancery
+
+
+ true
+
+
+ URW Chancery L
+
+
+
+
+ Zapf Dingbats
+
+
+ true
+
+
+ Dingbats
+
+
Symbol
diff -Naur fontconfig-2.6.0.orig/conf.d/40-nonlatin.conf fontconfig-2.6.0/conf.d/40-nonlatin.conf
--- fontconfig-2.6.0.orig/conf.d/40-nonlatin.conf 2008-05-25 00:45:51.000000000 +0200
+++ fontconfig-2.6.0/conf.d/40-nonlatin.conf 2008-10-03 23:24:26.000000000 +0200
@@ -51,6 +51,7 @@
Baekmuk Dotum
SimSun
MgOpen Modata
+ MgOpen Moderna
Sazanami Gothic
AR PL ShanHeiSun Uni
ZYSong18030
diff -Naur fontconfig-2.6.0.orig/conf.d/Makefile.am fontconfig-2.6.0/conf.d/Makefile.am
--- fontconfig-2.6.0.orig/conf.d/Makefile.am 2008-01-10 19:43:05.000000000 +0100
+++ fontconfig-2.6.0/conf.d/Makefile.am 2008-10-03 23:24:26.000000000 +0200
@@ -25,7 +25,12 @@
README
CONF_FILES = \
+ 10-antialias.conf \
10-autohint.conf \
+ 10-hinting.conf \
+ 10-hinting-full.conf \
+ 10-hinting-medium.conf \
+ 10-hinting-slight.conf \
10-no-sub-pixel.conf \
10-sub-pixel-bgr.conf \
10-sub-pixel-rgb.conf \
@@ -42,6 +47,7 @@
49-sansserif.conf \
50-user.conf \
51-local.conf \
+ 53-monospace-lcd-filter.conf \
60-latin.conf \
65-fonts-persian.conf \
65-khmer.conf \
@@ -53,6 +59,10 @@
90-synthetic.conf
CONF_LINKS = \
+ 10-antialias.conf \
+ 10-hinting.conf \
+ 10-hinting-medium.conf \
+ 10-no-sub-pixel.conf \
20-fix-globaladvance.conf \
20-unhint-small-vera.conf \
30-urw-aliases.conf \
@@ -62,6 +72,7 @@
49-sansserif.conf \
50-user.conf \
51-local.conf \
+ 53-monospace-lcd-filter.conf \
60-latin.conf \
65-fonts-persian.conf \
65-nonlatin.conf \
diff -Naur fontconfig-2.6.0.orig/fontconfig/fontconfig.h fontconfig-2.6.0/fontconfig/fontconfig.h
--- fontconfig-2.6.0.orig/fontconfig/fontconfig.h 2008-06-01 04:24:34.000000000 +0200
+++ fontconfig-2.6.0/fontconfig/fontconfig.h 2008-10-03 23:24:26.000000000 +0200
@@ -112,6 +112,7 @@
#define FC_EMBEDDED_BITMAP "embeddedbitmap" /* Bool - true to enable embedded bitmaps */
#define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */
#define FC_LCD_FILTER "lcdfilter" /* Int */
+#define FC_ANY_METRICS "anymetrics" /* Bool - true to allow metrics which do not match the requested font */
#define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION
#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION
diff -Naur fontconfig-2.6.0.orig/src/fcint.h fontconfig-2.6.0/src/fcint.h
--- fontconfig-2.6.0.orig/src/fcint.h 2008-05-04 04:31:41.000000000 +0200
+++ fontconfig-2.6.0/src/fcint.h 2008-10-03 23:26:04.000000000 +0200
@@ -849,7 +849,8 @@
#define FC_EMBEDDED_BITMAP_OBJECT 39
#define FC_DECORATIVE_OBJECT 40
#define FC_LCD_FILTER_OBJECT 41
-#define FC_MAX_BASE_OBJECT FC_LCD_FILTER_OBJECT
+#define FC_ANY_METRICS_OBJECT 42
+#define FC_MAX_BASE_OBJECT FC_ANY_METRICS_OBJECT
FcPrivate FcBool
FcNameBool (const FcChar8 *v, FcBool *result);
diff -Naur fontconfig-2.6.0.orig/src/fcname.c fontconfig-2.6.0/src/fcname.c
--- fontconfig-2.6.0.orig/src/fcname.c 2008-05-04 04:31:41.000000000 +0200
+++ fontconfig-2.6.0/src/fcname.c 2008-10-03 23:28:53.000000000 +0200
@@ -76,6 +76,7 @@
{ FC_EMBEDDED_BITMAP, FcTypeBool },
{ FC_DECORATIVE, FcTypeBool },
{ FC_LCD_FILTER, FcTypeInteger }, /* 41 */
+ { FC_ANY_METRICS, FcTypeBool }, /* 42 */
};
#define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0])
@@ -440,6 +441,8 @@
{ (FcChar8 *) "lcddefault", "lcdfilter", FC_LCD_DEFAULT },
{ (FcChar8 *) "lcdlight", "lcdfilter", FC_LCD_LIGHT },
{ (FcChar8 *) "lcdlegacy", "lcdfilter", FC_LCD_LEGACY },
+ { (FcChar8 *) "lcdfilterlegacy","lcdfilter", FC_LCD_LEGACY },
+ { (FcChar8 *) "anymetrics", "anymetrics", FcTrue },
};
#define NUM_FC_CONSTANTS (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0])