From 55c05b8a12944349b00053253d3a49b223a9f4de Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 20 Sep 2013 11:47:27 +0200
Subject: fontconfig mesa pixman git update 20 Sep 2013
pixman commit aa5c45254eb60ce4c85a25b5343474fb160ffa7c
fontconfig commit 643f8088f0d51107e58d142df47124efec6afab1
mesa commit 1cc3b90d47f92aa0be2d914191fd2f46d2b127d7
---
fontconfig/conf.d/30-metric-aliases.conf | 319 +++++++++++++++++++++++++------
fontconfig/conf.d/30-urw-aliases.conf | 24 +--
fontconfig/src/fcmatch.c | 6 +-
3 files changed, 265 insertions(+), 84 deletions(-)
(limited to 'fontconfig')
diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf
index 0fd0b8a0c..d0d9ea2e0 100644
--- a/fontconfig/conf.d/30-metric-aliases.conf
+++ b/fontconfig/conf.d/30-metric-aliases.conf
@@ -2,57 +2,46 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
- <!-- Alias similar/metric-compatible families from various sources:
-
- PostScript fonts:
- Helvetica
- Times
- Courier
- URW fonts:
- Nimbus Sans L
- Nimbus Roman No9 L
- Nimbus Mono L
-
- Microsoft fonts:
- Arial
- Arial Narrow
- Times New Roman
- Courier New
- Liberation fonts:
- Liberation Sans
- Liberation Sans Narrow
- Liberation Serif
- Liberation Mono
- StarOffice fonts:
- Albany
- Thorndale
- Cumberland
- AMT fonts:
- Albany AMT
- Thorndale AMT
- Cumberland AMT
- Google CrOS Core fonts:
- Arimo
- Cousine
- Tinos
-
- Of these, URW fonts are design compatible with PostScrict fonts,
- and the Liberation, StarOffice, AMT and CrOS Core ones are
- compatible with Microsoft fonts.
-
- We want for each of them to fallback to any of these
- available, but in an order preferring similar designs
- first. We do this in three steps:
-
- 1) Alias each specific to it's generic family.
- eg. Liberation Sans to Arial
-
- 2) Weak alias each generic to the other generic of its family.
- eg. Arial to Helvetica
-
- 3) Alias each generic to its specifics.
- eg. Arial to Liberation Sans, Albany, and Albany AMT
- -->
+<!--
+
+Alias similar/metric-compatible families from various sources:
+
+PostScript fonts: URW fonts: GUST fonts: Windows fonts:
+====================== ==================== ================= ==================
+Helvetica Nimbus Sans L TeX Gyre Heros
+Helvetica Condensed TeX Gyre Heros Cn
+Times Nimbus Roman No9 L TeX Gyre Termes
+Courier Nimbus Mono L TeX Gyre Cursor
+ITC Avant Garde Gothic URW Gothic L TeX Gyre Adventor
+ITC Bookman URW Bookman L TeX Gyre Bonum Bookman Old Style
+ITC Zapf Chancery URW Chancery L TeX Gyre Chorus
+Palatino URW Palladio L TeX Gyre Pagella Palatino Linotype
+New Century Schoolbook Century Schoolbook L TeX Gyre Schola Century Schoolbook
+
+Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fonts: AMT fonts:
+================ ====================== ======================= ================= ==============
+Arial Liberation Sans Arimo Albany Albany AMT
+Arial Narrow Liberation Sans Narrow
+Times New Roman Liberation Serif Cousine Thorndale Thorndale AMT
+Courier New Liberation Mono Tinos Cumberland Cumberland AMT
+
+Microsoft fonts: Other fonts:
+================ ============
+Georgia Gelasio
+
+We want for each of them to fallback to any of these available,
+but in an order preferring similar designs first. We do this in three steps:
+
+1) Alias each specific to its generic family.
+ e.g. Liberation Sans to Arial
+
+2) Weak alias each generic to the other generic of its family.
+ e.g. Arial to Helvetica
+
+3) Alias each generic to its specifics.
+ e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT
+
+-->
<!-- Map specifics to generics -->
@@ -64,6 +53,20 @@
</default>
</alias>
+ <alias binding="same">
+ <family>TeX Gyre Heros</family>
+ <default>
+ <family>Helvetica</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>TeX Gyre Heros Cn</family>
+ <default>
+ <family>Helvetica Condensed</family>
+ </default>
+ </alias>
+
<alias binding="same">
<family>Nimbus Roman No9 L</family>
<default>
@@ -71,6 +74,13 @@
</default>
</alias>
+ <alias binding="same">
+ <family>TeX Gyre Termes</family>
+ <default>
+ <family>Times</family>
+ </default>
+ </alias>
+
<alias binding="same">
<family>Nimbus Mono L</family>
<default>
@@ -78,6 +88,125 @@
</default>
</alias>
+ <alias binding="same">
+ <family>TeX Gyre Cursor</family>
+ <default>
+ <family>Courier</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>Avant Garde</family>
+ <default>
+ <family>ITC Avant Garde Gothic</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>URW Gothic L</family>
+ <default>
+ <family>ITC Avant Garde Gothic</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>TeX Gyre Adventor</family>
+ <default>
+ <family>ITC Avant Garde Gothic</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>Bookman</family>
+ <default>
+ <family>ITC Bookman</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>URW Bookman L</family>
+ <default>
+ <family>ITC Bookman</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>TeX Gyre Bonum</family>
+ <default>
+ <family>ITC Bookman</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>Bookman Old Style</family>
+ <default>
+ <family>ITC Bookman</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>Zapf Chancery</family>
+ <default>
+ <family>ITC Zapf Chancery</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>URW Chancery L</family>
+ <default>
+ <family>ITC Zapf Chancery</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>TeX Gyre Chorus</family>
+ <default>
+ <family>ITC Zapf Chancery</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>URW Palladio L</family>
+ <default>
+ <family>Palatino</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>TeX Gyre Pagella</family>
+ <default>
+ <family>Palatino</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>Palatino Linotype</family>
+ <default>
+ <family>Palatino</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>Century Schoolbook L</family>
+ <default>
+ <family>New Century Schoolbook</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>TeX Gyre Schola</family>
+ <default>
+ <family>New Century Schoolbook</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
+ <family>Century Schoolbook</family>
+ <default>
+ <family>New Century Schoolbook</family>
+ </default>
+ </alias>
+
<!-- Microsoft -->
<alias binding="same">
@@ -171,10 +300,16 @@
</default>
</alias>
+ <alias binding="same">
+ <family>Gelasio</family>
+ <default>
+ <family>Georgia</family>
+ </default>
+ </alias>
-<!-- Accept the other group as fallback -->
+<!-- Accept the other group as fallback -->
<!-- PostScript -->
<alias>
@@ -184,6 +319,13 @@
</default>
</alias>
+ <alias>
+ <family>Helvetica Condensed</family>
+ <default>
+ <family>Arial Narrow</family>
+ </default>
+ </alias>
+
<alias>
<family>Times</family>
<default>
@@ -207,6 +349,13 @@
</default>
</alias>
+ <alias>
+ <family>Arial Narrow</family>
+ <default>
+ <family>Helvetica Condensed</family>
+ </default>
+ </alias>
+
<alias>
<family>Times New Roman</family>
<default>
@@ -225,7 +374,6 @@
<!-- Map generics to specifics -->
-
<!-- PostScript -->
<alias binding="same">
<family>Helvetica</family>
@@ -235,6 +383,13 @@
</accept>
</alias>
+ <alias binding="same">
+ <family>Helvetica Condensed</family>
+ <accept>
+ <family>TeX Gyre Heros Cn</family>
+ </accept>
+ </alias>
+
<alias binding="same">
<family>Times</family>
<accept>
@@ -246,16 +401,58 @@
<alias binding="same">
<family>Courier</family>
<accept>
+ <family>TeX Gyre Cursor</family>
<family>Nimbus Mono L</family>
</accept>
</alias>
+ <alias binding="same">
+ <family>ITC Avant Garde Gothic</family>
+ <accept>
+ <family>TeX Gyre Adventor</family>
+ <family>URW Gothic L</family>
+ </accept>
+ </alias>
+
+ <alias binding="same">
+ <family>ITC Bookman</family>
+ <accept>
+ <family>Bookman Old Style</family>
+ <family>TeX Gyre Bonum</family>
+ <family>URW Bookman L</family>
+ </accept>
+ </alias>
+
+ <alias binding="same">
+ <family>ITC Zapf Chancery</family>
+ <accept>
+ <family>TeX Gyre Chorus</family>
+ <family>URW Chancery L</family>
+ </accept>
+ </alias>
+
+ <alias binding="same">
+ <family>Palatino</family>
+ <accept>
+ <family>Palatino Linotype</family>
+ <family>TeX Gyre Pagella</family>
+ <family>URW Palladio L</family>
+ </accept>
+ </alias>
+
+ <alias binding="same">
+ <family>New Century Schoolbook</family>
+ <accept>
+ <family>Century Schoolbook</family>
+ <family>TeX Gyre Schola</family>
+ <family>Century Schoolbook L</family>
+ </accept>
+ </alias>
<!-- Microsoft -->
<alias binding="same">
<family>Arial</family>
<accept>
- <family>TeX Gyre Heros</family>
<family>Arimo</family>
<family>Liberation Sans</family>
<family>Albany</family>
@@ -273,7 +470,6 @@
<alias binding="same">
<family>Times New Roman</family>
<accept>
- <family>TeX Gyre Termes</family>
<family>Tinos</family>
<family>Liberation Serif</family>
<family>Thorndale</family>
@@ -281,13 +477,6 @@
</accept>
</alias>
- <alias binding="same">
- <family>Georgia</family>
- <accept>
- <family>Gelasio</family>
- </accept>
- </alias>
-
<alias binding="same">
<family>Courier New</family>
<accept>
@@ -298,5 +487,11 @@
</accept>
</alias>
+ <alias binding="same">
+ <family>Georgia</family>
+ <accept>
+ <family>Gelasio</family>
+ </accept>
+ </alias>
</fontconfig>
diff --git a/fontconfig/conf.d/30-urw-aliases.conf b/fontconfig/conf.d/30-urw-aliases.conf
index aae06acd6..e0d45da87 100644
--- a/fontconfig/conf.d/30-urw-aliases.conf
+++ b/fontconfig/conf.d/30-urw-aliases.conf
@@ -3,30 +3,14 @@
<fontconfig>
<!--
URW provides metric and shape compatible fonts for some Adobe families.
- Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
+ Most of these are handled in 30-metric-aliases.conf.
-->
<alias binding="same">
- <family>Avant Garde</family>
- <accept><family>URW Gothic L</family></accept>
- </alias>
- <alias binding="same">
- <family>Bookman</family>
- <accept><family>URW Bookman L</family></accept>
- </alias>
- <alias binding="same">
- <family>New Century Schoolbook</family>
- <accept><family>Century Schoolbook L</family></accept>
- </alias>
- <alias binding="same">
- <family>Palatino</family>
- <accept><family>URW Palladio L</family></accept>
- </alias>
- <alias binding="same">
- <family>Zapf Chancery</family>
- <accept><family>URW Chancery L</family></accept>
+ <family>Zapf Dingbats</family>
+ <accept><family>Dingbats</family></accept>
</alias>
<alias binding="same">
- <family>Zapf Dingbats</family>
+ <family>ITC Zapf Dingbats</family>
<accept><family>Dingbats</family></accept>
</alias>
<match target="pattern">
diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c
index dec92b9cf..627aa1a16 100644
--- a/fontconfig/src/fcmatch.c
+++ b/fontconfig/src/fcmatch.c
@@ -552,14 +552,16 @@ FcFontRenderPrepare (FcConfig *config,
continue;
}
+ FcPatternObjectAdd (new, fe->object, v, FcFalse);
}
else
{
if (fel)
goto copy_lang;
- v = FcValueCanonicalize(&FcPatternEltValues (fe)->value);
+ FcPatternObjectListAdd (new, fe->object,
+ FcValueListDuplicate (FcPatternEltValues (fe)),
+ FcTrue);
}
- FcPatternObjectAdd (new, fe->object, v, FcFalse);
}
for (i = 0; i < pat->num; i++)
{
--
cgit v1.2.3