[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 conf.d/30-metric-aliases.conf |   50 ++++++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 11 deletions(-)

New commits:
commit 25ccc3f3d27d8affd45c4b0a8041ef757dbb20dd
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Apr 20 19:08:59 2012 +0900

    Bug 47721 - Add ChromeOS fonts to 30-metric-aliases.conf

diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index 4202ae9..ccc3e24 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -29,10 +29,14 @@
 			Albany AMT
 			Thorndale AMT
 			Cumberland AMT
+		Google CrOS Core fonts:
+			Arimo
+			Cousine
+			Tinos
 
 	     Of these, URW fonts are design compatible with PostScrict fonts,
-	     and the Liberation, StarOffice, and AMT ones are compatible with
-	     Microsoft fonts.
+	     and the Liberation, StarOffice, AMT and CrOS Core ones are
+	     compatible with Microsoft fonts.
 
 	     We want for each of them to fallback to any of these
 	     available, but in an order preferring similar designs
@@ -75,6 +79,13 @@
 
 	<!-- Microsoft -->
 	<alias binding="same">
+	  <family>Arimo</family>
+	  <default>
+	    <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>Liberation Sans</family>
 	  <default>
 	  <family>Arial</family>
@@ -96,6 +107,13 @@
 	</alias>
 
 	<alias binding="same">
+	  <family>Tinos</family>
+	  <default>
+	    <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>Liberation Serif</family>
 	  <default>
 	  <family>Times New Roman</family>
@@ -117,6 +135,13 @@
 	</alias>
 
 	<alias binding="same">
+	  <family>Cousine</family>
+	  <default>
+	    <family>Courier New</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
 	  <family>Liberation Mono</family>
 	  <default>
 	  <family>Courier New</family>
@@ -219,27 +244,30 @@
 	<alias binding="same">
 	  <family>Arial</family>
 	  <accept>
-	  <family>Liberation Sans</family>
-	  <family>Albany</family>
-	  <family>Albany AMT</family>
+	    <family>Arimo</family>
+	    <family>Liberation Sans</family>
+	    <family>Albany</family>
+	    <family>Albany AMT</family>
 	  </accept>
 	</alias>
 
 	<alias binding="same">
 	  <family>Times New Roman</family>
 	  <accept>
-	  <family>Liberation Serif</family>
-	  <family>Thorndale</family>
-	  <family>Thorndale AMT</family>
+	    <family>Tinos</family>
+	    <family>Liberation Serif</family>
+	    <family>Thorndale</family>
+	    <family>Thorndale AMT</family>
 	  </accept>
 	</alias>
 
 	<alias binding="same">
 	  <family>Courier New</family>
 	  <accept>
-	  <family>Liberation Mono</family>
-	  <family>Cumberland</family>
-	  <family>Cumberland AMT</family>
+	    <family>Cousine</family>
+	    <family>Liberation Mono</family>
+	    <family>Cumberland</family>
+	    <family>Cumberland AMT</family>
 	  </accept>
 	</alias>