fontconfig: Branch 'main' - 2 commits

[GitLab Mirror <gitlab-mirror@xxxxxxxxxxxxxxxxxxxxxx>]

 src/fcmatch.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cfef47622357564d804b99dbde2993ee221fa4c2
Merge: f9c546f ec7a7de
Author: Akira TAGOH <akira@xxxxxxxxx>
Date:   Tue Dec 17 08:48:09 2024 +0000

    Merge branch 'issues/440' into 'main'
    
    Allow comma as a delimiter in postscriptname and ignore it on matching
    
    Closes #440
    
    See merge request fontconfig/fontconfig!354

commit ec7a7dee5e6252392e490442fb4602049bfcb43d
Author: Akira TAGOH <akira@xxxxxxxxx>
Date:   Thu Dec 5 15:45:17 2024 +0900

    Allow comma as a delimiter in postscriptname and ignore it on matching
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/440

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 27074d4..521a8f2 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -94,7 +94,7 @@ FcComparePostScript (const FcValue *v1, const FcValue *v2, FcValue *bestValue)
 	*v1_string != ' ' && *v2_string != ' ')
 	return 1.0;
 
-    n = FcStrMatchIgnoreCaseAndDelims (v1_string, v2_string, (const FcChar8 *)" -");
+    n = FcStrMatchIgnoreCaseAndDelims (v1_string, v2_string, (const FcChar8 *)" -,");
     len1 = strlen ((const char *)v1_string);
     len2 = strlen ((const char *)v2_string);
     mlen = FC_MAX (len1, len2);