Mon Dec 14 00:39:58 2009 UTC ()
update the generated fonts.conf from the template.
from Jukka Salmi in PR #42169.


(mrg)
diff -r1.3 -r1.4 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
cvs diff -r1.3 -r1.4 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf (expand / switch to unified diff)

--- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf 2008/09/26 11:13:28 1.3
+++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf 2009/12/14 00:39:58 1.4
@@ -1,51 +1,43 @@ @@ -1,51 +1,43 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> 2<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
3<!-- $NetBSD: fonts.conf,v 1.3 2008/09/26 11:13:28 jmcneill Exp $ --> 3<!-- $NetBSD: fonts.conf,v 1.4 2009/12/14 00:39:58 mrg Exp $ -->
4<!-- /etc/fonts.conf file to configure system font access --> 4<!-- /etc/fonts/fonts.conf file to configure system font access -->
5<fontconfig> 5<fontconfig>
6 6
7<!-- 7<!--
 8 DO NOT EDIT THIS FILE.
 9 IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
 10 LOCAL CHANGES BELONG IN 'local.conf'.
 11
8 The intent of this standard configuration file is to be adequate for 12 The intent of this standard configuration file is to be adequate for
9 most environments. If you have a reasonably normal environment and 13 most environments. If you have a reasonably normal environment and
10 have found problems with this configuration, they are probably 14 have found problems with this configuration, they are probably
11 things that others will also want fixed. Please send any suggested 15 things that others will also want fixed. Please submit any
12 changes to fonts@xfree86.org so that future releases can include 16 problems to the fontconfig bugzilla system located at fontconfig.org
13 such changes. 
14 17
15 Note that the normal 'make install' procedure for XFree86 is to 18 Note that the normal 'make install' procedure for fontconfig is to
16 replace any existing fonts.conf file with the new version. Place 19 replace any existing fonts.conf file with the new version. Place
17 any local customizations in local.conf which this file references. 20 any local customizations in local.conf which this file references.
18 21
19 Keith Packard 22 Keith Packard
20--> 23-->
21 24
22<!-- Font directory list configured on Sun Aug 24 19:25:49 EST 2003 --> 25<!-- Font directory list -->
23 26
24 <dir>/usr/X11R7/lib/X11/fonts</dir> 27 <dir>/usr/X11R7/lib/X11/fonts</dir>
25 <dir>/usr/share/fonts</dir> 
26 <dir>~/.fonts</dir> 28 <dir>~/.fonts</dir>
27 29
28<!-- 30<!--
29 Enable sub-pixel rendering 
30 <match target="font"> 
31 <test qual="all" name="rgba"> 
32 <const>unknown</const> 
33 </test> 
34 <edit name="rgba" mode="assign"><const>rgb</const></edit> 
35 </match> 
36--> 
37 
38<!-- 
39 Accept deprecated 'mono' alias, replacing it with 'monospace' 31 Accept deprecated 'mono' alias, replacing it with 'monospace'
40--> 32-->
41 <match target="pattern"> 33 <match target="pattern">
42 <test qual="any" name="family"> 34 <test qual="any" name="family">
43 <string>mono</string> 35 <string>mono</string>
44 </test> 36 </test>
45 <edit name="family" mode="assign"> 37 <edit name="family" mode="assign">
46 <string>monospace</string> 38 <string>monospace</string>
47 </edit> 39 </edit>
48 </match> 40 </match>
49 41
50<!-- 42<!--
51 Accept alternate 'sans serif' spelling, replacing it with 'sans-serif' 43 Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
@@ -62,250 +54,98 @@ @@ -62,250 +54,98 @@
62<!-- 54<!--
63 Accept deprecated 'sans' alias, replacing it with 'sans-serif' 55 Accept deprecated 'sans' alias, replacing it with 'sans-serif'
64--> 56-->
65 <match target="pattern"> 57 <match target="pattern">
66 <test qual="any" name="family"> 58 <test qual="any" name="family">
67 <string>sans</string> 59 <string>sans</string>
68 </test> 60 </test>
69 <edit name="family" mode="assign"> 61 <edit name="family" mode="assign">
70 <string>sans-serif</string> 62 <string>sans-serif</string>
71 </edit> 63 </edit>
72 </match> 64 </match>
73 65
74<!-- 66<!--
75 Mark common families with their generics so we'll get 
76 something reasonable 
77--> 
78 
79<!-- 
80 Serif faces 
81 --> 
82 <alias> 
83 <family>Times</family> 
84 <family>Times New Roman</family> 
85 <family>Nimbus Roman No9 L</family> 
86 <family>Luxi Serif</family> 
87 <family>Kochi Mincho</family> 
88 <family>AR PL SungtiL GB</family> 
89 <family>AR PL Mingti2L Big5</family> 
90 <family>Baekmuk Batang</family>  
91 <default><family>serif</family></default> 
92 </alias> 
93<!-- 
94 Sans-serif faces 
95 --> 
96 <alias> 
97 <family>Helvetica</family> 
98 <family>Arial</family> 
99 <family>Verdana</family> 
100 <family>Nimbus Sans L</family> 
101 <family>Luxi Sans</family> 
102 <family>Kochi Gothic</family> 
103 <family>AR PL KaitiM GB</family> 
104 <family>AR PL KaitiM Big5</family> 
105 <family>Baekmuk Dotum</family> 
106 <family>SimSun</family> 
107 <default><family>sans-serif</family></default> 
108 </alias> 
109<!-- 
110 Monospace faces 
111 --> 
112 <alias> 
113 <family>Courier</family> 
114 <family>Courier New</family> 
115 <family>Andale Mono</family> 
116 <family>Luxi Mono</family> 
117 <family>Nimbus Mono L</family> 
118 <family>NSimSun</family> 
119 <default><family>monospace</family></default> 
120 </alias> 
121<!-- 
122 If the font still has no generic name, add sans-serif 
123 --> 
124 <match target="pattern"> 
125 <test qual="all" name="family" compare="not_eq"> 
126 <string>sans-serif</string> 
127 </test> 
128 <test qual="all" name="family" compare="not_eq"> 
129 <string>serif</string> 
130 </test> 
131 <test qual="all" name="family" compare="not_eq"> 
132 <string>monospace</string> 
133 </test> 
134 <edit name="family" mode="append_last"> 
135 <string>sans-serif</string> 
136 </edit> 
137 </match> 
138  
139<!-- 
140 Load per-user customization file 
141--> 
142 <include ignore_missing="yes">~/.fonts.conf</include> 
143 
144<!-- 
145 Load local system customization file 67 Load local system customization file
146--> 68-->
147 <include ignore_missing="yes">conf.d</include> 69 <include ignore_missing="yes">conf.d</include>
148 70
149<!-- 71<!-- Font cache directory list -->
150 Font cache directory list 72
151--> 
152 <cachedir>/var/cache/fontconfig</cachedir> 73 <cachedir>/var/cache/fontconfig</cachedir>
153 <cachedir>~/.fontconfig</cachedir> 74 <cachedir>~/.fontconfig</cachedir>
154 75
155<!-- 
156 Alias well known font names to available TrueType fonts 
157--> 
158 <alias> 
159 <family>Times</family> 
160 <accept><family>Times New Roman</family></accept> 
161 </alias> 
162 <alias> 
163 <family>Helvetica</family> 
164 <accept><family>Verdana</family></accept> 
165 </alias> 
166 <alias> 
167 <family>Arial</family> 
168 <accept><family>Verdana</family></accept> 
169 </alias> 
170 <alias> 
171 <family>Courier</family> 
172 <accept><family>Courier New</family></accept> 
173 </alias> 
174 
175<!-- 
176 Provide required aliases for standard names 
177--> 
178 <alias> 
179 <family>serif</family> 
180 <prefer> 
181 <family>Times New Roman</family> 
182 <family>Nimbus Roman No9 L</family> 
183 <family>Luxi Serif</family> 
184 <family>Times</family> 
185 <family>Kochi Mincho</family> 
186 <family>AR PL SungtiL GB</family> 
187 <family>AR PL Mingti2L Big5</family> 
188 <family>Baekmuk Batang</family>  
189 </prefer> 
190 </alias> 
191 <alias> 
192 <family>sans-serif</family> 
193 <prefer> 
194 <family>Verdana</family> 
195 <family>Nimbus Sans L</family> 
196 <family>Luxi Sans</family> 
197 <family>Arial</family> 
198 <family>Helvetica</family> 
199 <family>Kochi Gothic</family> 
200 <family>AR PL KaitiM GB</family> 
201 <family>AR PL KaitiM Big5</family> 
202 <family>Baekmuk Dotum</family> 
203 <family>SimSun</family> 
204 </prefer> 
205 </alias> 
206 <alias> 
207 <family>monospace</family> 
208 <prefer> 
209 <family>Andale Mono</family> 
210 <family>Courier New</family> 
211 <family>Luxi Mono</family> 
212 <family>Nimbus Mono L</family> 
213 <family>Kochi Gothic</family> 
214 <family>AR PL KaitiM GB</family> 
215 <family>Baekmuk Dotum</family> 
216 </prefer> 
217 </alias> 
218 
219<!--  
220 Artificial oblique for fonts without an italic or oblique version 
221 --> 
222  
223 <match target="font"> 
224 <!-- check to see if the font is roman --> 
225 <test name="slant"> 
226 <const>roman</const> 
227 </test> 
228 <!-- check to see if the pattern requested non-roman --> 
229 <test target="pattern" name="slant" compare="not_eq"> 
230 <const>roman</const> 
231 </test> 
232 <!-- multiply the matrix to slant the font --> 
233 <edit name="matrix" mode="assign"> 
234 <times> 
235 <name>matrix</name> 
236 <matrix><double>1</double><double>.2</double> 
237 <double>0</double><double>1</double> 
238 </matrix> 
239 </times> 
240 </edit> 
241 <!-- pretend the font is oblique now --> 
242 <edit name="slant" mode="assign"> 
243 <const>oblique</const> 
244 </edit> 
245 </match> 
246 
247 <config> 76 <config>
248<!-- 77<!--
249 These are the default Unicode chars that are expected to be blank 78 These are the default Unicode chars that are expected to be blank
250 in fonts. All other blank chars are assumed to be broken and 79 in fonts. All other blank chars are assumed to be broken and
251 won't appear in the resulting charsets 80 won't appear in the resulting charsets
252 --> 81 -->
253 <blank> 82 <blank>
254 <int>0x0020</int> <!-- SPACE --> 83 <int>0x0020</int> <!-- SPACE -->
255 <int>0x00a0</int> <!-- NO-BREAK SPACE --> 84 <int>0x00A0</int> <!-- NO-BREAK SPACE -->
256 <int>0x00ad</int> <!-- SOFT HYPHEN --> 85 <int>0x00AD</int> <!-- SOFT HYPHEN -->
257 <int>0x115f</int> <!-- HANGUL CHOSEONG FILLER --> 86 <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
 87 <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
 88 <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
 89 <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
 90 <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
 91 <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
 92 <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
 93 <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
