aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/conf.d/10-autohint.conf2
-rw-r--r--fontconfig/conf.d/10-no-sub-pixel.conf2
-rw-r--r--fontconfig/conf.d/10-sub-pixel-bgr.conf2
-rw-r--r--fontconfig/conf.d/10-sub-pixel-rgb.conf2
-rw-r--r--fontconfig/conf.d/10-sub-pixel-vbgr.conf2
-rw-r--r--fontconfig/conf.d/10-sub-pixel-vrgb.conf2
-rw-r--r--fontconfig/conf.d/10-unhinted.conf2
-rw-r--r--fontconfig/conf.d/11-lcdfilter-default.conf2
-rw-r--r--fontconfig/conf.d/11-lcdfilter-legacy.conf2
-rw-r--r--fontconfig/conf.d/11-lcdfilter-light.conf2
-rw-r--r--fontconfig/src/fcfreetype.c5
11 files changed, 13 insertions, 12 deletions
diff --git a/fontconfig/conf.d/10-autohint.conf b/fontconfig/conf.d/10-autohint.conf
index bf08de83e..f9032ba31 100644
--- a/fontconfig/conf.d/10-autohint.conf
+++ b/fontconfig/conf.d/10-autohint.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Use the Autohinter -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-no-sub-pixel.conf b/fontconfig/conf.d/10-no-sub-pixel.conf
index e650160a5..cf1246561 100644
--- a/fontconfig/conf.d/10-no-sub-pixel.conf
+++ b/fontconfig/conf.d/10-no-sub-pixel.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Enable sub-pixel rendering -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-sub-pixel-bgr.conf b/fontconfig/conf.d/10-sub-pixel-bgr.conf
index 74574ad3f..1378195dd 100644
--- a/fontconfig/conf.d/10-sub-pixel-bgr.conf
+++ b/fontconfig/conf.d/10-sub-pixel-bgr.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Enable sub-pixel rendering -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-sub-pixel-rgb.conf b/fontconfig/conf.d/10-sub-pixel-rgb.conf
index 3c558e5df..757c3b6a7 100644
--- a/fontconfig/conf.d/10-sub-pixel-rgb.conf
+++ b/fontconfig/conf.d/10-sub-pixel-rgb.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Enable sub-pixel rendering -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-sub-pixel-vbgr.conf b/fontconfig/conf.d/10-sub-pixel-vbgr.conf
index 392634d53..c807e5c05 100644
--- a/fontconfig/conf.d/10-sub-pixel-vbgr.conf
+++ b/fontconfig/conf.d/10-sub-pixel-vbgr.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Enable sub-pixel rendering -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-sub-pixel-vrgb.conf b/fontconfig/conf.d/10-sub-pixel-vrgb.conf
index 1b7b5f6d5..b5985e03c 100644
--- a/fontconfig/conf.d/10-sub-pixel-vrgb.conf
+++ b/fontconfig/conf.d/10-sub-pixel-vrgb.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Enable sub-pixel rendering -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/10-unhinted.conf b/fontconfig/conf.d/10-unhinted.conf
index 67037b435..a25e3b1dc 100644
--- a/fontconfig/conf.d/10-unhinted.conf
+++ b/fontconfig/conf.d/10-unhinted.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Disable hinting -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/11-lcdfilter-default.conf b/fontconfig/conf.d/11-lcdfilter-default.conf
index e251edd4d..9d7d11f90 100644
--- a/fontconfig/conf.d/11-lcdfilter-default.conf
+++ b/fontconfig/conf.d/11-lcdfilter-default.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Use lcddefault as default for LCD filter -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/11-lcdfilter-legacy.conf b/fontconfig/conf.d/11-lcdfilter-legacy.conf
index 63a4116e2..7e2b25675 100644
--- a/fontconfig/conf.d/11-lcdfilter-legacy.conf
+++ b/fontconfig/conf.d/11-lcdfilter-legacy.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Use lcdlegacy as default for LCD filter -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/conf.d/11-lcdfilter-light.conf b/fontconfig/conf.d/11-lcdfilter-light.conf
index af50b2c2e..0dd0a9007 100644
--- a/fontconfig/conf.d/11-lcdfilter-light.conf
+++ b/fontconfig/conf.d/11-lcdfilter-light.conf
@@ -2,7 +2,7 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Use lcdlight as default for LCD filter -->
- <match target="font">
+ <match target="pattern">
<!--
This configuration is available on the major desktop environments.
We shouldn't overwrite it with "assign" unconditionally.
diff --git a/fontconfig/src/fcfreetype.c b/fontconfig/src/fcfreetype.c
index 62ce59b4e..29ed23aef 100644
--- a/fontconfig/src/fcfreetype.c
+++ b/fontconfig/src/fcfreetype.c
@@ -2561,7 +2561,8 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks)
* except for 'DFLT'.
*/
#define FcIsSpace(x) (040 == (x))
-#define FcIsValidScript(x) (FcIsLower(x) || FcIsUpper (x) || FcIsSpace(x))
+#define FcIsDigit(c) (('0' <= (c) && (c) <= '9'))
+#define FcIsValidScript(x) (FcIsLower(x) || FcIsUpper (x) || FcIsDigit(x) || FcIsSpace(x))
static void
addtag(FcChar8 *complex_, FT_ULong tag)
@@ -2574,7 +2575,7 @@ addtag(FcChar8 *complex_, FT_ULong tag)
tagstring[3] = (FcChar8)((tag)&0xff);
tagstring[4] = '\0';
- /* skip tags which aren't alphabetic, under the assumption that
+ /* skip tags which aren't alphanumeric, under the assumption that
* they're probably broken
*/
if (!FcIsValidScript(tagstring[0]) ||