[Fontconfig] fontconfig: Branch 'master'
Behdad Esfahbod
behdad at kemper.freedesktop.org
Sun Jun 28 10:50:15 PDT 2009
conf.d/25-unhint-nonlatin.conf | 32 +++----
conf.d/30-metric-aliases.conf | 48 +++++-----
conf.d/30-urw-aliases.conf | 36 ++++----
conf.d/65-fonts-persian.conf | 184 ++++++++++++++++++++---------------------
conf.d/90-synthetic.conf | 8 -
5 files changed, 154 insertions(+), 154 deletions(-)
New commits:
commit 52742ff86b60b1d244c1e87611aff5ceee46e596
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Sun Jun 28 13:49:09 2009 -0400
Replace spaces with tabs in conf files
diff --git a/conf.d/25-unhint-nonlatin.conf b/conf.d/25-unhint-nonlatin.conf
index 3799853..ffb70c6 100644
--- a/conf.d/25-unhint-nonlatin.conf
+++ b/conf.d/25-unhint-nonlatin.conf
@@ -76,22 +76,22 @@
<bool>false</bool>
</edit>
</match>
- <match target="font">
- <test name="family" compare="eq">
- <string>AR PL ShanHeiSun Uni</string>
- </test>
- <edit name="hinting" mode="assign">
- <bool>false</bool>
- </edit>
- </match>
- <match target="font">
- <test name="family" compare="eq">
- <string>AR PL KaitiM Big5</string>
- </test>
- <edit name="hinting" mode="assign">
- <bool>false</bool>
- </edit>
- </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>AR PL ShanHeiSun Uni</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
+ <match target="font">
+ <test name="family" compare="eq">
+ <string>AR PL KaitiM Big5</string>
+ </test>
+ <edit name="hinting" mode="assign">
+ <bool>false</bool>
+ </edit>
+ </match>
<match target="font">
<test name="family" compare="eq">
<string>AR PL ZenKai Uni</string>
diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index 87e4493..702a495 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -51,21 +51,21 @@
<!-- Map specifics to generics -->
<!-- PostScript -->
- <alias binding="same">
+ <alias binding="same">
<family>Nimbus Sans L</family>
<default>
<family>Helvetica</family>
</default>
</alias>
- <alias binding="same">
+ <alias binding="same">
<family>Nimbus Roman No9 L</family>
<default>
<family>Times</family>
</default>
</alias>
- <alias binding="same">
+ <alias binding="same">
<family>Nimbus Mono L</family>
<default>
<family>Courier</family>
@@ -74,8 +74,8 @@
<!-- Microsoft -->
- <alias binding="same">
- <family>Liberation Sans</family>
+ <alias binding="same">
+ <family>Liberation Sans</family>
<family>Albany</family>
<family>Albany AMT</family>
<default>
@@ -83,8 +83,8 @@
</default>
</alias>
- <alias binding="same">
- <family>Liberation Serif</family>
+ <alias binding="same">
+ <family>Liberation Serif</family>
<family>Thorndale</family>
<family>Thorndale AMT</family>
<default>
@@ -92,8 +92,8 @@
</default>
</alias>
- <alias binding="same">
- <family>Liberation Mono</family>
+ <alias binding="same">
+ <family>Liberation Mono</family>
<family>Cumberland</family>
<family>Cumberland AMT</family>
<default>
@@ -107,21 +107,21 @@
<!-- PostScript -->
- <alias>
+ <alias>
<family>Helvetica</family>
<default>
<family>Arial</family>
</default>
</alias>
- <alias>
+ <alias>
<family>Times</family>
<default>
<family>Times New Roman</family>
</default>
</alias>
- <alias>
+ <alias>
<family>Courier</family>
<default>
<family>Courier New</family>
@@ -130,21 +130,21 @@
<!-- Microsoft -->
- <alias>
+ <alias>
<family>Arial</family>
<default>
<family>Helvetica</family>
</default>
</alias>
- <alias>
+ <alias>
<family>Times New Roman</family>
<default>
<family>Times</family>
</default>
</alias>
- <alias>
+ <alias>
<family>Courier New</family>
<default>
<family>Courier</family>
@@ -157,21 +157,21 @@
<!-- PostScript -->
- <alias binding="same">
+ <alias binding="same">
<family>Helvetica</family>
<accept>
<family>Nimbus Sans L</family>
</accept>
</alias>
- <alias binding="same">
+ <alias binding="same">
<family>Times</family>
<accept>
<family>Nimbus Roman No9 L</family>
</accept>
</alias>
- <alias binding="same">
+ <alias binding="same">
<family>Courier</family>
<accept>
<family>Nimbus Mono L</family>
@@ -180,28 +180,28 @@
<!-- Microsoft -->
- <alias binding="same">
+ <alias binding="same">
<family>Arial</family>
<accept>
- <family>Liberation Sans</family>
+ <family>Liberation Sans</family>
<family>Albany</family>
<family>Albany AMT</family>
</accept>
</alias>
- <alias binding="same">
+ <alias binding="same">
<family>Times New Roman</family>
<accept>
- <family>Liberation Serif</family>
+ <family>Liberation Serif</family>
<family>Thorndale</family>
<family>Thorndale AMT</family>
</accept>
</alias>
- <alias binding="same">
+ <alias binding="same">
<family>Courier New</family>
<accept>
- <family>Liberation Mono</family>
+ <family>Liberation Mono</family>
<family>Cumberland</family>
<family>Cumberland AMT</family>
</accept>
diff --git a/conf.d/30-urw-aliases.conf b/conf.d/30-urw-aliases.conf
index 6bab15b..9d59203 100644
--- a/conf.d/30-urw-aliases.conf
+++ b/conf.d/30-urw-aliases.conf
@@ -5,27 +5,27 @@
URW provides metric and shape compatible fonts for some Adobe families.
Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
-->
- <alias binding="same">
- <family>Avant Garde</family>
- <accept><family>URW Gothic L</family></accept>
- </alias>
- <alias binding="same">
- <family>Bookman</family>
- <accept><family>URW Bookman L</family></accept>
- </alias>
- <alias binding="same">
- <family>New Century Schoolbook</family>
- <accept><family>Century Schoolbook L</family></accept>
- </alias>
- <alias binding="same">
- <family>Palatino</family>
- <accept><family>URW Palladio L</family></accept>
- </alias>
- <alias binding="same">
+ <alias binding="same">
+ <family>Avant Garde</family>
+ <accept><family>URW Gothic L</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Bookman</family>
+ <accept><family>URW Bookman L</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>New Century Schoolbook</family>
+ <accept><family>Century Schoolbook L</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Palatino</family>
+ <accept><family>URW Palladio L</family></accept>
+ </alias>
+ <alias binding="same">
<family>Zapf Chancery</family>
<accept><family>URW Chancery L</family></accept>
</alias>
- <alias binding="same">
+ <alias binding="same">
<family>Zapf Dingbats</family>
<accept><family>Dingbats</family></accept>
</alias>
diff --git a/conf.d/65-fonts-persian.conf b/conf.d/65-fonts-persian.conf
index 49dd297..0033675 100644
--- a/conf.d/65-fonts-persian.conf
+++ b/conf.d/65-fonts-persian.conf
@@ -36,147 +36,147 @@
<!-- Deprecated fonts are discouraged -->
<!-- Nesf[2] is officially deprecated and has problematic tables -->
- <alias binding="same">
- <family>Nesf</family>
- <accept><family>Nesf2</family></accept>
- </alias>
- <alias binding="same">
- <family>Nesf2</family>
- <accept><family>Persian_sansserif_default</family></accept>
- </alias>
+ <alias binding="same">
+ <family>Nesf</family>
+ <accept><family>Nesf2</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Nesf2</family>
+ <accept><family>Persian_sansserif_default</family></accept>
+ </alias>
<!-- Name changes and spelling variant aliases -->
- <alias binding="same">
- <family>Nazanin</family>
- <accept><family>Nazli</family></accept>
- </alias>
- <alias binding="same">
- <family>Lotus</family>
- <accept><family>Lotoos</family></accept>
- </alias>
- <alias binding="same">
- <family>Yaqut</family>
- <accept><family>Yaghoot</family></accept>
- </alias>
- <alias binding="same">
- <family>Yaghut</family>
- <accept><family>Yaghoot</family></accept>
- </alias>
- <alias binding="same">
- <family>Traffic</family>
- <accept><family>Terafik</family></accept>
- </alias>
- <alias binding="same">
- <family>Ferdowsi</family>
- <accept><family>Ferdosi</family></accept>
- </alias>
- <alias binding="same">
- <family>Fantezy</family>
- <accept><family>Fantezi</family></accept>
- </alias>
+ <alias binding="same">
+ <family>Nazanin</family>
+ <accept><family>Nazli</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Lotus</family>
+ <accept><family>Lotoos</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Yaqut</family>
+ <accept><family>Yaghoot</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Yaghut</family>
+ <accept><family>Yaghoot</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Traffic</family>
+ <accept><family>Terafik</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Ferdowsi</family>
+ <accept><family>Ferdosi</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Fantezy</family>
+ <accept><family>Fantezi</family></accept>
+ </alias>
<!-- Classify fonts. -->
<!-- Persian_title class -->
- <alias binding="same">
- <family>Jadid</family>
- <accept><family>Persian_title</family></accept>
- </alias>
- <alias binding="same">
- <family>Titr</family>
- <accept><family>Persian_title</family></accept>
- </alias>
+ <alias binding="same">
+ <family>Jadid</family>
+ <accept><family>Persian_title</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Titr</family>
+ <accept><family>Persian_title</family></accept>
+ </alias>
<!-- Persian_fantasy class -->
- <alias binding="same">
- <family>Kamran</family>
- <accept>
+ <alias binding="same">
+ <family>Kamran</family>
+ <accept>
<family>Persian_fantasy</family>
<family>Homa</family>
</accept>
- </alias>
- <alias binding="same">
- <family>Homa</family>
- <accept>
+ </alias>
+ <alias binding="same">
+ <family>Homa</family>
+ <accept>
<family>Persian_fantasy</family>
<family>Kamran</family>
</accept>
- </alias>
- <alias binding="same">
- <family>Fantezi</family>
- <accept><family>Persian_fantasy</family></accept>
- </alias>
- <alias binding="same">
- <family>Tabassom</family>
- <accept><family>Persian_fantasy</family></accept>
- </alias>
+ </alias>
+ <alias binding="same">
+ <family>Fantezi</family>
+ <accept><family>Persian_fantasy</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Tabassom</family>
+ <accept><family>Persian_fantasy</family></accept>
+ </alias>
<!-- Persian_square class -->
- <alias binding="same">
- <family>Arshia</family>
- <accept><family>Persian_square</family></accept>
- </alias>
- <alias binding="same">
- <family>Nasim</family>
- <accept><family>Persian_square</family></accept>
- </alias>
- <alias binding="same">
- <family>Elham</family>
- <accept>
+ <alias binding="same">
+ <family>Arshia</family>
+ <accept><family>Persian_square</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Nasim</family>
+ <accept><family>Persian_square</family></accept>
+ </alias>
+ <alias binding="same">
+ <family>Elham</family>
+ <accept>
<family>Persian_square</family>
<family>Farnaz</family>
</accept>
- </alias>
- <alias binding="same">
+ </alias>
+ <alias binding="same">
<family>Farnaz</family>
- <accept>
+ <accept>
<family>Persian_square</family>
- <family>Elham</family>
+ <family>Elham</family>
</accept>
- </alias>
- <alias binding="same">
- <family>Sina</family>
- <accept><family>Persian_square</family></accept>
- </alias>
+ </alias>
+ <alias binding="same">
+ <family>Sina</family>
+ <accept><family>Persian_square</family></accept>
+ </alias>
<!-- Font ordering per class -->
<!-- Persian_title class -->
- <alias binding="same">
+ <alias binding="same">
<family>Persian_title</family>
- <accept>
+ <accept>
<family>Titr</family>
<family>Jadid</family>
- <family>Persian_serif</family>
+ <family>Persian_serif</family>
</accept>
- </alias>
+ </alias>
<!-- Persian_fantasy class -->
- <alias binding="same">
+ <alias binding="same">
<family>Persian_fantasy</family>
- <accept>
+ <accept>
<family>Homa</family>
<family>Kamran</family>
<family>Fantezi</family>
<family>Tabassom</family>
- <family>Persian_square</family>
+ <family>Persian_square</family>
</accept>
- </alias>
+ </alias>
<!-- Persian_square class -->
- <alias binding="same">
+ <alias binding="same">
<family>Persian_square</family>
- <accept>
+ <accept>
<family>Arshia</family>
<family>Elham</family>
<family>Farnaz</family>
<family>Nasim</family>
<family>Sina</family>
- <family>Persian_serif</family>
+ <family>Persian_serif</family>
</accept>
- </alias>
+ </alias>
<!-- Register the fonts that we actually do have -->
diff --git a/conf.d/90-synthetic.conf b/conf.d/90-synthetic.conf
index 63d9b89..b8d1e85 100644
--- a/conf.d/90-synthetic.conf
+++ b/conf.d/90-synthetic.conf
@@ -27,10 +27,10 @@
<edit name="slant" mode="assign">
<const>oblique</const>
</edit>
- <!-- and disable embedded bitmaps for artificial oblique -->
- <edit name="embeddedbitmap" mode="assign">
- <bool>false</bool>
- </edit>
+ <!-- and disable embedded bitmaps for artificial oblique -->
+ <edit name="embeddedbitmap" mode="assign">
+ <bool>false</bool>
+ </edit>
</match>
<!--
More information about the Fontconfig
mailing list