diff options
author | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-08-26 10:26:21 +0200 |
commit | be8a3ecf0bebc7134452778070cd83b7decf7f71 (patch) | |
tree | e3a5d81a99754c393062ed811bece6e0787e3767 /fontconfig/conf.d | |
parent | 7403278d95051a554e2cbec3fafdde8ce9c6d200 (diff) | |
parent | 5ee5b91b019005aa27273dff01388a68c12be293 (diff) | |
download | vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.gz vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.tar.bz2 vcxsrv-be8a3ecf0bebc7134452778070cd83b7decf7f71.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git update 26 Aug 2013
Diffstat (limited to 'fontconfig/conf.d')
-rw-r--r-- | fontconfig/conf.d/30-metric-aliases.conf | 11 | ||||
-rw-r--r-- | fontconfig/conf.d/45-latin.conf | 16 |
2 files changed, 27 insertions, 0 deletions
diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf index f25052a29..0fd0b8a0c 100644 --- a/fontconfig/conf.d/30-metric-aliases.conf +++ b/fontconfig/conf.d/30-metric-aliases.conf @@ -230,6 +230,7 @@ <alias binding="same"> <family>Helvetica</family> <accept> + <family>TeX Gyre Heros</family> <family>Nimbus Sans L</family> </accept> </alias> @@ -237,6 +238,7 @@ <alias binding="same"> <family>Times</family> <accept> + <family>TeX Gyre Termes</family> <family>Nimbus Roman No9 L</family> </accept> </alias> @@ -253,6 +255,7 @@ <alias binding="same"> <family>Arial</family> <accept> + <family>TeX Gyre Heros</family> <family>Arimo</family> <family>Liberation Sans</family> <family>Albany</family> @@ -270,6 +273,7 @@ <alias binding="same"> <family>Times New Roman</family> <accept> + <family>TeX Gyre Termes</family> <family>Tinos</family> <family>Liberation Serif</family> <family>Thorndale</family> @@ -278,6 +282,13 @@ </alias> <alias binding="same"> + <family>Georgia</family> + <accept> + <family>Gelasio</family> + </accept> + </alias> + + <alias binding="same"> <family>Courier New</family> <accept> <family>Cousine</family> diff --git a/fontconfig/conf.d/45-latin.conf b/fontconfig/conf.d/45-latin.conf index 09fd52652..aa62ed42e 100644 --- a/fontconfig/conf.d/45-latin.conf +++ b/fontconfig/conf.d/45-latin.conf @@ -45,6 +45,22 @@ <family>Thorndale</family> <default><family>serif</family></default> </alias> + <alias> + <family>Georgia</family> + <default><family>serif</family></default> + </alias> + <alias> + <family>Garamond</family> + <default><family>serif</family></default> + </alias> + <alias> + <family>Palatino Linotype</family> + <default><family>serif</family></default> + </alias> + <alias> + <family>Trebuchet MS</family> + <default><family>serif</family></default> + </alias> <!-- Sans-serif faces --> |