| blob | a9f9e3564e4ce3cdc9446a132c4a14f9fe3e4f32 |
1 --- fontconfig-2.5.0.orig/fontconfig/fontconfig.h
2 +++ fontconfig-2.5.0/fontconfig/fontconfig.h
3 @@ -111,6 +111,7 @@
4 #define FC_EMBOLDEN "embolden" /* Bool - true if emboldening needed*/
5 #define FC_EMBEDDED_BITMAP "embeddedbitmap" /* Bool - true to enable embedded bitmaps */
6 #define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */
7 +#define FC_ANY_METRICS "anymetrics" /* Bool - true to allow metrics which do not match the requested font */
9 #define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION
10 #define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION
12 --- fontconfig-2.5.0.orig/conf.d/60-latin.conf
13 +++ fontconfig-2.5.0/conf.d/60-latin.conf
14 @@ -4,8 +4,8 @@
15 <alias>
16 <family>serif</family>
17 <prefer>
18 - <family>Bitstream Vera Serif</family>
19 <family>DejaVu Serif</family>
20 + <family>Bitstream Vera Serif</family>
21 <family>Times New Roman</family>
22 <family>Thorndale AMT</family>
23 <family>Luxi Serif</family>
24 @@ -16,8 +16,8 @@
25 <alias>
26 <family>sans-serif</family>
27 <prefer>
28 - <family>Bitstream Vera Sans</family>
29 <family>DejaVu Sans</family>
30 + <family>Bitstream Vera Sans</family>
31 <family>Verdana</family>
32 <family>Arial</family>
33 <family>Albany AMT</family>
34 @@ -29,8 +29,8 @@
35 <alias>
36 <family>monospace</family>
37 <prefer>
38 - <family>Bitstream Vera Sans Mono</family>
39 <family>DejaVu Sans Mono</family>
40 + <family>Bitstream Vera Sans Mono</family>
41 <family>Andale Mono</family>
42 <family>Courier New</family>
43 <family>Cumberland AMT</family>
44 --- fontconfig-2.5.0.orig/conf.d/30-metric-aliases.conf
45 +++ fontconfig-2.5.0/conf.d/30-metric-aliases.conf
46 @@ -46,6 +46,12 @@
48 3) Alias each generic to its specifics.
49 eg. Arial to Liberation Sans, Albany, and Albany AMT
50 +
51 + However, the AMT fonts are quite ugly and do not
52 + render well on-screen, so we avoid matching them if
53 + the application said `anymetrics'; in that case, a
54 + more generic font with different metrics but better
55 + appearance will be used.
56 -->
58 <!-- Map specifics to generics -->
59 @@ -185,7 +191,7 @@
60 <accept>
61 <family>Liberation Sans</family>
62 <family>Albany</family>
63 - <family>Albany AMT</family>
64 + <!-- <family>Albany AMT</family> -->
65 </accept>
66 </alias>
68 @@ -194,7 +200,7 @@
69 <accept>
70 <family>Liberation Serif</family>
71 <family>Thorndale</family>
72 - <family>Thorndale AMT</family>
73 + <!-- <family>Thorndale AMT</family> -->
74 </accept>
75 </alias>
77 @@ -203,9 +209,42 @@
78 <accept>
79 <family>Liberation Mono</family>
80 <family>Cumberland</family>
81 - <family>Cumberland AMT</family>
82 + <!-- <family>Cumberland AMT</family> -->
83 </accept>
84 </alias>
86 + <match target="pattern">
87 + <test name="family">
88 + <string>Times New Roman</string>
89 + </test>
90 + <test name="anymetrics" qual="all" compare="not_eq">
91 + <bool>true</bool>
92 + </test>
93 + <edit name="family" mode="append">
94 + <string>Thorndale AMT</string>
95 + </edit>
96 + </match>
97 + <match target="pattern">
98 + <test name="family">
99 + <string>Arial</string>
100 + </test>
101 + <test name="anymetrics" qual="all" compare="not_eq">
102 + <bool>true</bool>
103 + </test>
104 + <edit name="family" mode="append">
105 + <string>Albany AMT</string>
106 + </edit>
107 + </match>
108 + <match target="pattern">
109 + <test name="family">
110 + <string>Courier New</string>
111 + </test>
112 + <test name="anymetrics" qual="all" compare="not_eq">
113 + <bool>true</bool>
114 + </test>
115 + <edit name="family" mode="append">
116 + <string>Cumberland AMT</string>
117 + </edit>
118 + </match>
120 </fontconfig>
121 --- fontconfig-2.5.0.orig/conf.d/30-urw-aliases.conf
122 +++ fontconfig-2.5.0/conf.d/30-urw-aliases.conf
123 @@ -5,6 +5,13 @@
124 URW provides metric and shape compatible fonts for some Adobe families.
125 Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
126 -->
127 +
128 +<!--
129 + However, these fonts are quite ugly and do not render well on-screen,
130 + so we avoid matching them if the application said `anymetrics'; in that
131 + case, a more generic font with different metrics but better appearance
132 + will be used.
133 +
134 <alias binding="same">
135 <family>Avant Garde</family>
136 <accept><family>URW Gothic L</family></accept>
137 @@ -29,6 +36,109 @@
138 <family>Zapf Dingbats</family>
139 <accept><family>Dingbats</family></accept>
140 </alias>
141 + -->
142 +
143 + <match target="pattern">
144 + <test name="family">
145 + <string>Avant Garde</string>
146 + </test>
147 + <test name="anymetrics" qual="all" compare="not_eq">
148 + <bool>true</bool>
149 + </test>
150 + <edit name="family" mode="append">
151 + <string>URW Gothic L</string>
152 + </edit>
153 + </match>
154 + <match target="pattern">
155 + <test name="family">
156 + <string>Bookman</string>
157 + </test>
158 + <test name="anymetrics" qual="all" compare="not_eq">
159 + <bool>true</bool>
160 + </test>
161 + <edit name="family" mode="append">
162 + <string>URW Bookman L</string>
163 + </edit>
164 + </match>
165 + <match target="pattern">
166 + <test name="family">
167 + <string>Courier</string>
168 + </test>
169 + <test name="anymetrics" qual="all" compare="not_eq">
170 + <bool>true</bool>
171 + </test>
172 + <edit name="family" mode="append">
173 + <string>Nimbus Mono L</string>
174 + </edit>
175 + </match>
176 + <match target="pattern">
177 + <test name="family">
178 + <string>Helvetica</string>
179 + </test>
180 + <test name="anymetrics" qual="all" compare="not_eq">
181 + <bool>true</bool>
182 + </test>
183 + <edit name="family" mode="append">
184 + <string>Nimbus Sans L</string>
185 + </edit>
186 + </match>
187 + <match target="pattern">
188 + <test name="family">
189 + <string>New Century Schoolbook</string>
190 + </test>
191 + <test name="anymetrics" qual="all" compare="not_eq">
192 + <bool>true</bool>
193 + </test>
194 + <edit name="family" mode="append">
195 + <string>Century Schoolbook L</string>
196 + </edit>
197 + </match>
198 + <match target="pattern">
199 + <test name="family">
200 + <string>Palatino</string>
201 + </test>
202 + <test name="anymetrics" qual="all" compare="not_eq">
203 + <bool>true</bool>
204 + </test>
205 + <edit name="family" mode="append">
206 + <string>URW Palladio L</string>
207 + </edit>
208 + </match>
209 + <match target="pattern">
210 + <test name="family">
211 + <string>Times</string>
212 + </test>
213 + <test name="anymetrics" qual="all" compare="not_eq">
214 + <bool>true</bool>
215 + </test>
216 + <edit name="family" mode="append">
217 + <string>Nimbus Roman No9 L</string>
218 + </edit>
219 + </match>
220 + <match target="pattern">
221 + <test name="family">
222 + <string>Zapf Chancery</string>
223 + </test>
224 + <test name="anymetrics" qual="all" compare="not_eq">
225 + <bool>true</bool>
226 + </test>
227 + <edit name="family" mode="append">
228 + <string>URW Chancery L</string>
229 + </edit>
230 + </match>
231 + <match target="pattern">
232 + <test name="family">
233 + <string>Zapf Dingbats</string>
234 + </test>
235 + <test name="anymetrics" qual="all" compare="not_eq">
236 + <bool>true</bool>
237 + </test>
238 + <edit name="family" mode="append">
239 + <string>Dingbats</string>
240 + </edit>
241 + </match>
242 +
243 +
244 <match target="pattern">
245 <test name="family">
246 <string>Symbol</string>
247 --- fontconfig-2.5.0.orig/conf.d/Makefile.am
248 +++ fontconfig-2.5.0/conf.d/Makefile.am
249 @@ -23,7 +23,12 @@
251 CONF_FILES = \
252 README \
253 + 10-antialias.conf \
254 10-autohint.conf \
255 + 10-hinting.conf \
256 + 10-hinting-full.conf \
257 + 10-hinting-medium.conf \
258 + 10-hinting-slight.conf \
259 10-no-sub-pixel.conf \
260 10-sub-pixel-bgr.conf \
261 10-sub-pixel-rgb.conf \
262 @@ -40,6 +45,7 @@
263 49-sansserif.conf \
264 50-user.conf \
265 51-local.conf \
266 + 53-monospace-lcd-filter.conf \
267 60-latin.conf \
268 65-fonts-persian.conf \
269 65-nonlatin.conf \
270 @@ -50,6 +57,10 @@
271 90-synthetic.conf
273 CONF_LINKS = \
274 + 10-antialias.conf \
275 + 10-hinting.conf \
276 + 10-hinting-medium.conf \
277 + 10-no-sub-pixel.conf \
278 20-fix-globaladvance.conf \
279 20-unhint-small-vera.conf \
280 30-urw-aliases.conf \
281 @@ -59,6 +70,7 @@
282 49-sansserif.conf \
283 50-user.conf \
284 51-local.conf \
285 + 53-monospace-lcd-filter.conf \
286 60-latin.conf \
287 65-fonts-persian.conf \
288 65-nonlatin.conf \
289 --- fontconfig-2.5.0.orig/conf.d/40-nonlatin.conf
290 +++ fontconfig-2.5.0/conf.d/40-nonlatin.conf
291 @@ -33,6 +33,7 @@
292 <family>Baekmuk Dotum</family>
293 <family>SimSun</family>
294 <family>MgOpen Modata</family>
295 + <family>MgOpen Moderna</family>
296 <family>Sazanami Gothic</family>
297 <family>AR PL ShanHeiSun Uni</family>
298 <family>ZYSong18030</family>
299 --- fontconfig-2.5.0.orig/conf.d/Makefile.in
300 +++ fontconfig-2.5.0/conf.d/Makefile.in
301 @@ -233,7 +233,12 @@
302 target_alias = @target_alias@
303 CONF_FILES = \
304 README \
305 + 10-antialias.conf \
306 10-autohint.conf \
307 + 10-hinting.conf \
308 + 10-hinting-full.conf \
309 + 10-hinting-medium.conf \
310 + 10-hinting-slight.conf \
311 10-no-sub-pixel.conf \
312 10-sub-pixel-bgr.conf \
313 10-sub-pixel-rgb.conf \
314 @@ -250,6 +255,7 @@
315 49-sansserif.conf \
316 50-user.conf \
317 51-local.conf \
318 + 53-monospace-lcd-filter.conf \
319 60-latin.conf \
320 65-fonts-persian.conf \
321 65-nonlatin.conf \
322 @@ -260,6 +267,10 @@
323 90-synthetic.conf
325 CONF_LINKS = \
326 + 10-antialias.conf \
327 + 10-hinting.conf \
328 + 10-hinting-medium.conf \
329 + 10-no-sub-pixel.conf \
330 20-fix-globaladvance.conf \
331 20-unhint-small-vera.conf \
332 30-urw-aliases.conf \
333 @@ -269,6 +280,7 @@
334 49-sansserif.conf \
335 50-user.conf \
336 51-local.conf \
337 + 53-monospace-lcd-filter.conf \
338 60-latin.conf \
339 65-fonts-persian.conf \
340 65-nonlatin.conf \
341 --- fontconfig-2.5.0.orig/src/fcname.c
342 +++ fontconfig-2.5.0/src/fcname.c
343 @@ -74,7 +74,8 @@
344 { FC_FONTFORMAT, FcTypeString },
345 { FC_EMBOLDEN, FcTypeBool },
346 { FC_EMBEDDED_BITMAP, FcTypeBool },
347 - { FC_DECORATIVE, FcTypeBool }, /* 40 */
348 + { FC_DECORATIVE, FcTypeBool },
349 + { FC_ANY_METRICS, FcTypeBool }, /* 41 */
350 };
352 #define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0])