aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-26 14:37:05 +0200
committermarha <marha@users.sourceforge.net>2012-03-26 14:37:05 +0200
commitfb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (patch)
treed9b7345ddfe702b820c7020fb784f0e3dc2253bf /fontconfig
parent76bcc36ed305418a3ddc5752d287ede894243e1b (diff)
parent1d6d472342aee7b9c68e9f1d92762ef808d35ac2 (diff)
downloadvcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.gz
vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.bz2
vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/conf.d/10-autohint.conf8
-rw-r--r--fontconfig/conf.d/10-no-sub-pixel.conf8
-rw-r--r--fontconfig/conf.d/10-sub-pixel-bgr.conf8
-rw-r--r--fontconfig/conf.d/10-sub-pixel-rgb.conf8
-rw-r--r--fontconfig/conf.d/10-sub-pixel-vbgr.conf8
-rw-r--r--fontconfig/conf.d/10-sub-pixel-vrgb.conf8
-rw-r--r--fontconfig/conf.d/10-unhinted.conf8
-rw-r--r--fontconfig/conf.d/11-lcdfilter-default.conf8
-rw-r--r--fontconfig/conf.d/11-lcdfilter-legacy.conf8
-rw-r--r--fontconfig/conf.d/11-lcdfilter-light.conf8
10 files changed, 70 insertions, 10 deletions
diff --git a/fontconfig/conf.d/10-autohint.conf b/fontconfig/conf.d/10-autohint.conf
index c597bf41d..bf08de83e 100644
--- a/fontconfig/conf.d/10-autohint.conf
+++ b/fontconfig/conf.d/10-autohint.conf
@@ -3,6 +3,12 @@
<fontconfig>
<!-- Use the Autohinter -->
<match target="font">
- <edit name="autohint" mode="assign"><bool>true</bool></edit>
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit name="autohint" mode="append"><bool>true</bool></edit>
</match>
</fontconfig>
diff --git a/fontconfig/conf.d/10-no-sub-pixel.conf b/fontconfig/conf.d/10-no-sub-pixel.conf
index 87ada4ef2..e650160a5 100644
--- a/fontconfig/conf.d/10-no-sub-pixel.conf
+++ b/fontconfig/conf.d/10-no-sub-pixel.conf
@@ -3,6 +3,12 @@
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
- <edit name="rgba" mode="assign"><const>none</const></edit>
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit name="rgba" mode="append"><const>none</const></edit>
</match>
</fontconfig>
diff --git a/fontconfig/conf.d/10-sub-pixel-bgr.conf b/fontconfig/conf.d/10-sub-pixel-bgr.conf
index e1f64fd33..74574ad3f 100644
--- a/fontconfig/conf.d/10-sub-pixel-bgr.conf
+++ b/fontconfig/conf.d/10-sub-pixel-bgr.conf
@@ -3,6 +3,12 @@
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
- <edit name="rgba" mode="assign"><const>bgr</const></edit>
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit name="rgba" mode="append"><const>bgr</const></edit>
</match>
</fontconfig>
diff --git a/fontconfig/conf.d/10-sub-pixel-rgb.conf b/fontconfig/conf.d/10-sub-pixel-rgb.conf
index 2b49fe3d2..3c558e5df 100644
--- a/fontconfig/conf.d/10-sub-pixel-rgb.conf
+++ b/fontconfig/conf.d/10-sub-pixel-rgb.conf
@@ -3,6 +3,12 @@
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
- <edit name="rgba" mode="assign"><const>rgb</const></edit>
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit name="rgba" mode="append"><const>rgb</const></edit>
</match>
</fontconfig>
diff --git a/fontconfig/conf.d/10-sub-pixel-vbgr.conf b/fontconfig/conf.d/10-sub-pixel-vbgr.conf
index 5947650df..392634d53 100644
--- a/fontconfig/conf.d/10-sub-pixel-vbgr.conf
+++ b/fontconfig/conf.d/10-sub-pixel-vbgr.conf
@@ -3,6 +3,12 @@
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
- <edit name="rgba" mode="assign"><const>vbgr</const></edit>
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit name="rgba" mode="append"><const>vbgr</const></edit>
</match>
</fontconfig>
diff --git a/fontconfig/conf.d/10-sub-pixel-vrgb.conf b/fontconfig/conf.d/10-sub-pixel-vrgb.conf
index 84481bde2..1b7b5f6d5 100644
--- a/fontconfig/conf.d/10-sub-pixel-vrgb.conf
+++ b/fontconfig/conf.d/10-sub-pixel-vrgb.conf
@@ -3,6 +3,12 @@
<fontconfig>
<!-- Enable sub-pixel rendering -->
<match target="font">
- <edit name="rgba" mode="assign"><const>vrgb</const></edit>
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit name="rgba" mode="append"><const>vrgb</const></edit>
</match>
</fontconfig>
diff --git a/fontconfig/conf.d/10-unhinted.conf b/fontconfig/conf.d/10-unhinted.conf
index 025ae2a82..67037b435 100644
--- a/fontconfig/conf.d/10-unhinted.conf
+++ b/fontconfig/conf.d/10-unhinted.conf
@@ -3,6 +3,12 @@
<fontconfig>
<!-- Disable hinting -->
<match target="font">
- <edit name="hinting" mode="assign"><bool>false</bool></edit>
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit name="hinting" mode="append"><bool>false</bool></edit>
</match>
</fontconfig>
diff --git a/fontconfig/conf.d/11-lcdfilter-default.conf b/fontconfig/conf.d/11-lcdfilter-default.conf
index 040a4ac83..e251edd4d 100644
--- a/fontconfig/conf.d/11-lcdfilter-default.conf
+++ b/fontconfig/conf.d/11-lcdfilter-default.conf
@@ -3,7 +3,13 @@
<fontconfig>
<!-- Use lcddefault as default for LCD filter -->
<match target="font">
- <edit mode="assign" name="lcdfilter">
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit mode="append" name="lcdfilter">
<const>lcddefault</const>
</edit>
</match>
diff --git a/fontconfig/conf.d/11-lcdfilter-legacy.conf b/fontconfig/conf.d/11-lcdfilter-legacy.conf
index 218585ce3..63a4116e2 100644
--- a/fontconfig/conf.d/11-lcdfilter-legacy.conf
+++ b/fontconfig/conf.d/11-lcdfilter-legacy.conf
@@ -3,7 +3,13 @@
<fontconfig>
<!-- Use lcdlegacy as default for LCD filter -->
<match target="font">
- <edit mode="assign" name="lcdfilter">
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit mode="append" name="lcdfilter">
<const>lcdlegacy</const>
</edit>
</match>
diff --git a/fontconfig/conf.d/11-lcdfilter-light.conf b/fontconfig/conf.d/11-lcdfilter-light.conf
index d38a66ef0..af50b2c2e 100644
--- a/fontconfig/conf.d/11-lcdfilter-light.conf
+++ b/fontconfig/conf.d/11-lcdfilter-light.conf
@@ -3,7 +3,13 @@
<fontconfig>
<!-- Use lcdlight as default for LCD filter -->
<match target="font">
- <edit mode="assign" name="lcdfilter">
+ <!--
+ This configuration is available on the major desktop environments.
+ We shouldn't overwrite it with "assign" unconditionally.
+ Most clients may picks up the first value only. so using "append"
+ may simply works to avoid it.
+ -->
+ <edit mode="append" name="lcdfilter">
<const>lcdlight</const>
</edit>
</match>