| blob | b4b35d9b084b932db90dc12d58a51fc8344af16f |
1 diff -urN fontconfig-2.8.0-old/conf.d/10-antialias.conf fontconfig-2.8.0/conf.d/10-antialias.conf
2 --- fontconfig-2.8.0-old/conf.d/10-antialias.conf 1970-01-01 03:00:00.000000000 +0300
3 +++ fontconfig-2.8.0/conf.d/10-antialias.conf 2011-04-08 03:49:23.451000009 +0300
4 @@ -0,0 +1,8 @@
5 +<?xml version="1.0"?>
6 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
7 +<fontconfig>
8 +<!-- Use the Antialiasing -->
9 + <match target="font">
10 + <edit name="antialias" mode="assign"><bool>true</bool></edit>
11 + </match>
12 +</fontconfig>
13 diff -urN fontconfig-2.8.0-old/conf.d/10-hinting.conf fontconfig-2.8.0/conf.d/10-hinting.conf
14 --- fontconfig-2.8.0-old/conf.d/10-hinting.conf 1970-01-01 03:00:00.000000000 +0300
15 +++ fontconfig-2.8.0/conf.d/10-hinting.conf 2011-04-08 03:49:23.451000009 +0300
16 @@ -0,0 +1,8 @@
17 +<?xml version="1.0"?>
18 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
19 +<fontconfig>
20 +<!-- Use Hinting -->
21 + <match target="font">
22 + <edit name="hinting" mode="assign"><bool>true</bool></edit>
23 + </match>
24 +</fontconfig>
25 diff -urN fontconfig-2.8.0-old/conf.d/10-hinting-full.conf fontconfig-2.8.0/conf.d/10-hinting-full.conf
26 --- fontconfig-2.8.0-old/conf.d/10-hinting-full.conf 1970-01-01 03:00:00.000000000 +0300
27 +++ fontconfig-2.8.0/conf.d/10-hinting-full.conf 2011-04-08 03:49:23.451000009 +0300
28 @@ -0,0 +1,8 @@
29 +<?xml version="1.0"?>
30 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
31 +<fontconfig>
32 +<!-- Use Full Hinting -->
33 + <match target="font">
34 + <edit name="hintstyle" mode="assign"><const>hintfull</const></edit>
35 + </match>
36 +</fontconfig>
37 diff -urN fontconfig-2.8.0-old/conf.d/10-hinting-medium.conf fontconfig-2.8.0/conf.d/10-hinting-medium.conf
38 --- fontconfig-2.8.0-old/conf.d/10-hinting-medium.conf 1970-01-01 03:00:00.000000000 +0300
39 +++ fontconfig-2.8.0/conf.d/10-hinting-medium.conf 2011-04-08 03:49:23.451000009 +0300
40 @@ -0,0 +1,8 @@
41 +<?xml version="1.0"?>
42 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
43 +<fontconfig>
44 +<!-- Use Medium Hinting -->
45 + <match target="font">
46 + <edit name="hintstyle" mode="assign"><const>hintmedium</const></edit>
47 + </match>
48 +</fontconfig>
49 diff -urN fontconfig-2.8.0-old/conf.d/10-hinting-slight.conf fontconfig-2.8.0/conf.d/10-hinting-slight.conf
50 --- fontconfig-2.8.0-old/conf.d/10-hinting-slight.conf 1970-01-01 03:00:00.000000000 +0300
51 +++ fontconfig-2.8.0/conf.d/10-hinting-slight.conf 2011-04-08 03:49:23.451000009 +0300
52 @@ -0,0 +1,8 @@
53 +<?xml version="1.0"?>
54 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
55 +<fontconfig>
56 +<!-- Use Slight Hinting -->
57 + <match target="font">
58 + <edit name="hintstyle" mode="assign"><const>hintslight</const></edit>
59 + </match>
60 +</fontconfig>
61 diff -urN fontconfig-2.8.0-old/conf.d/11-lcd-filter-lcddefault.conf fontconfig-2.8.0/conf.d/11-lcd-filter-lcddefault.conf
62 --- fontconfig-2.8.0-old/conf.d/11-lcd-filter-lcddefault.conf 1970-01-01 03:00:00.000000000 +0300
63 +++ fontconfig-2.8.0/conf.d/11-lcd-filter-lcddefault.conf 2011-04-08 03:49:23.452000009 +0300
64 @@ -0,0 +1,11 @@
65 +<?xml version="1.0"?>
66 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
67 +<!-- conf.d/lcd-filter-lcddefault.conf -->
68 +<fontconfig>
69 +<!-- Use lcddefault as default for LCD filter. Useful for such applications as Opera -->
70 + <match target="font">
71 + <edit mode="assign" name="lcdfilter">
72 + <const>lcddefault</const>
73 + </edit>
74 + </match>
75 +</fontconfig>
76 diff -urN fontconfig-2.8.0-old/conf.d/40-nonlatin.conf fontconfig-2.8.0/conf.d/40-nonlatin.conf
77 --- fontconfig-2.8.0-old/conf.d/40-nonlatin.conf 2009-06-28 20:48:47.000000000 +0300
78 +++ fontconfig-2.8.0/conf.d/40-nonlatin.conf 2011-04-08 03:49:23.452000009 +0300
79 @@ -51,6 +51,7 @@
80 <family>Baekmuk Dotum</family>
81 <family>SimSun</family>
82 <family>MgOpen Modata</family>
83 + <family>MgOpen Moderna</family>
84 <family>Sazanami Gothic</family>
85 <family>AR PL ShanHeiSun Uni</family>
86 <family>ZYSong18030</family>
87 diff -urN fontconfig-2.8.0-old/conf.d/53-monospace-lcd-filter.conf fontconfig-2.8.0/conf.d/53-monospace-lcd-filter.conf
88 --- fontconfig-2.8.0-old/conf.d/53-monospace-lcd-filter.conf 1970-01-01 03:00:00.000000000 +0300
89 +++ fontconfig-2.8.0/conf.d/53-monospace-lcd-filter.conf 2011-04-08 03:49:23.452000009 +0300
90 @@ -0,0 +1,22 @@
91 +<?xml version="1.0"?>
92 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
93 +<!-- conf.d/monospace-lcd-filter.conf -->
94 +<fontconfig>
95 +<!-- Use legacy LCD filter on smaller Monospace fonts -->
96 + <match target="font">
97 + <test name="family">
98 + <string>DejaVu Sans Mono</string>
99 + <string>Bitstream Vera Sans Mono</string>
100 + </test>
101 + <test name="pixelsize" compare="less_eq">
102 + <double>12.0</double>
103 + </test>
104 +
105 + <edit name="lcd_filter" mode="assign">
106 + <const>lcdlegacy</const>
107 + </edit>
108 + <edit name="hintstyle" mode="assign">
109 + <const>hintfull</const>
110 + </edit>
111 + </match>
112 +</fontconfig>
113 diff -urN fontconfig-2.8.0-old/conf.d/71-accept-bitmaps.conf fontconfig-2.8.0/conf.d/71-accept-bitmaps.conf
114 --- fontconfig-2.8.0-old/conf.d/71-accept-bitmaps.conf 1970-01-01 03:00:00.000000000 +0300
115 +++ fontconfig-2.8.0/conf.d/71-accept-bitmaps.conf 2011-04-08 03:47:08.000000000 +0300
116 @@ -0,0 +1,14 @@
117 +<?xml version="1.0"?>
118 +<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
119 +<fontconfig>
120 +<!-- Accept specified bitmap fonts -->
121 + <selectfont>
122 + <acceptfont>
123 + <pattern>
124 + <patelt name="family">
125 + <string>Terminus</string>
126 + </patelt>
127 + </pattern>
128 + </acceptfont>
129 + </selectfont>
130 +</fontconfig>
131 diff -urN fontconfig-2.8.0-old/conf.d/Makefile.am fontconfig-2.8.0/conf.d/Makefile.am
132 --- fontconfig-2.8.0-old/conf.d/Makefile.am 2009-11-16 19:24:52.000000000 +0200
133 +++ fontconfig-2.8.0/conf.d/Makefile.am 2011-04-08 03:50:00.655000033 +0300
134 @@ -25,13 +25,19 @@
135 README
137 CONF_FILES = \
138 + 10-antialias.conf \
139 10-autohint.conf \
140 + 10-hinting.conf \
141 + 10-hinting-full.conf \
142 + 10-hinting-medium.conf \
143 + 10-hinting-slight.conf \
144 10-no-sub-pixel.conf \
145 10-sub-pixel-bgr.conf \
146 10-sub-pixel-rgb.conf \
147 10-sub-pixel-vbgr.conf \
148 10-sub-pixel-vrgb.conf \
149 10-unhinted.conf \
150 + 11-lcd-filter-lcddefault.conf \
151 20-fix-globaladvance.conf \
152 20-unhint-small-vera.conf \
153 25-unhint-nonlatin.conf \
154 @@ -42,6 +48,7 @@
155 49-sansserif.conf \
156 50-user.conf \
157 51-local.conf \
158 + 53-monospace-lcd-filter.conf \
159 60-latin.conf \
160 65-fonts-persian.conf \
161 65-khmer.conf \
162 @@ -49,10 +56,15 @@
163 69-unifont.conf \
164 70-no-bitmaps.conf \
165 70-yes-bitmaps.conf \
166 + 71-accept-bitmaps.conf \
167 80-delicious.conf \
168 90-synthetic.conf
170 CONF_LINKS = \
171 + 10-antialias.conf \
172 + 10-hinting.conf \
173 + 10-hinting-slight.conf \
174 + 11-lcd-filter-lcddefault.conf \
175 20-fix-globaladvance.conf \
176 20-unhint-small-vera.conf \
177 30-urw-aliases.conf \
178 @@ -62,10 +74,13 @@
179 49-sansserif.conf \
180 50-user.conf \
181 51-local.conf \
182 + 53-monospace-lcd-filter.conf \
183 60-latin.conf \
184 65-fonts-persian.conf \
185 65-nonlatin.conf \
186 69-unifont.conf \
187 + 70-no-bitmaps.conf \
188 + 71-accept-bitmaps.conf \
189 80-delicious.conf \
190 90-synthetic.conf
192 diff -urN fontconfig-2.8.0-old/conf.d/Makefile.in fontconfig-2.8.0/conf.d/Makefile.in
193 --- fontconfig-2.8.0-old/conf.d/Makefile.in 2009-11-19 01:49:37.000000000 +0200
194 +++ fontconfig-2.8.0/conf.d/Makefile.in 2011-04-08 03:50:26.229000008 +0300
195 @@ -252,13 +252,19 @@
196 README
198 CONF_FILES = \
199 + 10-antialias.conf \
200 10-autohint.conf \
201 + 10-hinting.conf \
202 + 10-hinting-full.conf \
203 + 10-hinting-medium.conf \
204 + 10-hinting-slight.conf \
205 10-no-sub-pixel.conf \
206 10-sub-pixel-bgr.conf \
207 10-sub-pixel-rgb.conf \
208 10-sub-pixel-vbgr.conf \
209 10-sub-pixel-vrgb.conf \
210 10-unhinted.conf \
211 + 11-lcd-filter-lcddefault.conf \
212 20-fix-globaladvance.conf \
213 20-unhint-small-vera.conf \
214 25-unhint-nonlatin.conf \
215 @@ -269,6 +275,7 @@
216 49-sansserif.conf \
217 50-user.conf \
218 51-local.conf \
219 + 53-monospace-lcd-filter.conf \
220 60-latin.conf \
221 65-fonts-persian.conf \
222 65-khmer.conf \
223 @@ -276,10 +283,15 @@
224 69-unifont.conf \
225 70-no-bitmaps.conf \
226 70-yes-bitmaps.conf \
227 + 71-accept-bitmaps.conf \
228 80-delicious.conf \
229 90-synthetic.conf
231 CONF_LINKS = \
232 + 10-antialias.conf \
233 + 10-hinting.conf \
234 + 10-hinting-slight.conf \
235 + 11-lcd-filter-lcddefault.conf \
236 20-fix-globaladvance.conf \
237 20-unhint-small-vera.conf \
238 30-urw-aliases.conf \
239 @@ -289,10 +301,13 @@
240 49-sansserif.conf \
241 50-user.conf \
242 51-local.conf \
243 + 53-monospace-lcd-filter.conf \
244 60-latin.conf \
245 65-fonts-persian.conf \
246 65-nonlatin.conf \
247 69-unifont.conf \
248 + 70-no-bitmaps.conf \
249 + 71-accept-bitmaps.conf \
250 80-delicious.conf \
251 90-synthetic.conf
253 diff -urN fontconfig-2.8.0-old/src/fcname.c fontconfig-2.8.0/src/fcname.c
254 --- fontconfig-2.8.0-old/src/fcname.c 2009-11-16 19:24:52.000000000 +0200
255 +++ fontconfig-2.8.0/src/fcname.c 2011-04-08 03:49:23.453000009 +0300
256 @@ -454,6 +454,7 @@
257 { (FcChar8 *) "lcddefault", "lcdfilter", FC_LCD_DEFAULT },
258 { (FcChar8 *) "lcdlight", "lcdfilter", FC_LCD_LIGHT },
259 { (FcChar8 *) "lcdlegacy", "lcdfilter", FC_LCD_LEGACY },
260 + { (FcChar8 *) "lcdfilterlegacy", "lcdfilter", FC_LCD_LEGACY },
261 };
263 #define NUM_FC_CONSTANTS (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0])