From b68922d51f52ca6ab9daa0105ef5c57f35bfbdcf Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 23 Apr 2012 14:49:28 +0200
Subject: fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012

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

(limited to 'fontconfig/conf.d')

diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf
index 4202ae92e..ccc3e246d 100644
--- a/fontconfig/conf.d/30-metric-aliases.conf
+++ b/fontconfig/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
@@ -74,6 +78,13 @@
 
 
 	<!-- Microsoft -->
+	<alias binding="same">
+	  <family>Arimo</family>
+	  <default>
+	    <family>Arial</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>Liberation Sans</family>
 	  <default>
@@ -95,6 +106,13 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>Tinos</family>
+	  <default>
+	    <family>Times New Roman</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>Liberation Serif</family>
 	  <default>
@@ -116,6 +134,13 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>Cousine</family>
+	  <default>
+	    <family>Courier New</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>Liberation Mono</family>
 	  <default>
@@ -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>
 
-- 
cgit v1.2.3