258 <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER --> 94 <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER -->
259 <int>0x1680</int> <!-- OGHAM SPACE MARK --> 95 <int>0x1680</int> <!-- OGHAM SPACE MARK -->
 96 <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
 97 <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
 98 <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
260 <int>0x2000</int> <!-- EN QUAD --> 99 <int>0x2000</int> <!-- EN QUAD -->
261 <int>0x2001</int> <!-- EM QUAD --> 100 <int>0x2001</int> <!-- EM QUAD -->
262 <int>0x2002</int> <!-- EN SPACE --> 101 <int>0x2002</int> <!-- EN SPACE -->
263 <int>0x2003</int> <!-- EM SPACE --> 102 <int>0x2003</int> <!-- EM SPACE -->
264 <int>0x2004</int> <!-- THREE-PER-EM SPACE --> 103 <int>0x2004</int> <!-- THREE-PER-EM SPACE -->
265 <int>0x2005</int> <!-- FOUR-PER-EM SPACE --> 104 <int>0x2005</int> <!-- FOUR-PER-EM SPACE -->
266 <int>0x2006</int> <!-- SIX-PER-EM SPACE --> 105 <int>0x2006</int> <!-- SIX-PER-EM SPACE -->
267 <int>0x2007</int> <!-- FIGURE SPACE --> 106 <int>0x2007</int> <!-- FIGURE SPACE -->
268 <int>0x2008</int> <!-- PUNCTUATION SPACE --> 107 <int>0x2008</int> <!-- PUNCTUATION SPACE -->
269 <int>0x2009</int> <!-- THIN SPACE --> 108 <int>0x2009</int> <!-- THIN SPACE -->
270 <int>0x200a</int> <!-- HAIR SPACE --> 109 <int>0x200A</int> <!-- HAIR SPACE -->
271 <int>0x200b</int> <!-- ZERO WIDTH SPACE --> 110 <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
272 <int>0x200c</int> <!-- ZERO WIDTH NON-JOINER --> 111 <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
273 <int>0x200d</int> <!-- ZERO WIDTH JOINER --> 112 <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
274 <int>0x200e</int> <!-- LEFT-TO-RIGHT MARK --> 113 <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
275 <int>0x200f</int> <!-- RIGHT-TO-LEFT MARK --> 114 <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
276 <int>0x2028</int> <!-- LINE SEPARATOR --> 115 <int>0x2028</int> <!-- LINE SEPARATOR -->
277 <int>0x2029</int> <!-- PARAGRAPH SEPARATOR --> 116 <int>0x2029</int> <!-- PARAGRAPH SEPARATOR -->
278 <int>0x202a</int> <!-- LEFT-TO-RIGHT EMBEDDING --> 117 <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
279 <int>0x202b</int> <!-- RIGHT-TO-LEFT EMBEDDING --> 118 <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
280 <int>0x202c</int> <!-- POP DIRECTIONAL FORMATTING --> 119 <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
281 <int>0x202d</int> <!-- LEFT-TO-RIGHT OVERRIDE --> 120 <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
282 <int>0x202e</int> <!-- RIGHT-TO-LEFT OVERRIDE --> 121 <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
283 <int>0x202f</int> <!-- NARROW NO-BREAK SPACE --> 122 <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
284 <int>0x205f</int> <!-- MEDIUM MATHEMATICAL SPACE --> 123 <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
285 <int>0x2060</int> <!-- WORD JOINER --> 124 <int>0x2060</int> <!-- WORD JOINER -->
286 <int>0x2061</int> <!-- FUNCTION APPLICATION --> 125 <int>0x2061</int> <!-- FUNCTION APPLICATION -->
287 <int>0x2062</int> <!-- INVISIBLE TIMES --> 126 <int>0x2062</int> <!-- INVISIBLE TIMES -->
288 <int>0x2063</int> <!-- INVISIBLE SEPARATOR --> 127 <int>0x2063</int> <!-- INVISIBLE SEPARATOR -->
289 <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING --> 128 <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING -->
290 <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING --> 129 <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING -->
291 <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING --> 130 <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING -->
292 <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING --> 131 <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING -->
293 <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES --> 132 <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES -->
294 <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES --> 133 <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES -->
 134 <int>0x2800</int> <!-- BRAILLE PATTERN BLANK -->
