|
楼主 |
发表于 2006-5-19 10:17:06
|
显示全部楼层
[cloud@MagicLinux etc]$ diff -r ./fonts/ /etc/fonts
Only in /etc/fonts/conf.d: 10-fonts-persian.conf
Only in /etc/fonts/conf.d: 10mgc-default.conf
Only in /etc/fonts/conf.d: 30blacklist-fonts.conf
Only in /etc/fonts/conf.d: 40enable-replaced.conf
Only in ./fonts/conf.d: 40family-name.conf
Only in /etc/fonts/conf.d: 50no-small-fonts.conf
Only in /etc/fonts/conf.d: avoid-bitmap.conf
Only in /etc/fonts/conf.d: enable-antialias.conf
Only in /etc/fonts/conf.d: no-bitmaps.conf
diff -r ./fonts/fonts.conf /etc/fonts/fonts.conf
74a75
> <family>DejaVu Serif</family>
76a78,84
> <family>SimSun</family>
> <family>SimSun-18030</family>
> <family>DongWen SongTi</family>
> <family>FZSongTi</family>
> <family>WenQuanYi Bitmap Song</family>
> <family>AR PL ShanHeiSun Uni</family>
> <family>AR PL New Sung</family>
87,88c95
< <family>AR PL New Sung</family>
< <family>AR PL ShanHeiSun Uni</family>
---
> <family>MgOpen Canonica</family>
94a102
> <family>DejaVu Sans</family>
96c104
< <family>Helvetica</family>
---
> <family>Tahoma</family>
98a107,114
> <family>SimSun</family>
> <family>SimSun-18030</family>
> <family>DongWen SongTi</family>
> <family>FZSongTi</family>
> <family>WenQuanYi Bitmap Song</family>
> <family>AR PL ShanHeiSun Uni</family>
> <family>AR PL New Sung</family>
> <family>Helvetica</family>
107,108d122
< <family>SimSun</family>
< <family>SimSun-18030</family>
110c124
< <family>AR PL ZenKai Uni</family>
---
> <family>MgOpen Modata</family>
116a131
> <family>DejaVu Sans Mono</family>
117a133,139
> <family>NSimSun</family>
> <family>NSimSun-18030</family>
> <family>DongWen SongTi</family>
> <family>FZSongTi</family>
> <family>WenQuanYi Bitmap Song</family>
> <family>AR PL ShanHeiSun Uni</family>
> <family>AR PL New Sung</family>
124,125d145
< <family>NSimSun</family>
< <family>NSimSun-18030</family>
146a167,222
> <!--
> provides metric and shape compatible fonts for these three Microsoft font
> families.
> -->
> <alias>
> <family>Times New Roman</family>
> <prefer><family>DejaVu Serif</family></prefer>
> <default><family>Bitstream Vera Serif</family></default>
> </alias>
> <alias>
> <family>Arial</family>
> <prefer><family>DejaVu Sans</family></prefer>
> <default><family>Bitstream Vera Sans</family></default>
> </alias>
> <alias>
> <family>Verdana</family>
> <prefer><family>DejaVu Sans</family></prefer>
> <default><family>Bitstream Vera Sans</family></default>
> </alias>
> <alias>
> <family>Helvetica</family>
> <prefer><family>DejaVu Sans</family></prefer>
> <default><family>Bitstream Vera Sans</family></default>
> </alias>
>
> <!-- some fonts alias -->
> <alias>
> <family>AR PL Mingti2L</family>
> <accept>
> <family>AR PL ShanHeiSun Uni</family>
> <family>AR PL New Sung</family>
> </accept>
> </alias>
> <alias>
> <family>AR PL SungtiL</family>
> <accept>
> <family>AR PL ShanHeiSun Uni</family>
> <family>AR PL New Sung</family>
> </accept>
> </alias>
>
> <!--
> default settings for all fonts.
> -->
> <match target="font" >
> <edit mode="assign" name="hinting" >
> <bool>true</bool>
> </edit>
> <edit mode="assign" name="hintstyle" >
> <const>hintmedium</const>
> </edit>
> <edit mode="assign" name="autohint" >
> <bool>false</bool>
> </edit>
> </match>
>
180,204d255
< <!--
< Some Asian fonts misadvertise themselves as monospaced when
< in fact they are dual-spaced (half and full). This makes
< FreeType very confused as it forces all widths to match.
< Undo this magic by disabling the width forcing code -->
< <match target="font">
< <test name="family"><string>GulimChe</string></test>
< <edit name="globaladvance"><bool>false</bool></edit>
< </match>
<
< <match target="font">
< <test name="family"><string>DotumChe</string></test>
< <edit name="globaladvance"><bool>false</bool></edit>
< </match>
<
< <match target="font">
< <test name="family"><string>BatangChe</string></test>
< <edit name="globaladvance"><bool>false</bool></edit>
< </match>
<
< <match target="font">
< <test name="family"><string>GungsuhChe</string></test>
< <edit name="globaladvance"><bool>false</bool></edit>
< </match>
<
214a266
> <string>DejaVu Sans</string>
226a279
> <string>DejaVu Serif</string>
238a292
> <string>DejaVu Sans Mono</string>
265a320
> <family>DejaVu Serif</family>
267a323,332
> <family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
> <family>SimSun-18030</family>
> <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
> <family>DongWen SongTi</family>
> <family>FZSongTi</family>
> <family>WenQuanYi Bitmap Song</family>
> <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
> <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
> <family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
> <family>MS Song</family> <!-- han (zh-cn) -->
272a338,339
> <family>MgOpen Canonica</family>
> <family>FreeSerif</family>
274d340
< <family>AR PL ZenKai Uni</family>
279d344
< <family>FreeSerif</family>
284a350
> <family>DejaVu Sans</family>
285a352
> <family>Tahoma</family>
287a355,362
> <family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
> <family>SimSun-18030</family>
> <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
> <family>DongWen SongTi</family>
> <family>FZSongTi</family>
> <family>WenQuanYi Bitmap Song</family>
> <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
> <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
292a368,369
> <family>MgOpen Modata</family>
> <family>FreeSans</family>
294,297d370
< <family>SimSun</family>
< <family>SimSun-18030</family>
< <family>AR PL New Sung</family>
< <family>AR PL ShanHeiSun Uni</family>
303d375
< <family>FreeSans</family>
308a381
> <family>DejaVu Sans Mono</family>
309a383,391
> <family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
> <family>NSimSun-18030</family>
> <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
> <family>DongWen SongTi</family>
> <family>FZSongTi</family>
> <family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
> <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
> <family>WenQuanYi Bitmap Song</family>
> <family>HanyiSong</family> <!-- han (zh-cn) -->
316a399
> <family>FreeMono</family>
318,320d400
< <family>NSimSun</family>
< <family>NSimSun-18030</family>
< <family>AR PL New Sung</family>
323d402
< <family>FreeMono</family>
352a432,435
> <!-- and disable embedded bitmaps for artificial oblique -->
> <edit name="embeddedbitmap" mode="assign">
> <bool>false</bool>
> </edit>
362c445
< <int>100</int>
---
> <const>medium</const>
365,366c448,449
< <test target="pattern" name="weight" compare="more_eq">
< <int>180</int>
---
> <test target="pattern" name="weight" compare="more">
> <const>medium</const>
368c451,454
< <!-- set the embolden flag -->
---
> <!--
> set the embolden flag
> needed for applications using cairo, e.g. gucharmap, gedit, ...
> -->
371a458,464
> <!--
> set weight to bold
> needed for applications using Xft directly, e.g. Firefox, ...
> -->
> <edit name="weight" mode="assign">
> <const>bold</const>
> </edit>
diff -r ./fonts/fonts.conf.rpmsave /etc/fonts/fonts.conf.rpmsave
3c3
< <!-- /etc/fonts.conf file to configure system font access -->
---
> <!-- /etc/fonts/fonts.conf file to configure system font access -->
6a7,10
> DO NOT EDIT THIS FILE.
> IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
> LOCAL CHANGES BELONG IN 'local.conf'.
>
10,12c14,15
< things that others will also want fixed. Please send any suggested
< changes to [email protected] so that future releases can include
< such changes.
---
> things that others will also want fixed. Please submit any
> problems to the fontconfig bugzilla system located at fontconfig.org
14c17
< Note that the normal 'make install' procedure for XFree86 is to
---
> Note that the normal 'make install' procedure for fontconfig is to
19d21
< <dir>/usr/X11R6/lib/X11/fonts</dir>
21a24
> <!-- Font directory list -->
23a27
> <dir>/usr/X11R6/lib/X11/fonts</dir>
27,36d30
< Enable sub-pixel rendering
< <match target="font">
< <test qual="all" name="rgba">
< <const>unknown</const>
< </test>
< <edit name="rgba" mode="assign"><const>rgb</const></edit>
< </match>
< -->
<
< <!--
80a75
> <family>Bitstream Vera Serif</family>
81a77
> <family>Thorndale AMT</family>
83d78
< <family>Simsun</family>
85a81,88
> <family>Kochi Mincho</family>
> <family>AR PL SungtiL GB</family>
> <family>AR PL Mingti2L Big5</family>
> <family>锛?汲 鏄庢湞</family>
> <family>Baekmuk Batang</family>
> <family>FreeSerif</family>
> <family>AR PL New Sung</family>
> <family>AR PL ShanHeiSun Uni</family>
91a95
> <family>Bitstream Vera Sans</family>
95c99
< <family>SimSun</family>
---
> <family>Albany AMT</family>
97a102,110
> <family>Kochi Gothic</family>
> <family>AR PL KaitiM GB</family>
> <family>AR PL KaitiM Big5</family>
> <family>锛?汲 銈淬偡銉冦偗</family>
> <family>Baekmuk Dotum</family>
> <family>SimSun</family>
> <family>SimSun-18030</family>
> <family>FreeSans</family>
> <family>AR PL ZenKai Uni</family>
103a117
> <family>Bitstream Vera Sans Mono</family>
107a122
> <family>Cumberland AMT</family>
109a125,126
> <family>NSimSun-18030</family>
> <family>FreeMono</family>
129c146,248
<
---
>
> <!--
> URW provides metric and shape compatible fonts for these 3 Adobe families.
> -->
> <alias>
> <family>Times</family>
> <accept><family>Nimbus Roman No9 L</family></accept>
> </alias>
> <alias>
> <family>Helvetica</family>
> <accept><family>Nimbus Sans L</family></accept>
> </alias>
> <alias>
> <family>Courier</family>
> <accept><family>Nimbus Mono L</family></accept>
> </alias>
>
> <!--
> AMT provides metric and shape compatible fonts for these three web font
> families.
> -->
> <alias>
> <family>Times New Roman</family>
> <accept><family>Thorndale AMT</family></accept>
> </alias>
> <alias>
> <family>Arial</family>
> <accept><family>Albany AMT</family></accept>
> </alias>
> <alias>
> <family>Courier New</family>
> <accept><family>Cumberland AMT</family></accept>
> </alias>
>
> <!--
> Some Asian fonts misadvertise themselves as monospaced when
> in fact they are dual-spaced (half and full). This makes
> FreeType very confused as it forces all widths to match.
> Undo this magic by disabling the width forcing code -->
> <match target="font">
> <test name="family"><string>GulimChe</string></test>
> <edit name="globaladvance"><bool>false</bool></edit>
> </match>
>
> <match target="font">
> <test name="family"><string>DotumChe</string></test>
> <edit name="globaladvance"><bool>false</bool></edit>
> </match>
>
> <match target="font">
> <test name="family"><string>BatangChe</string></test>
> <edit name="globaladvance"><bool>false</bool></edit>
> </match>
>
> <match target="font">
> <test name="family"><string>GungsuhChe</string></test>
> <edit name="globaladvance"><bool>false</bool></edit>
> </match>
>
> <!--
> The Bitstream Vera fonts have GASP entries suggesting that hinting be
> disabled below 8 ppem, but FreeType ignores those, preferring to use
> the data found in the instructed hints. The initial Vera release
> didn't include the right instructions in the 'prep' table. Fix this
> by disabling hinting manually at smaller sizes (< 8ppem)
> -->
>
> <match target="font">
> <test name="family">
> <string>Bitstream Vera Sans</string>
> </test>
> <test name="pixelsize" compare="less">
> <double>7.5</double>
> </test>
> <edit name="hinting">
> <bool>false</bool>
> </edit>
> </match>
>
> <match target="font">
> <test name="family">
> <string>Bitstream Vera Serif</string>
> </test>
> <test name="pixelsize" compare="less">
> <double>7.5</double>
> </test>
> <edit name="hinting">
> <bool>false</bool>
> </edit>
> </match>
>
> <match target="font">
> <test name="family">
> <string>Bitstream Vera Sans Mono</string>
> </test>
> <test name="pixelsize" compare="less">
> <double>7.5</double>
> </test>
> <edit name="hinting">
> <bool>false</bool>
> </edit>
> </match>
>
137a257
> <include ignore_missing="yes">conf.d</include>
141,160d260
< Alias well known font names to available TrueType fonts
< -->
< <alias>
< <family>Times</family>
< <accept><family>Times New Roman</family></accept>
< </alias>
< <alias>
< <family>Helvetica</family>
< <accept><family>Verdana</family></accept>
< </alias>
< <alias>
< <family>Arial</family>
< <accept><family>Verdana</family></accept>
< </alias>
< <alias>
< <family>Courier</family>
< <accept><family>Courier New</family></accept>
< </alias>
<
< <!--
165a266
> <family>Bitstream Vera Serif</family>
167,168c268
< <family>Simsun</family>
< <family>Nimbus Roman No9 L</family>
---
> <family>Thorndale AMT</family>
169a270
> <family>Nimbus Roman No9 L</family>
170a272,279
> <family>Frank Ruehl</family>
> <family>Kochi Mincho</family>
> <family>AR PL ZenKai Uni</family>
> <family>AR PL SungtiL GB</family>
> <family>AR PL Mingti2L Big5</family>
> <family>锛?汲 鏄庢湞</family>
> <family>Baekmuk Batang</family>
> <family>FreeSerif</family>
176,177c285
< <family>Tahoma</family>
< <family>Helvetica</family>
---
> <family>Bitstream Vera Sans</family>
179,180d286
< <family>Nimbus Sans L</family>
< <family>Luxi Sans</family>
181a288,293
> <family>Albany AMT</family>
> <family>Luxi Sans</family>
> <family>Nimbus Sans L</family>
> <family>Helvetica</family>
> <family>Nachlieli</family>
> <family>Kochi Gothic</family>
182a295,303
> <family>SimSun-18030</family>
> <family>AR PL New Sung</family>
> <family>AR PL ShanHeiSun Uni</family>
> <family>AR PL KaitiM GB</family>
> <family>AR PL KaitiM Big5</family>
> <family>锛?汲 銈淬偡銉冦偗</family>
> <family>Baekmuk Dotum</family>
> <family>SimSun</family>
> <family>FreeSans</family>
187a309
> <family>Bitstream Vera Sans Mono</family>
189a312
> <family>Cumberland AMT</family>
192c315,323
< <family>Simsun</family>
---
> <family>Courier</family>
> <family>Miriam Mono</family>
> <family>Kochi Gothic</family>
> <family>NSimSun</family>
> <family>NSimSun-18030</family>
> <family>AR PL New Sung</family>
> <family>AR PL KaitiM GB</family>
> <family>Baekmuk Dotum</family>
> <family>FreeMono</family>
196,220c327
< <match target="font" >
< <test compare="more" name="size" qual="any" >
< <double>8</double>
< </test>
< <test compare="less" name="size" qual="any" >
< <double>15</double>
< </test>
< <edit mode="assign" name="antialias" >
< <bool>false</bool>
< </edit>
< </match>
<
< <match target="font" >
< <test compare="more" name="pixelsize" qual="any" >
< <double>8</double>
< </test>
< <test compare="less" name="pixelsize" qual="any" >
< <double>15</double>
< </test>
< <edit mode="assign" name="antialias" >
< <bool>false</bool>
< </edit>
< </match>
<
< <!--
---
> <!--
223c330
<
---
>
237c344
< <matrix><double>1</double><double>.2</double>
---
> <matrix><double>1</double><double>0.2</double>
242,244d348
< <edit name="autohint" mode="assign">
< <bool>true</bool>
< </edit>
249a354
>
251,252c356
< Add by [email protected]
< Artificial bold for fonts without a bold version.
---
> Synthetic emboldening for fonts that do not have bold face available
254,295d357
< <match target="font">
< <!-- check to see if the pattern requested > "medium" -->
< <test target="pattern" name="weight" compare="more">
< <const>medium</const>
< </test>
< <!-- pretend the font is bold now -->
< <edit name="weight" mode="assign">
< <const>bold</const>
< </edit>
< </match>
<
<
< <match target="font">
< <test target="pattern" name="lang" compare="contains">
< <string>zh-tw</string>
< <string>zh-cn</string>
< <string>ja</string>
< <string>ko</string>
< </test>
< <test name="spacing" compare="eq">
< <const>mono</const>
< </test>
< <edit name="globaladvance" mode="assign">
< <bool>false</bool>
< </edit>
< </match>
<
< <match target="font">
< <!-- check to see if the pattern requested > "medium" -->
< <test name="antialias" compare="eq">
< <const>true</const>
< </test>
< <test target="pattern" name="lang" compare="contains">
< <string>zh-tw</string>
< <string>zh-cn</string>
< <string>ja</string>
< <string>ko</string>
< </test>
< <edit name="autohint" mode="assign">
< <const>true</const>
< </edit>
< </match>
297c359,375
< <config>
---
> <match target="font">
> <!-- check to see if the font is just regular -->
> <test name="weight" compare="less_eq">
> <int>100</int>
> </test>
> <!-- check to see if the pattern requests bold -->
> <test target="pattern" name="weight" compare="more_eq">
> <int>180</int>
> </test>
> <!-- set the embolden flag -->
> <edit name="embolden" mode="assign">
> <bool>true</bool>
> </edit>
> </match>
>
>
> <config>
305,307c383,392
< <int>0x00a0</int> <!-- NO-BREAK SPACE -->
< <int>0x00ad</int> <!-- SOFT HYPHEN -->
< <int>0x115f</int> <!-- HANGUL CHOSEONG FILLER -->
---
> <int>0x00A0</int> <!-- NO-BREAK SPACE -->
> <int>0x00AD</int> <!-- SOFT HYPHEN -->
> <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER -->
> <int>0x0600</int> <!-- ARABIC NUMBER SIGN -->
> <int>0x0601</int> <!-- ARABIC SIGN SANAH -->
> <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER -->
> <int>0x0603</int> <!-- ARABIC SIGN SAFHA -->
> <int>0x06DD</int> <!-- ARABIC END OF AYAH -->
> <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK -->
> <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER -->
309a395,397
> <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ -->
> <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA -->
> <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR -->
320,325c408,413
< <int>0x200a</int> <!-- HAIR SPACE -->
< <int>0x200b</int> <!-- ZERO WIDTH SPACE -->
< <int>0x200c</int> <!-- ZERO WIDTH NON-JOINER -->
< <int>0x200d</int> <!-- ZERO WIDTH JOINER -->
< <int>0x200e</int> <!-- LEFT-TO-RIGHT MARK -->
< <int>0x200f</int> <!-- RIGHT-TO-LEFT MARK -->
---
> <int>0x200A</int> <!-- HAIR SPACE -->
> <int>0x200B</int> <!-- ZERO WIDTH SPACE -->
> <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER -->
> <int>0x200D</int> <!-- ZERO WIDTH JOINER -->
> <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK -->
> <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK -->
328,334c416,422
< <int>0x202a</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
< <int>0x202b</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
< <int>0x202c</int> <!-- POP DIRECTIONAL FORMATTING -->
< <int>0x202d</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
< <int>0x202e</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
< <int>0x202f</int> <!-- NARROW NO-BREAK SPACE -->
< <int>0x205f</int> <!-- MEDIUM MATHEMATICAL SPACE -->
---
> <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING -->
> <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING -->
> <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING -->
> <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE -->
> <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE -->
> <int>0x202F</int> <!-- NARROW NO-BREAK SPACE -->
> <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE -->
347,351c435,439
< <int>0xfeff</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
< <int>0xffa0</int> <!-- HALFWIDTH HANGUL FILLER -->
< <int>0xfff9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
< <int>0xfffa</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
< <int>0xfffa</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
---
> <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE -->
> <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER -->
> <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR -->
> <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR -->
> <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR -->
[cloud@MagicLinux etc]$ |
|