From a1011d63ffb5cc4f41bf0f4622ee3f1493d419d9 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 29 Nov 2014 12:40:08 +0100 Subject: fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkbcomp xkeyboard-config git update 29 Nov 2014 xserver commit c52a2b1ebad56820af932dfbc871701a8b04fd9c libxcb commit bbca7b82f803fa13fd30a2891ec06f2a213a28c2 libxcb/xcb-proto commit 691d2b97e5989d6d7006304d81bd8fa128477ca1 xkeyboard-config commit b664d7fb8aab9b0f834dd9c81d273c7809561b34 libX11 commit f3831dde6972e4da9e018c6a5f4013d8756a5e78 xkbcomp commit 1e8ee9d0aad072f04186df84752f5636340574e0 fontconfig commit b732bf057f4b3ec3bac539803005e9c42d056b2a mesa commit 67c498086d0858a94d53ebb6921cfda847250368 --- fontconfig/conf.d/30-metric-aliases.conf | 94 ++++++++++++++++++++++++++++---- fontconfig/conf.d/45-latin.conf | 12 ++++ fontconfig/conf.d/60-latin.conf | 3 + 3 files changed, 98 insertions(+), 11 deletions(-) (limited to 'fontconfig/conf.d') diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf index 49a960247..cd1e9246d 100644 --- a/fontconfig/conf.d/30-metric-aliases.conf +++ b/fontconfig/conf.d/30-metric-aliases.conf @@ -6,17 +6,17 @@ 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 +PostScript fonts: URW fonts: GUST fonts: Windows fonts: +====================== ====================== ================= ================== +Helvetica Nimbus Sans TeX Gyre Heros +Helvetica Condensed Nimbus Sans Narrow TeX Gyre Heros Cn +Times Nimbus Roman TeX Gyre Termes +Courier Nimbus Mono TeX Gyre Cursor +ITC Avant Garde Gothic URW Gothic TeX Gyre Adventor +ITC Bookman Bookman URW TeX Gyre Bonum Bookman Old Style +ITC Zapf Chancery Chancery URW TeX Gyre Chorus +Palatino Palladio URW TeX Gyre Pagella Palatino Linotype +New Century Schoolbook Century SchoolBook URW TeX Gyre Schola Century Schoolbook Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fonts: AMT fonts: ================ ====================== ======================= ================= ============== @@ -56,6 +56,13 @@ but in an order preferring similar designs first. We do this in three steps: + + Nimbus Sans + + Helvetica + + + TeX Gyre Heros @@ -63,6 +70,13 @@ but in an order preferring similar designs first. We do this in three steps: + + Nimbus Sans Narrow + + Helvetica Condensed + + + TeX Gyre Heros Cn @@ -77,6 +91,13 @@ but in an order preferring similar designs first. We do this in three steps: + + Nimbus Roman + + Times + + + TeX Gyre Termes @@ -91,6 +112,13 @@ but in an order preferring similar designs first. We do this in three steps: + + Nimbus Mono + + Courier + + + TeX Gyre Cursor @@ -112,6 +140,13 @@ but in an order preferring similar designs first. We do this in three steps: + + URW Gothic + + ITC Avant Garde Gothic + + + TeX Gyre Adventor @@ -133,6 +168,13 @@ but in an order preferring similar designs first. We do this in three steps: + + Bookman URW + + ITC Bookman + + + TeX Gyre Bonum @@ -161,6 +203,13 @@ but in an order preferring similar designs first. We do this in three steps: + + Chancery URW + + ITC Zapf Chancery + + + TeX Gyre Chorus @@ -175,6 +224,13 @@ but in an order preferring similar designs first. We do this in three steps: + + Palladio URW + + Palatino + + + TeX Gyre Pagella @@ -196,6 +252,13 @@ but in an order preferring similar designs first. We do this in three steps: + + Century SchoolBook URW + + New Century Schoolbook + + + TeX Gyre Schola @@ -401,6 +464,7 @@ but in an order preferring similar designs first. We do this in three steps: Helvetica TeX Gyre Heros + Nimbus Sans Nimbus Sans L @@ -409,6 +473,7 @@ but in an order preferring similar designs first. We do this in three steps: Helvetica Condensed TeX Gyre Heros Cn + Nimbus Sans Narrow @@ -416,6 +481,7 @@ but in an order preferring similar designs first. We do this in three steps: Times TeX Gyre Termes + Nimbus Roman Nimbus Roman No9 L @@ -424,6 +490,7 @@ but in an order preferring similar designs first. We do this in three steps: Courier TeX Gyre Cursor + Nimbus Mono Nimbus Mono L @@ -432,6 +499,7 @@ but in an order preferring similar designs first. We do this in three steps: ITC Avant Garde Gothic TeX Gyre Adventor + URW Gothic URW Gothic L @@ -441,6 +509,7 @@ but in an order preferring similar designs first. We do this in three steps: Bookman Old Style TeX Gyre Bonum + Bookman URW URW Bookman L @@ -449,6 +518,7 @@ but in an order preferring similar designs first. We do this in three steps: ITC Zapf Chancery TeX Gyre Chorus + Chancery URW URW Chancery L @@ -458,6 +528,7 @@ but in an order preferring similar designs first. We do this in three steps: Palatino Linotype TeX Gyre Pagella + Palladio URW URW Palladio L @@ -467,6 +538,7 @@ but in an order preferring similar designs first. We do this in three steps: Century Schoolbook TeX Gyre Schola + Century SchoolBook URW Century Schoolbook L diff --git a/fontconfig/conf.d/45-latin.conf b/fontconfig/conf.d/45-latin.conf index 996fb81e6..72490f328 100644 --- a/fontconfig/conf.d/45-latin.conf +++ b/fontconfig/conf.d/45-latin.conf @@ -33,6 +33,10 @@ Nimbus Roman No9 L serif + + Nimbus Roman + serif + Luxi Serif serif @@ -96,6 +100,10 @@ Nimbus Sans L sans-serif + + Nimbus Sans + sans-serif + Luxi Sans sans-serif @@ -151,6 +159,10 @@ Nimbus Mono L monospace + + Nimbus Mono + monospace + diff --git a/fontconfig/conf.d/60-latin.conf b/fontconfig/conf.d/60-latin.conf index 2107e31e4..35600ea08 100644 --- a/fontconfig/conf.d/60-latin.conf +++ b/fontconfig/conf.d/60-latin.conf @@ -10,6 +10,7 @@ Thorndale AMT Luxi Serif Nimbus Roman No9 L + Nimbus Roman Times @@ -23,6 +24,7 @@ Albany AMT Luxi Sans Nimbus Sans L + Nimbus Sans Helvetica Lucida Sans Unicode BPG Glaho International @@ -40,6 +42,7 @@ Cumberland AMT Luxi Mono Nimbus Mono L + Nimbus Mono Courier -- cgit v1.2.3