295 <int>0x3000</int> <!-- IDEOGRAPHIC SPACE --> 135 <int>0x3000</int> <!-- IDEOGRAPHIC SPACE -->
296 <int>0x3164</int> <!-- HANGUL FILLER --> 136 <int>0x3164</int> <!-- HANGUL FILLER -->
297 <int>0xfeff</int> <!-- ZERO WIDTH NO-BREAK SPACE --> 137 <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
298 <int>0xffa0</int> <!-- HALFWIDTH HANGUL FILLER --> 138 <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
299 <int>0xfff9</int> <!-- INTERLINEAR ANNOTATION ANCHOR --> 139 <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
300 <int>0xfffa</int> <!-- INTERLINEAR ANNOTATION SEPARATOR --> 140 <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
301 <int>0xfffa</int> <!-- INTERLINEAR ANNOTATION TERMINATOR --> 141 <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
302 </blank> 142 </blank>
303<!-- 143<!--
304 Rescan configuration every 30 seconds when FcFontSetList is called 144 Rescan configuration every 30 seconds when FcFontSetList is called
305 --> 145 -->
306 <rescan> 146 <rescan>
307 <int>30</int> 147 <int>30</int>
308 </rescan> 148 </rescan>
309 </config> 149 </config>
310 150
311</fontconfig> 151</fontconfig>