X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=fonts.conf.in;h=799140531447d9d231b7b4950fb21af3414cca37;hb=53512c1b97b5223eaf302184ea4c9c14439052eb;hp=c419850455aaae93d72247080c7f1f68f39ae307;hpb=f9ad97b0d4be53164970ca0a8ff605670a60587c;p=platform%2Fupstream%2Ffontconfig.git

diff --git a/fonts.conf.in b/fonts.conf.in
index c419850..7991405 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -1,37 +1,38 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts.conf file to configure system font access -->
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
 <fontconfig>
+	<its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+		<its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+	</its:rules>
+
+	<description>Default configuration file</description>
 
 <!--
+	DO NOT EDIT THIS FILE.
+	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+	LOCAL CHANGES BELONG IN 'local.conf'.
+
 	The intent of this standard configuration file is to be adequate for
 	most environments.  If you have a reasonably normal environment and
 	have found problems with this configuration, they are probably
-	things that others will also want fixed.  Please send any suggested
-	changes to fonts@xfree86.org so that future releases can include
-	such changes.
-
-	Keith Packard
--->
+	things that others will also want fixed.  Please submit any
+	problems to the fontconfig bugzilla system located at fontconfig.org
 
-<!-- FONTPATH_START -->
+	Note that the normal 'make install' procedure for fontconfig is to
+	replace any existing fonts.conf file with the new version.  Place
+	any local customizations in local.conf which this file references.
 
-<!-- 
-  Common X11R6 font directories
+	Keith Packard
 -->
 
-	<dir>/usr/X11R6/lib/X11/fonts</dir>
- 	<dir>/usr/share/fonts</dir>
-	<dir>~/.fonts</dir>
+<!-- Font directory list -->
 
-<!-- FONTPATH_END -->
-
-<!--
-  Enable sub-pixel rendering
-	<match target="font">
-		<edit name="rgba" mode="assign"><const>rgb</const></edit>
-	</match>
--->
+	<dir>@FC_DEFAULT_FONTS@</dir>
+	@FC_FONTPATH@
+	<dir prefix="xdg">fonts</dir>
+	<!-- the following element will be removed in the future -->
+	<dir>~/share/fonts</dir>
 
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
@@ -40,7 +41,7 @@
 		<test qual="any" name="family">
 			<string>mono</string>
 		</test>
-		<edit name="family" mode="assign">
+		<edit name="family" mode="assign" binding="same">
 			<string>monospace</string>
 		</edit>
 	</match>
@@ -52,7 +53,7 @@
 		<test qual="any" name="family">
 			<string>sans serif</string>
 		</test>
-		<edit name="family" mode="assign">
+		<edit name="family" mode="assign" binding="same">
 			<string>sans-serif</string>
 		</edit>
 	</match>
@@ -64,217 +65,25 @@
 		<test qual="any" name="family">
 			<string>sans</string>
 		</test>
-		<edit name="family" mode="assign">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  Mark common families with their generics so we'll get
-  something reasonable
--->
-
-<!--
-  Serif faces
- -->
-	<alias>
-		<family>Times</family>
-		<family>Times New Roman</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>Baekmuk Batang</family>			
-		<default><family>serif</family></default>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>Helvetica</family>
-		<family>Arial</family>
-		<family>Verdana</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>Baekmuk Dotum</family>
-		<family>SimSun</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-<!--
-  Monospace faces
- -->
- 	<alias>
-		<family>Courier</family>
-		<family>Courier New</family>
-		<family>Andale Mono</family>
-		<family>Luxi Mono</family>
-		<family>Nimbus Mono L</family>
-		<family>NSimSun</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">
+		<edit name="family" mode="assign" binding="same">
 			<string>sans-serif</string>
 		</edit>
 	</match>
-	
-<!--
-  Load per-user customization file
--->
-	<include ignore_missing="yes">~/.fonts.conf</include>
 
 <!--
   Load local system customization file
 -->
-	<include ignore_missing="yes">local.conf</include>
+	<include ignore_missing="yes">@CONFIGDIR@</include>
 
-<!--
-  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>
+<!-- Font cache directory list -->
 
-<!--
-  Provide required aliases for standard names
--->
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Times New Roman</family>
-			<family>Nimbus Roman No9 L</family>
-			<family>Luxi Serif</family>
-			<family>Times</family>
-			<family>Kochi Mincho</family>
-			<family>AR PL SungtiL GB</family>
-			<family>AR PL Mingti2L Big5</family>
-			<family>Baekmuk Batang</family>			
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Verdana</family>
-			<family>Nimbus Sans L</family>
-			<family>Luxi Sans</family>
-			<family>Arial</family>
-			<family>Helvetica</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>AR PL KaitiM Big5</family>
-			<family>Baekmuk Dotum</family>
-			<family>SimSun</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Andale Mono</family>
-			<family>Courier New</family>
-			<family>Luxi Mono</family>
-			<family>Nimbus Mono L</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>Baekmuk Dotum</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>.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>
-	</match>
+	<cachedir>@FC_CACHEDIR@</cachedir>
+	<cachedir prefix="xdg">fontconfig</cachedir>
+	<!-- the following element will be removed in the future -->
+	<cachedir>~/.cache/fontconfig</cachedir>
 
 	<config>
 <!--
-  These are the default Unicode chars that are expected to be blank
-  in fonts.  All other blank chars are assumed to be broken and
-  won't appear in the resulting charsets
- -->
-		<blank>
-			<int>0x20</int>		<!-- space -->
-			<int>0xa0</int>		<!-- nsbp  -->
-			<int>0x115f</int>	<!-- choseong filler -->
-			<int>0x1160</int>	<!-- jungseong filler -->
-			<int>0x2000</int>	<!-- general punctuation spaces -->
-			<int>0x2001</int>
-			<int>0x2002</int>
-			<int>0x2003</int>
-			<int>0x2004</int>
-			<int>0x2005</int>
-			<int>0x2005</int>
-			<int>0x2006</int>
-			<int>0x2007</int>
-			<int>0x2008</int>
-			<int>0x2009</int>
-			<int>0x200a</int>
-			<int>0x200b</int>
-			<int>0x200c</int>
-			<int>0x200d</int>
-			<int>0x200e</int>
-			<int>0x200f</int>
-			<int>0x202a</int>
-			<int>0x202b</int>
-			<int>0x202c</int>
-			<int>0x202d</int>
-			<int>0x202e</int>
-			<int>0x202f</int>
-			<int>0x3000</int>	<!-- CJK space -->
-			<int>0x3164</int>	<!-- HANGUL FILLER -->
-			<int>0xfeff</int>	<!-- zero width no-break space -->
-		</blank>
-<!--
   Rescan configuration every 30 seconds when FcFontSetList is called
  -->
 		<rescan>