aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/conf.d
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-02-22 09:17:57 +0100
committermarha <marha@users.sourceforge.net>2012-02-22 09:17:57 +0100
commit6baac61e6ca9cd314e689dfe7f84771aad08c66e (patch)
tree2a8a059fc83d3f7acc1034071ed3a9f7ff3c0027 /fontconfig/conf.d
parent0ae7710db53515dab4a35c33ba9a030bbfc2ac5b (diff)
downloadvcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.tar.gz
vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.tar.bz2
vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.zip
fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012
Diffstat (limited to 'fontconfig/conf.d')
-rw-r--r--fontconfig/conf.d/30-metric-aliases.conf36
-rw-r--r--fontconfig/conf.d/40-nonlatin.conf143
-rw-r--r--fontconfig/conf.d/45-latin.conf96
-rw-r--r--fontconfig/conf.d/65-nonlatin.conf27
4 files changed, 289 insertions, 13 deletions
diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf
index 702a495ea..4202ae92e 100644
--- a/fontconfig/conf.d/30-metric-aliases.conf
+++ b/fontconfig/conf.d/30-metric-aliases.conf
@@ -76,7 +76,19 @@
<!-- Microsoft -->
<alias binding="same">
<family>Liberation Sans</family>
+ <default>
+ <family>Arial</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
<family>Albany</family>
+ <default>
+ <family>Arial</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
<family>Albany AMT</family>
<default>
<family>Arial</family>
@@ -85,7 +97,19 @@
<alias binding="same">
<family>Liberation Serif</family>
+ <default>
+ <family>Times New Roman</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
<family>Thorndale</family>
+ <default>
+ <family>Times New Roman</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
<family>Thorndale AMT</family>
<default>
<family>Times New Roman</family>
@@ -94,7 +118,19 @@
<alias binding="same">
<family>Liberation Mono</family>
+ <default>
+ <family>Courier New</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
<family>Cumberland</family>
+ <default>
+ <family>Courier New</family>
+ </default>
+ </alias>
+
+ <alias binding="same">
<family>Cumberland AMT</family>
<default>
<family>Courier New</family>
diff --git a/fontconfig/conf.d/40-nonlatin.conf b/fontconfig/conf.d/40-nonlatin.conf
index a875db08c..1208a6ebf 100644
--- a/fontconfig/conf.d/40-nonlatin.conf
+++ b/fontconfig/conf.d/40-nonlatin.conf
@@ -11,23 +11,81 @@
-->
<alias>
<family>Nazli</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Lotoos</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Mitra</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Ferdosi</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Badr</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Zar</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Titr</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Jadid</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Kochi Mincho</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>AR PL SungtiL GB</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>AR PL Mingti2L Big5</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>MS 明朝</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
+ <family>NanumMyeongjo</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>UnBatang</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Baekmuk Batang</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>MgOpen Canonica</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Sazanami Mincho</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>AR PL ZenKai Uni</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>ZYSong18030</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>FreeSerif</family>
<default><family>serif</family></default>
</alias>
@@ -36,33 +94,104 @@
-->
<alias>
<family>Arshia</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Elham</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Farnaz</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Nasim</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Sina</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Roya</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Koodak</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Terafik</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Kochi Gothic</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>AR PL KaitiM GB</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>AR PL KaitiM Big5</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>MS ゴシック</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
+ <family>NanumGothic</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>UnDotum</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Baekmuk Dotum</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>SimSun</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>MgOpen Modata</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Sazanami Gothic</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>AR PL ShanHeiSun Uni</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>ZYSong18030</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>FreeSans</family>
<default><family>sans-serif</family></default>
</alias>
<!--
Monospace faces
-->
- <alias>
+ <alias>
<family>NSimSun</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>ZYSong18030</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
+ <family>NanumGothicCoding</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>FreeMono</family>
<default><family>monospace</family></default>
</alias>
@@ -72,8 +201,17 @@
-->
<alias>
<family>Homa</family>
+ <default><family>fantasy</family></default>
+ </alias>
+ <alias>
<family>Kamran</family>
+ <default><family>fantasy</family></default>
+ </alias>
+ <alias>
<family>Fantezi</family>
+ <default><family>fantasy</family></default>
+ </alias>
+ <alias>
<family>Tabassom</family>
<default><family>fantasy</family></default>
</alias>
@@ -83,6 +221,9 @@
-->
<alias>
<family>IranNastaliq</family>
+ <default><family>cursive</family></default>
+ </alias>
+ <alias>
<family>Nafees Nastaleeq</family>
<default><family>cursive</family></default>
</alias>
diff --git a/fontconfig/conf.d/45-latin.conf b/fontconfig/conf.d/45-latin.conf
index 7e4126468..09fd52652 100644
--- a/fontconfig/conf.d/45-latin.conf
+++ b/fontconfig/conf.d/45-latin.conf
@@ -11,13 +11,37 @@
-->
<alias>
<family>Bitstream Vera Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>DejaVu Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Liberation Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Times New Roman</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Times</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Nimbus Roman No9 L</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Luxi Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Thorndale AMT</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
<family>Thorndale</family>
<default><family>serif</family></default>
</alias>
@@ -26,14 +50,41 @@
-->
<alias>
<family>Bitstream Vera Sans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>DejaVu Sans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Liberation Sans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Arial</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Helvetica</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Verdana</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Albany AMT</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Albany</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Nimbus Sans L</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
<family>Luxi Sans</family>
<default><family>sans-serif</family></default>
</alias>
@@ -42,15 +93,45 @@
-->
<alias>
<family>Bitstream Vera Sans Mono</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>DejaVu Sans Mono</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>Liberation Mono</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>Inconsolata</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>Courier New</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>Courier</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>Andale Mono</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>Luxi Mono</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>Cumberland AMT</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>Cumberland</family>
+ <default><family>monospace</family></default>
+ </alias>
+ <alias>
<family>Nimbus Mono L</family>
<default><family>monospace</family></default>
</alias>
@@ -59,8 +140,17 @@
-->
<alias>
<family>Impact</family>
+ <default><family>fantasy</family></default>
+ </alias>
+ <alias>
<family>Copperplate Gothic Std</family>
+ <default><family>fantasy</family></default>
+ </alias>
+ <alias>
<family>Cooper Std</family>
+ <default><family>fantasy</family></default>
+ </alias>
+ <alias>
<family>Bauhaus Std</family>
<default><family>fantasy</family></default>
</alias>
@@ -69,7 +159,13 @@
-->
<alias>
<family>ITC Zapf Chancery Std</family>
+ <default><family>cursive</family></default>
+ </alias>
+ <alias>
<family>Zapfino</family>
+ <default><family>cursive</family></default>
+ </alias>
+ <alias>
<family>Comic Sans MS</family>
<default><family>cursive</family></default>
</alias>
diff --git a/fontconfig/conf.d/65-nonlatin.conf b/fontconfig/conf.d/65-nonlatin.conf
index 53ac064b0..36aa3e518 100644
--- a/fontconfig/conf.d/65-nonlatin.conf
+++ b/fontconfig/conf.d/65-nonlatin.conf
@@ -23,8 +23,7 @@
<family>Sampige</family> <!-- kannada -->
<family>padmaa</family> <!-- gujarati -->
<family>Hapax Berbère</family> <!-- tifinagh -->
- <family>MS Gothic</family> <!-- han (ja) -->
- <family>UmePlus P Gothic</family> <!-- han (ja) -->
+ <family>MS Mincho</family> <!-- han (ja) -->
<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
<family>PMingLiu</family> <!-- han (zh-tw) -->
<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
@@ -43,8 +42,9 @@
<family>AR PL Zenkai Uni</family>
<family>MS 明朝</family>
<family>ZYSong18030</family>
- <family>UnBatang</family>
- <family>Baekmuk Batang</family>
+ <family>NanumMyeongjo</family> <!-- hangul (ko) -->
+ <family>UnBatang</family> <!-- hangul (ko) -->
+ <family>Baekmuk Batang</family> <!-- hangul (ko) -->
<family>KacstQura</family>
<family>Frank Ruehl CLM</family>
<family>Lohit Bengali</family>
@@ -117,9 +117,10 @@
<family>MS ゴシック</family>
<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
<family>TSCu_Paranar</family> <!-- tamil -->
- <family>UnDotum</family>
- <family>Baekmuk Dotum</family>
- <family>Baekmuk Gulim</family>
+ <family>NanumGothic</family> <!-- hangul (ko) -->
+ <family>UnDotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
<family>KacstQura</family>
<family>Lohit Bengali</family>
<family>Lohit Gujarati</family>
@@ -160,11 +161,13 @@
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
- <family>UnBatang</family>
- <family>UnDotum</family>
- <family>Baekmuk Batang</family> <!-- hangul -->
- <family>Baekmuk Dotum</family>
- <family>Baekmuk Gulim</family>
+ <family>NanumGothicCoding</family> <!-- hangul (ko) -->
+ <family>NanumGothic</family> <!-- hangul (ko) -->
+ <family>UnDotum</family> <!-- hangul (ko) -->
+ <family>UnBatang</family> <!-- hangul (ko) -->
+ <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+ <family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+ <family>Baekmuk Batang</family> <!-- hangul (ko) -->
<family>TlwgTypo</family> <!-- thai -->
<family>TlwgTypist</family> <!-- thai -->
<family>TlwgTypewriter</family> <!-- thai -->