walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 19128 - Handling whitespace in aliases 

Add a new attribute `ignore-blanks' to <test>.
When this is set to "true", any blanks in the string will be ignored
on comparison.  This takes effects for compare="eq" or "not_eq" only.

Also changed the behavior of the comparison on <alias> too.
This commit is contained in:
Akira TAGOH 2012-04-11 19:52:35 +09:00
parent 5ac12c0e94
commit bc4517d8e5
13 changed files with 103 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf.d/20-fix-globaladvance.conf
View File

@ -7,22 +7,22 @@
FreeType very confused as it forces all widths to match. FreeType very confused as it forces all widths to match.
Undo this magic by disabling the width forcing code --> Undo this magic by disabling the width forcing code -->
<match target="font"> <match target="font">
<test name="family"><string>GulimChe</string></test> <test name="family" compare="eq" ignore-blanks="true"><string>GulimChe</string></test>
<edit name="globaladvance"><bool>false</bool></edit> <edit name="globaladvance"><bool>false</bool></edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family"><string>DotumChe</string></test> <test name="family" compare="eq" ignore-blanks="true"><string>DotumChe</string></test>
<edit name="globaladvance"><bool>false</bool></edit> <edit name="globaladvance"><bool>false</bool></edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family"><string>BatangChe</string></test> <test name="family" compare="eq" ignore-blanks="true"><string>BatangChe</string></test>
<edit name="globaladvance"><bool>false</bool></edit> <edit name="globaladvance"><bool>false</bool></edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family"><string>GungsuhChe</string></test> <test name="family" compare="eq" ignore-blanks="true"><string>GungsuhChe</string></test>
<edit name="globaladvance"><bool>false</bool></edit> <edit name="globaladvance"><bool>false</bool></edit>
</match> </match>
</fontconfig> </fontconfig>

6
conf.d/20-unhint-small-vera.conf
View File

@ -10,7 +10,7 @@
--> -->
<match target="font"> <match target="font">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Bitstream Vera Sans</string> <string>Bitstream Vera Sans</string>
</test> </test>
<test name="pixelsize" compare="less"> <test name="pixelsize" compare="less">
@ -22,7 +22,7 @@
</match> </match>
<match target="font"> <match target="font">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Bitstream Vera Serif</string> <string>Bitstream Vera Serif</string>
</test> </test>
<test name="pixelsize" compare="less"> <test name="pixelsize" compare="less">
@ -34,7 +34,7 @@
</match> </match>
<match target="font"> <match target="font">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Bitstream Vera Sans Mono</string> <string>Bitstream Vera Sans Mono</string>
</test> </test>
<test name="pixelsize" compare="less"> <test name="pixelsize" compare="less">

30
conf.d/25-unhint-nonlatin.conf
View File

@ -5,7 +5,7 @@
<!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. --> <!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>Kochi Mincho</string> <string>Kochi Mincho</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -13,7 +13,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>Kochi Gothic</string> <string>Kochi Gothic</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -21,7 +21,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>Sazanami Mincho</string> <string>Sazanami Mincho</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -29,7 +29,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>Sazanami Gothic</string> <string>Sazanami Gothic</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -37,7 +37,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>Baekmuk Batang</string> <string>Baekmuk Batang</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -45,7 +45,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>Baekmuk Dotum</string> <string>Baekmuk Dotum</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -53,7 +53,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>Baekmuk Gulim</string> <string>Baekmuk Gulim</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -61,7 +61,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>Baekmuk Headline</string> <string>Baekmuk Headline</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -69,7 +69,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>AR PL Mingti2L Big5</string> <string>AR PL Mingti2L Big5</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -77,7 +77,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>AR PL ShanHeiSun Uni</string> <string>AR PL ShanHeiSun Uni</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -85,7 +85,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>AR PL KaitiM Big5</string> <string>AR PL KaitiM Big5</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -93,7 +93,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>AR PL ZenKai Uni</string> <string>AR PL ZenKai Uni</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -101,7 +101,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>AR PL SungtiL GB</string> <string>AR PL SungtiL GB</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -109,7 +109,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>AR PL KaitiM GB</string> <string>AR PL KaitiM GB</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">
@ -117,7 +117,7 @@
</edit> </edit>
</match> </match>
<match target="font"> <match target="font">
<test name="family" compare="eq"> <test name="family" compare="eq" ignore-blanks="true">
<string>ZYSong18030</string> <string>ZYSong18030</string>
</test> </test>
<edit name="hinting" mode="assign"> <edit name="hinting" mode="assign">

7
conf.d/30-urw-aliases.conf
View File

@ -29,13 +29,8 @@
<family>Zapf Dingbats</family> <family>Zapf Dingbats</family>
<accept><family>Dingbats</family></accept> <accept><family>Dingbats</family></accept>
</alias> </alias>
<!-- workaround for Bug#19128 -->
<alias binding="same">
<family>ZapfDingbats</family>
<accept><family>Dingbats</family></accept>
</alias>
<match target="pattern"> <match target="pattern">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Symbol</string> <string>Symbol</string>
</test> </test>
<edit name="family" mode="append" binding="same"> <edit name="family" mode="append" binding="same">

14
conf.d/65-fonts-persian.conf
View File

@ -181,7 +181,7 @@
<!-- Register the fonts that we actually do have --> <!-- Register the fonts that we actually do have -->
<match target="scan"> <match target="scan">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Elham</string> <string>Elham</string>
</test> </test>
<edit name="foundry"> <edit name="foundry">
@ -190,7 +190,7 @@
</match> </match>
<match target="scan"> <match target="scan">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Homa</string> <string>Homa</string>
</test> </test>
<edit name="foundry"> <edit name="foundry">
@ -199,7 +199,7 @@
</match> </match>
<match target="scan"> <match target="scan">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Koodak</string> <string>Koodak</string>
</test> </test>
<edit name="foundry"> <edit name="foundry">
@ -208,7 +208,7 @@
</match> </match>
<match target="scan"> <match target="scan">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Nazli</string> <string>Nazli</string>
</test> </test>
<edit name="foundry"> <edit name="foundry">
@ -217,7 +217,7 @@
</match> </match>
<match target="scan"> <match target="scan">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Roya</string> <string>Roya</string>
</test> </test>
<edit name="foundry"> <edit name="foundry">
@ -226,7 +226,7 @@
</match> </match>
<match target="scan"> <match target="scan">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Terafik</string> <string>Terafik</string>
</test> </test>
<edit name="foundry"> <edit name="foundry">
@ -235,7 +235,7 @@
</match> </match>
<match target="scan"> <match target="scan">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Titr</string> <string>Titr</string>
</test> </test>
<edit name="foundry"> <edit name="foundry">

2
conf.d/80-delicious.conf
View File

@ -5,7 +5,7 @@
<!-- Delicious 'heavy' variant says its Medium weight --> <!-- Delicious 'heavy' variant says its Medium weight -->
<match target="scan"> <match target="scan">
<test name="family"> <test name="family" compare="eq" ignore-blanks="true">
<string>Delicious</string> <string>Delicious</string>
</test> </test>
<test name="style"> <test name="style">

3
doc/fontconfig-user.sgml
View File

@ -396,7 +396,8 @@ above). 'compare' can be one of "eq", "not_eq", "less", "less_eq", "more", "more
"not_contains". 'qual' may either be the default, "any", in which case the match "not_contains". 'qual' may either be the default, "any", in which case the match
succeeds if any value associated with the property matches the test value, or succeeds if any value associated with the property matches the test value, or
"all", in which case all of the values associated with the property must "all", in which case all of the values associated with the property must
match the test value. When used in a &lt;match target="font"&gt; element, match the test value. 'ignore-blanks' takes a boolean value. if 'ignore-blanks' is set "true", any blanks in the string will be ignored on its comparison. this takes effects only when compare="eq" or compare="not_eq".
When used in a &lt;match target="font"&gt; element,
the target= attribute in the &lt;test&gt; element selects between matching the target= attribute in the &lt;test&gt; element selects between matching
the original pattern or the font. "default" selects whichever target the the original pattern or the font. "default" selects whichever target the
outer &lt;match&gt; element has selected. outer &lt;match&gt; element has selected.

1
fonts.dtd
View File

@ -159,6 +159,7 @@
qual (any|all|first|not_first) "any" qual (any|all|first|not_first) "any"
name CDATA #REQUIRED name CDATA #REQUIRED
target (pattern|font|default) "default" target (pattern|font|default) "default"
ignore-blanks (#PCDATA) "false"
compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains) "eq"> compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains) "eq">
<!-- <!--

35
src/fccfg.c
View File

@ -691,12 +691,14 @@ FcConfigPromote (FcValue v, FcValue u)
FcBool FcBool
FcConfigCompareValue (const FcValue *left_o, FcConfigCompareValue (const FcValue *left_o,
FcOp op, FcOp op_,
const FcValue *right_o) const FcValue *right_o)
{ {
FcValue left = FcValueCanonicalize(left_o); FcValue left = FcValueCanonicalize(left_o);
FcValue right = FcValueCanonicalize(right_o); FcValue right = FcValueCanonicalize(right_o);
FcBool ret = FcFalse; FcBool ret = FcFalse;
FcOp op = FC_OP_GET_OP (op_);
int flags = FC_OP_GET_FLAGS (op_);
left = FcConfigPromote (left, right); left = FcConfigPromote (left, right);
right = FcConfigPromote (right, left); right = FcConfigPromote (right, left);
@ -751,13 +753,19 @@ FcConfigCompareValue (const FcValue *left_o,
switch (op) { switch (op) {
case FcOpEqual: case FcOpEqual:
case FcOpListing: case FcOpListing:
ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) == 0; if (flags & FcOpFlagIgnoreBlanks)
ret = FcStrCmpIgnoreBlanksAndCase (left.u.s, right.u.s) == 0;
else
ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) == 0;
break; break;
case FcOpContains: case FcOpContains:
ret = FcStrStrIgnoreCase (left.u.s, right.u.s) != 0; ret = FcStrStrIgnoreCase (left.u.s, right.u.s) != 0;
break; break;
case FcOpNotEqual: case FcOpNotEqual:
ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) != 0; if (flags & FcOpFlagIgnoreBlanks)
ret = FcStrCmpIgnoreBlanksAndCase (left.u.s, right.u.s) != 0;
else
ret = FcStrCmpIgnoreCase (left.u.s, right.u.s) != 0;
break; break;
case FcOpNotContains: case FcOpNotContains:
ret = FcStrStrIgnoreCase (left.u.s, right.u.s) == 0; ret = FcStrStrIgnoreCase (left.u.s, right.u.s) == 0;
@ -872,8 +880,9 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
FcResult r; FcResult r;
FcMatrix *m; FcMatrix *m;
FcChar8 *str; FcChar8 *str;
FcOp op = FC_OP_GET_OP (e->op);
switch (e->op) { switch (op) {
case FcOpInteger: case FcOpInteger:
v.type = FcTypeInteger; v.type = FcTypeInteger;
v.u.i = e->u.ival; v.u.i = e->u.ival;
@ -961,7 +970,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
{ {
switch (vl.type) { switch (vl.type) {
case FcTypeDouble: case FcTypeDouble:
switch (e->op) { switch (op) {
case FcOpPlus: case FcOpPlus:
v.type = FcTypeDouble; v.type = FcTypeDouble;
v.u.d = vl.u.d + vr.u.d; v.u.d = vl.u.d + vr.u.d;
@ -990,7 +999,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
} }
break; break;
case FcTypeBool: case FcTypeBool:
switch (e->op) { switch (op) {
case FcOpOr: case FcOpOr:
v.type = FcTypeBool; v.type = FcTypeBool;
v.u.b = vl.u.b || vr.u.b; v.u.b = vl.u.b || vr.u.b;
@ -1005,7 +1014,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
} }
break; break;
case FcTypeString: case FcTypeString:
switch (e->op) { switch (op) {
case FcOpPlus: case FcOpPlus:
v.type = FcTypeString; v.type = FcTypeString;
str = FcStrPlus (vl.u.s, vr.u.s); str = FcStrPlus (vl.u.s, vr.u.s);
@ -1021,7 +1030,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
} }
break; break;
case FcTypeMatrix: case FcTypeMatrix:
switch (e->op) { switch (op) {
case FcOpTimes: case FcOpTimes:
v.type = FcTypeMatrix; v.type = FcTypeMatrix;
m = malloc (sizeof (FcMatrix)); m = malloc (sizeof (FcMatrix));
@ -1042,7 +1051,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
} }
break; break;
case FcTypeCharSet: case FcTypeCharSet:
switch (e->op) { switch (op) {
case FcOpPlus: case FcOpPlus:
v.type = FcTypeCharSet; v.type = FcTypeCharSet;
v.u.c = FcCharSetUnion (vl.u.c, vr.u.c); v.u.c = FcCharSetUnion (vl.u.c, vr.u.c);
@ -1061,7 +1070,7 @@ FcConfigEvaluate (FcPattern *p, FcExpr *e)
} }
break; break;
case FcTypeLangSet: case FcTypeLangSet:
switch (e->op) { switch (op) {
case FcOpPlus: case FcOpPlus:
v.type = FcTypeLangSet; v.type = FcTypeLangSet;
v.u.l = FcLangSetUnion (vl.u.l, vr.u.l); v.u.l = FcLangSetUnion (vl.u.l, vr.u.l);
@ -1186,7 +1195,7 @@ FcConfigMatchValueList (FcPattern *p,
while (e) while (e)
{ {
/* Compute the value of the match expression */ /* Compute the value of the match expression */
if (e->op == FcOpComma) if (FC_OP_GET_OP (e->op) == FcOpComma)
{ {
value = FcConfigEvaluate (p, e->u.tree.left); value = FcConfigEvaluate (p, e->u.tree.left);
e = e->u.tree.right; e = e->u.tree.right;
@ -1230,7 +1239,7 @@ FcConfigValues (FcPattern *p, FcExpr *e, FcValueBinding binding)
if (!l) if (!l)
return 0; return 0;
FcMemAlloc (FC_MEM_VALLIST, sizeof (FcValueList)); FcMemAlloc (FC_MEM_VALLIST, sizeof (FcValueList));
if (e->op == FcOpComma) if (FC_OP_GET_OP (e->op) == FcOpComma)
{ {
l->value = FcConfigEvaluate (p, e->u.tree.left); l->value = FcConfigEvaluate (p, e->u.tree.left);
l->next = FcConfigValues (p, e->u.tree.right, binding); l->next = FcConfigValues (p, e->u.tree.right, binding);
@ -1518,7 +1527,7 @@ FcConfigSubstituteWithPat (FcConfig *config,
break; break;
} }
} }
switch (e->op) { switch (FC_OP_GET_OP (e->op)) {
case FcOpAssign: case FcOpAssign:
/* /*
* If there was a test, then replace the matched * If there was a test, then replace the matched

27
src/fcdbg.c
View File

@ -185,9 +185,18 @@ FcPatternPrint (const FcPattern *p)
printf ("\n"); printf ("\n");
} }
#define FcOpFlagsPrint(_o_) \
{ \
int f = FC_OP_GET_FLAGS (_o_); \
if (f & FcOpFlagIgnoreBlanks) \
printf ("(ignore blanks)"); \
}
void void
FcOpPrint (FcOp op) FcOpPrint (FcOp op_)
{ {
FcOp op = FC_OP_GET_OP (op_);
switch (op) { switch (op) {
case FcOpInteger: printf ("Integer"); break; case FcOpInteger: printf ("Integer"); break;
case FcOpDouble: printf ("Double"); break; case FcOpDouble: printf ("Double"); break;
@ -208,8 +217,8 @@ FcOpPrint (FcOp op)
case FcOpQuest: printf ("Quest"); break; case FcOpQuest: printf ("Quest"); break;
case FcOpOr: printf ("Or"); break; case FcOpOr: printf ("Or"); break;
case FcOpAnd: printf ("And"); break; case FcOpAnd: printf ("And"); break;
case FcOpEqual: printf ("Equal"); break; case FcOpEqual: printf ("Equal"); FcOpFlagsPrint (op_); break;
case FcOpNotEqual: printf ("NotEqual"); break; case FcOpNotEqual: printf ("NotEqual"); FcOpFlagsPrint (op_); break;
case FcOpLess: printf ("Less"); break; case FcOpLess: printf ("Less"); break;
case FcOpLessEqual: printf ("LessEqual"); break; case FcOpLessEqual: printf ("LessEqual"); break;
case FcOpMore: printf ("More"); break; case FcOpMore: printf ("More"); break;
@ -227,7 +236,7 @@ FcOpPrint (FcOp op)
case FcOpCeil: printf ("Ceil"); break; case FcOpCeil: printf ("Ceil"); break;
case FcOpRound: printf ("Round"); break; case FcOpRound: printf ("Round"); break;
case FcOpTrunc: printf ("Trunc"); break; case FcOpTrunc: printf ("Trunc"); break;
case FcOpListing: printf ("Listing"); break; case FcOpListing: printf ("Listing"); FcOpFlagsPrint (op_); break;
case FcOpInvalid: printf ("Invalid"); break; case FcOpInvalid: printf ("Invalid"); break;
} }
} }
@ -236,7 +245,7 @@ void
FcExprPrint (const FcExpr *expr) FcExprPrint (const FcExpr *expr)
{ {
if (!expr) printf ("none"); if (!expr) printf ("none");
else switch (expr->op) { else switch (FC_OP_GET_OP (expr->op)) {
case FcOpInteger: printf ("%d", expr->u.ival); break; case FcOpInteger: printf ("%d", expr->u.ival); break;
case FcOpDouble: printf ("%g", expr->u.dval); break; case FcOpDouble: printf ("%g", expr->u.dval); break;
case FcOpString: printf ("\"%s\"", expr->u.sval); break; case FcOpString: printf ("\"%s\"", expr->u.sval); break;
@ -287,7 +296,7 @@ FcExprPrint (const FcExpr *expr)
case FcOpComma: case FcOpComma:
FcExprPrint (expr->u.tree.left); FcExprPrint (expr->u.tree.left);
printf (" "); printf (" ");
switch (expr->op) { switch (FC_OP_GET_OP (expr->op)) {
case FcOpAssign: printf ("Assign"); break; case FcOpAssign: printf ("Assign"); break;
case FcOpAssignReplace: printf ("AssignReplace"); break; case FcOpAssignReplace: printf ("AssignReplace"); break;
case FcOpPrependFirst: printf ("PrependFirst"); break; case FcOpPrependFirst: printf ("PrependFirst"); break;
@ -296,14 +305,14 @@ FcExprPrint (const FcExpr *expr)
case FcOpAppendLast: printf ("AppendLast"); break; case FcOpAppendLast: printf ("AppendLast"); break;
case FcOpOr: printf ("Or"); break; case FcOpOr: printf ("Or"); break;
case FcOpAnd: printf ("And"); break; case FcOpAnd: printf ("And"); break;
case FcOpEqual: printf ("Equal"); break; case FcOpEqual: printf ("Equal"); FcOpFlagsPrint (expr->op); break;
case FcOpNotEqual: printf ("NotEqual"); break; case FcOpNotEqual: printf ("NotEqual"); FcOpFlagsPrint (expr->op); break;
case FcOpLess: printf ("Less"); break; case FcOpLess: printf ("Less"); break;
case FcOpLessEqual: printf ("LessEqual"); break; case FcOpLessEqual: printf ("LessEqual"); break;
case FcOpMore: printf ("More"); break; case FcOpMore: printf ("More"); break;
case FcOpMoreEqual: printf ("MoreEqual"); break; case FcOpMoreEqual: printf ("MoreEqual"); break;
case FcOpContains: printf ("Contains"); break; case FcOpContains: printf ("Contains"); break;
case FcOpListing: printf ("Listing"); break; case FcOpListing: printf ("Listing"); FcOpFlagsPrint (expr->op); break;
case FcOpNotContains: printf ("NotContains"); break; case FcOpNotContains: printf ("NotContains"); break;
case FcOpPlus: printf ("Plus"); break; case FcOpPlus: printf ("Plus"); break;
case FcOpMinus: printf ("Minus"); break; case FcOpMinus: printf ("Minus"); break;

8
src/fcint.h
View File

@ -244,6 +244,14 @@ typedef enum _FcOp {
FcOpInvalid FcOpInvalid
} FcOp; } FcOp;
typedef enum _FcOpFlags {
FcOpFlagIgnoreBlanks = 1 << 0
} FcOpFlags;
#define FC_OP_GET_OP(_x_) ((_x_) & 0xffff)
#define FC_OP_GET_FLAGS(_x_) (((_x_) & 0xffff0000) >> 16)
#define FC_OP(_x_,_f_) (FC_OP_GET_OP (_x_) | ((_f_) << 16))
typedef struct _FcExpr { typedef struct _FcExpr {
FcOp op; FcOp op;
union { union {

2
src/fclist.c
View File

@ -148,7 +148,7 @@ FcListValueListMatchAny (FcValueListPtr patOrig, /* pattern */
* where it requires an exact match) * where it requires an exact match)
*/ */
if (FcConfigCompareValue (&fnt->value, if (FcConfigCompareValue (&fnt->value,
FcOpListing, FC_OP (FcOpListing, FcOpFlagIgnoreBlanks),
&pat->value)) &pat->value))
break; break;
} }

24
src/fcxml.c
View File

@ -195,7 +195,7 @@ FcExprDestroy (FcExpr *e)
{ {
if (!e) if (!e)
return; return;
switch (e->op) { switch (FC_OP_GET_OP (e->op)) {
case FcOpInteger: case FcOpInteger:
break; break;
case FcOpDouble: case FcOpDouble:
@ -571,7 +571,7 @@ FcTypecheckExpr (FcConfigParse *parse, FcExpr *expr, FcType type)
if (!expr) if (!expr)
return; return;
switch (expr->op) { switch (FC_OP_GET_OP (expr->op)) {
case FcOpInteger: case FcOpInteger:
case FcOpDouble: case FcOpDouble:
FcTypecheckValue (parse, FcTypeDouble, type); FcTypecheckValue (parse, FcTypeDouble, type);
@ -1687,7 +1687,7 @@ FcParseAlias (FcConfigParse *parse)
FcTest *t = FcTestCreate (parse, FcMatchPattern, FcTest *t = FcTestCreate (parse, FcMatchPattern,
FcQualAny, FcQualAny,
(FcChar8 *) FC_FAMILY, (FcChar8 *) FC_FAMILY,
FcOpEqual, FC_OP (FcOpEqual, FcOpFlagIgnoreBlanks),
family); family);
if (test) if (test)
{ {
@ -1911,6 +1911,8 @@ FcParseTest (FcConfigParse *parse)
FcOp compare; FcOp compare;
FcExpr *expr; FcExpr *expr;
FcTest *test; FcTest *test;
const FcChar8 *iblanks_string;
int flags = 0;
kind_string = FcConfigGetAttribute (parse, "target"); kind_string = FcConfigGetAttribute (parse, "target");
if (!kind_string) if (!kind_string)
@ -1968,13 +1970,27 @@ FcParseTest (FcConfigParse *parse)
return; return;
} }
} }
iblanks_string = FcConfigGetAttribute (parse, "ignore-blanks");
if (iblanks_string)
{
FcBool f = FcFalse;
if (!FcNameBool (iblanks_string, &f))
{
FcConfigMessage (parse,
FcSevereWarning,
"invalid test ignore-blanks \"%s\"", iblanks_string);
}
if (f)
flags |= FcOpFlagIgnoreBlanks;
}
expr = FcPopBinary (parse, FcOpComma); expr = FcPopBinary (parse, FcOpComma);
if (!expr) if (!expr)
{ {
FcConfigMessage (parse, FcSevereWarning, "missing test expression"); FcConfigMessage (parse, FcSevereWarning, "missing test expression");
return; return;
} }
test = FcTestCreate (parse, kind, qual, name, compare, expr); test = FcTestCreate (parse, kind, qual, name, FC_OP (compare, flags), expr);
if (!test) if (!test)
{ {
FcConfigMessage (parse, FcSevereError, "out of memory"); FcConfigMessage (parse, FcSevereError, "out of memory");