X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=blobdiff_plain;f=fonts.conf.in;h=a17c01eeba07a95e55894376da49301716bd72ea;hp=adc44e8027ee365c7f11eb57ce52497cbd38634e;hb=082caefb6d5462c97f280b7037e3740b4865a244;hpb=813258dc8e3a8c964af49abe810e76a95241926d

diff --git a/fonts.conf.in b/fonts.conf.in
index adc44e8..a17c01e 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -27,11 +27,6 @@
 	@FC_FONTPATH@
 	<dir>~/.fonts</dir>
 
-<!-- Font cache directory list -->
-
-	<cachedir>@FC_CACHEDIR@</cachedir>
-	<cachedir>~/.fontconfig</cachedir>
-
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
 -->
@@ -68,356 +63,15 @@
 		</edit>
 	</match>
 
-<!--
-  Mark common families with their generics so we'll get
-  something reasonable
--->
-
-<!--
-  Serif faces
- -->
-	<alias>
-		<family>Bitstream Vera Serif</family>
-		<family>DejaVu Serif</family>
-		<family>Times New Roman</family>
-		<family>Thorndale AMT</family>
-		<family>Times</family>
-		<family>Nimbus Roman No9 L</family>
-		<family>Luxi Serif</family>
-		<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>MgOpen Canonica</family>
-		<default><family>serif</family></default>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>Bitstream Vera Sans</family>
-		<family>DejaVu Sans</family>
-		<family>Helvetica</family>
-		<family>Arial</family>
-		<family>Verdana</family>
-		<family>Albany AMT</family>
-		<family>Nimbus Sans L</family>
-		<family>Luxi Sans</family>
-		<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>FreeSans</family>
-		<family>MgOpen Modata</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-<!--
-  Monospace faces
- -->
- 	<alias>
-		<family>Bitstream Vera Sans Mono</family>
-		<family>DejaVu Sans Mono</family>
-		<family>Courier</family>
-		<family>Courier New</family>
-		<family>Andale Mono</family>
-		<family>Luxi Mono</family>
-		<family>Cumberland AMT</family>
-		<family>Nimbus Mono L</family>
-		<family>NSimSun</family>
-		<family>FreeMono</family>
-		<default><family>monospace</family></default>
-	</alias>
-<!--
-  If the font still has no generic name, add sans-serif
- -->
-	<match target="pattern">
-		<test qual="all" name="family" compare="not_eq">
-			<string>sans-serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>monospace</string>
-		</test>
-		<edit name="family" mode="append_last">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  URW provides metric and shape compatible fonts for these 10 Adobe families.
-  -->
-        <alias>
-          <family>Avant Garde</family>
-          <accept><family>URW Gothic L</family></accept>
-        </alias>
-        <alias>
-          <family>Bookman</family>
-          <accept><family>URW Bookman L</family></accept>
-        </alias>
-        <alias>
-	  <family>Courier</family>
-	  <accept><family>Nimbus Mono L</family></accept>
-	</alias>
-        <alias>
-	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans L</family></accept>
-	</alias>
-        <alias>
-          <family>New Century Schoolbook</family>
-          <accept><family>Century Schoolbook L</family></accept>
-        </alias>
-        <alias>
-          <family>Palatino</family>
-          <accept><family>URW Palladio L</family></accept>
-        </alias>
-        <alias>
-	  <family>Times</family>
-	  <accept><family>Nimbus Roman No9 L</family></accept>
-	</alias>
-        <alias>
-	  <family>Zapf Chancery</family>
-	  <accept><family>URW Chancery L</family></accept>
-	</alias>
-        <alias>
-	  <family>Zapf Dingbats</family>
-	  <accept><family>Dingbats</family></accept>
-	</alias>
-	<match target="pattern">
-	  <test name="family">
-	    <string>Symbol</string>
-	  </test>
-	  <edit name="family" mode="append" binding="strong">
-	    <string>Standard Symbols L</string>
-	  </edit>
-	</match>
-<!--
- 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>
-
-<!--
-  Load per-user customization file
--->
-	<include ignore_missing="yes">~/.fonts.conf</include>
-
 <!--
   Load local system customization file
 -->
 	<include ignore_missing="yes">conf.d</include>
-	<include ignore_missing="yes">local.conf</include>
-
-<!--
-  Provide required aliases for standard names
--->
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Bitstream Vera Serif</family>
-			<family>DejaVu Serif</family>
-			<family>Times New Roman</family>
-			<family>Thorndale AMT</family>
-			<family>Luxi Serif</family>
-			<family>Nimbus Roman No9 L</family>
-			<family>Times</family>
-			<family>Frank Ruehl</family>
-			<family>MgOpen Canonica</family>
-			<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>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Bitstream Vera Sans</family>
-			<family>DejaVu Sans</family>
-			<family>Verdana</family>
-			<family>Arial</family>
-			<family>Albany AMT</family>
-			<family>Luxi Sans</family>
-			<family>Nimbus Sans L</family>
-			<family>Helvetica</family>
-			<family>Nachlieli</family>
-			<family>MgOpen Modata</family>
-			<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>FreeSans</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Bitstream Vera Sans Mono</family>
-			<family>DejaVu Sans Mono</family>
-			<family>Andale Mono</family>
-			<family>Courier New</family>
-			<family>Cumberland AMT</family>
-			<family>Luxi Mono</family>
-			<family>Nimbus Mono L</family>
-			<family>Courier</family>
-			<family>Miriam Mono</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>Baekmuk Dotum</family>
-			<family>FreeMono</family>
-		</prefer>
-	</alias>
-
-<!-- 
- Artificial oblique for fonts without an italic or oblique version
- -->
- 
-	<match target="font">
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant" compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>1</double><double>0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<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>
-	</match>
-
-<!--
- Synthetic emboldening for fonts that do not have bold face available
- -->
 
-	<match target="font">
-		<!-- check to see if the font is just regular -->
-		<test name="weight" compare="less_eq">
-			<const>medium</const>
-		</test>
-		<!-- check to see if the pattern requests bold -->
-		<test target="pattern" name="weight" compare="more">
-			<const>medium</const>
-		</test>
-		<!--
-		  set the embolden flag
-		  needed for applications using cairo, e.g. gucharmap, gedit, ...
-		-->
-		<edit name="embolden" mode="assign">
-			<bool>true</bool>
-		</edit>
-		<!--
-		 set weight to bold
-		 needed for applications using Xft directly, e.g. Firefox, ...
-		-->
-		<edit name="weight" mode="assign">
-			<const>bold</const>
-		</edit>
-	</match>
+<!-- Font cache directory list -->
 
+	<cachedir>@FC_CACHEDIR@</cachedir>
+	<cachedir>~/.fontconfig</cachedir>
 
 	<config>
 <!--
@@ -477,6 +131,7 @@
 			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
 			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
 			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
 			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
 			<int>0x3164</int>	<!-- HANGUL FILLER -->
 			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
