summaryrefslogtreecommitdiffstats
path: root/system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch
blob: 10d16cb3d4059cebe0ef82ecf8b597142fbbf985 (about) (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
From: Iain Lane <iain.lane@canonical.com>
Date: Wed, 30 Oct 2013 22:17:18 +0100
Subject: Use correct fontconfig syntax for disjunction and don't include
 multiple elements in test/alias

Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687043
---
 25-arphic-uming-bitmaps.conf | 44 ++++++++++++++++++++++++++++++++++++++++++--
 41-arphic-uming.conf         | 32 +++++++++++++++++++++++++++++++-
 64-arphic-uming.conf         | 44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 117 insertions(+), 3 deletions(-)

diff --git a/25-arphic-uming-bitmaps.conf b/25-arphic-uming-bitmaps.conf
index c4e1da4..93d96c2 100644
--- a/25-arphic-uming-bitmaps.conf
+++ b/25-arphic-uming-bitmaps.conf
@@ -5,25 +5,65 @@
 	<match target="font">
 	  <test name="family">
 	  <string>AR PL UMing CN</string>
+	  </test>
+       	  <edit name="antialias"><bool>false</bool></edit>
+    	  <edit name="hinting"><bool>true</bool></edit>
+          <edit name="autohint"><bool>false</bool></edit>
+	</match>
+	<match target="font">
+	  <test name="family">
 	  <string>AR PL UMing HK</string>
+	  </test>
+       	  <edit name="antialias"><bool>false</bool></edit>
+    	  <edit name="hinting"><bool>true</bool></edit>
+          <edit name="autohint"><bool>false</bool></edit>
+	</match>
+	<match target="font">
+	  <test name="family">
 	  <string>AR PL UMing TW</string>
+	  </test>
+       	  <edit name="antialias"><bool>false</bool></edit>
+    	  <edit name="hinting"><bool>true</bool></edit>
+          <edit name="autohint"><bool>false</bool></edit>
+	</match>
+	<match target="font">
+	  <test name="family">
 	  <string>AR PL UMing TW MBE</string>
 	  </test>
        	  <edit name="antialias"><bool>false</bool></edit>
     	  <edit name="hinting"><bool>true</bool></edit>
           <edit name="autohint"><bool>false</bool></edit>
 	</match>
-
 	<match target="font">
 	  <test name="family">
 	  <string>AR PL UMing CN</string>
+	  </test>
+      	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
+	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
+	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
+	</match>
+	<match target="font">
+	  <test name="family">
 	  <string>AR PL UMing HK</string>
+	  </test>
+      	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
+	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
+	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
+	</match>
+	<match target="font">
+	  <test name="family">
 	  <string>AR PL UMing TW</string>
+	  </test>
+      	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
+	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
+	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
+	</match>
+	<match target="font">
+	  <test name="family">
 	  <string>AR PL UMing TW MBE</string>
 	  </test>
       	  <test name="pixelsize" compare="more_eq"><int>17</int></test>
 	  <edit name="antialias" mode="assign"><bool>true</bool></edit>
 	  <edit name="hinting" mode="assign"><bool>true</bool></edit>
 	</match>
-
 </fontconfig>
diff --git a/41-arphic-uming.conf b/41-arphic-uming.conf
index 7e2f12b..4f91a4d 100644
--- a/41-arphic-uming.conf
+++ b/41-arphic-uming.conf
@@ -7,22 +7,52 @@
  -->
 	<alias>
 		<family>AR PL ShanHeiSun Uni</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL ShanHeiSun Uni MBE</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing CN</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing HK</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing TW</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing TW MBE</family>
 		<default><family>serif</family></default>
 	</alias>
 <!--
   Monospace faces
  -->
- 	<alias>
+	<alias>
 		<family>AR PL ShanHeiSun Uni</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL ShanHeiSun Uni MBE</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing CN</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing HK</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing TW</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
 		<family>AR PL UMing TW MBE</family>
 		<default><family>monospace</family></default>
 	</alias>
diff --git a/64-arphic-uming.conf b/64-arphic-uming.conf
index dd3ec7e..b20b2ad 100644
--- a/64-arphic-uming.conf
+++ b/64-arphic-uming.conf
@@ -4,6 +4,17 @@
 	<match target="pattern">
 		<test qual="any" name="lang" compare="contains">
 			<string>zh-cn</string>
+		</test>
+		<test qual="any" name="family">
+			<string>serif</string>
+		</test>
+		<edit name="family" mode="prepend" binding="strong">
+			<string>AR PL UMing CN</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="lang" compare="contains">
 			<string>zh-sg</string>
 		</test>
 		<test qual="any" name="family">
@@ -17,6 +28,17 @@
 	<match target="pattern">
 		<test qual="any" name="lang" compare="contains">
 			<string>zh-cn</string>
+		</test>
+		<test name="family">
+			<string>AR PL UMing CN</string>
+		</test>
+		<edit name="family" mode="append" binding="strong">
+			<string>DejaVu Serif</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="lang" compare="contains">
 			<string>zh-sg</string>
 		</test>
 		<test name="family">
@@ -30,6 +52,17 @@
 	<match target="pattern">
 		<test qual="any" name="lang" compare="contains">
 			<string>zh-hk</string>
+		</test>
+		<test qual="any" name="family">
+			<string>serif</string>
+		</test>
+		<edit name="family" mode="prepend" binding="strong">
+			<string>AR PL UMing HK</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="lang" compare="contains">
 			<string>zh-mo</string>
 		</test>
 		<test qual="any" name="family">
@@ -43,6 +76,17 @@
 	<match target="pattern">
 		<test qual="any" name="lang" compare="contains">
 			<string>zh-hk</string>
+		</test>
+		<test name="family">
+			<string>AR PL UMing HK</string>
+		</test>
+		<edit name="family" mode="append" binding="strong">
+			<string>DejaVu Serif</string>
+		</edit>
+	</match>
+
+	<match target="pattern">
+		<test qual="any" name="lang" compare="contains">
 			<string>zh-mo</string>
 		</test>
 		<test name="family">