diff options
| author | marha <marha@users.sourceforge.net> | 2013-12-22 13:12:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-12-22 13:16:58 +0100 |
| commit | 1d03b6f684ab1ea6772f00058605a9ebb2910628 (patch) | |
| tree | 8b393bd59900eba6aa9010cab9e714922cac2536 /fontconfig/conf.d | |
| parent | 5567cf1befbda64f2dc6fae1d337567cd984b46e (diff) | |
| parent | c81020559f329a516191927222b3698ba7370aca (diff) | |
| download | vcxsrv-1d03b6f684ab1ea6772f00058605a9ebb2910628.tar.gz vcxsrv-1d03b6f684ab1ea6772f00058605a9ebb2910628.tar.bz2 vcxsrv-1d03b6f684ab1ea6772f00058605a9ebb2910628.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
xorg-server/damageext/damageext.c
xorg-server/dix/dispatch.c
xorg-server/glx/glxdriswrast.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/glx/indirect_program.c
xorg-server/glx/render2.c
xorg-server/glx/render2swap.c
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/glthunk.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/include/os.h
xorg-server/present/present_request.c
Diffstat (limited to 'fontconfig/conf.d')
| -rw-r--r-- | fontconfig/conf.d/10-no-sub-pixel.conf | 2 | ||||
| -rw-r--r-- | fontconfig/conf.d/30-metric-aliases.conf | 47 |
2 files changed, 46 insertions, 3 deletions
diff --git a/fontconfig/conf.d/10-no-sub-pixel.conf b/fontconfig/conf.d/10-no-sub-pixel.conf index cf1246561..635847c40 100644 --- a/fontconfig/conf.d/10-no-sub-pixel.conf +++ b/fontconfig/conf.d/10-no-sub-pixel.conf @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> -<!-- Enable sub-pixel rendering --> +<!-- Disable sub-pixel rendering --> <match target="pattern"> <!-- This configuration is available on the major desktop environments. diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf index d0d9ea2e0..49a960247 100644 --- a/fontconfig/conf.d/30-metric-aliases.conf +++ b/fontconfig/conf.d/30-metric-aliases.conf @@ -22,8 +22,11 @@ Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fo ================ ====================== ======================= ================= ============== 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 +Times New Roman Liberation Serif Tinos Thorndale Thorndale AMT +Courier New Liberation Mono Cousine Cumberland Cumberland AMT +Cambria Caladea +Calibri Carlito +Symbol SymbolNeu Microsoft fonts: Other fonts: ================ ============ @@ -307,7 +310,26 @@ but in an order preferring similar designs first. We do this in three steps: </default> </alias> + <alias binding="same"> + <family>Caladea</family> + <default> + <family>Cambria</family> + </default> + </alias> + <alias binding="same"> + <family>Carlito</family> + <default> + <family>Calibri</family> + </default> + </alias> + + <alias binding="same"> + <family>SymbolNeu</family> + <default> + <family>Symbol</family> + </default> + </alias> <!-- Accept the other group as fallback --> @@ -494,4 +516,25 @@ but in an order preferring similar designs first. We do this in three steps: </accept> </alias> + <alias binding="same"> + <family>Cambria</family> + <accept> + <family>Caladea</family> + </accept> + </alias> + + <alias binding="same"> + <family>Calibri</family> + <accept> + <family>Carlito</family> + </accept> + </alias> + + <alias binding="same"> + <family>Symbol</family> + <accept> + <family>SymbolNeu</family> + </accept> + </alias> + </fontconfig> |