[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Akira TAGOH]

 conf.d/30-metric-aliases.conf |   47 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

New commits:
commit 2e933bd8bcad936717b6b9d8a22b86b7ddb5457e
Author: Frederic Crozat <fcrozat at suse.com>
Date:   Fri Dec 6 14:23:52 2013 +0100

    Add metric aliases for additional Google ChromeOS fonts
    
    MS fonts Cambria, Symbol and Calibri have compat metrics fonts
    from ChromeOS.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=72395

diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index c9ee79f..49a9602 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -24,6 +24,9 @@ Arial             Liberation Sans         Arimo                    Albany
 Arial Narrow      Liberation Sans Narrow
 Times New Roman   Liberation Serif        Tinos                    Thorndale          Thorndale AMT
 Courier New       Liberation Mono         Cousine                  Cumberland         Cumberland AMT
+Cambria                                   Caladea
+Calibri                                   Carlito
+Symbol                                    SymbolNeu
 
 Microsoft fonts:  Other fonts:
 ================  ============
@@ -307,7 +310,26 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>Caladea</family>
+	  <default>
+	  <family>Cambria</family>
+	  </default>
+	</alias>
 
+	<alias binding="same">
+	  <family>Carlito</family>
+	  <default>
+	  <family>Calibri</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>SymbolNeu</family>
+	  <default>
+	  <family>Symbol</family>
+	  </default>
+  </alias>
 
 <!-- Accept the other group as fallback -->
 
@@ -494,4 +516,25 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>Cambria</family>
+	  <accept>
+	    <family>Caladea</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Calibri</family>
+	  <accept>
+	    <family>Carlito</family>
+	  </accept>
+  </alias>
+
+	<alias binding="same">
+	  <family>Symbol</family>
+	  <accept>
+	    <family>SymbolNeu</family>
+	  </accept>
+  </alias>
+
 </fontconfig>
commit 6a06e29491ffdb5be6342164b96de59c6fa07b32
Author: Frederic Crozat <fcrozat at suse.com>
Date:   Fri Dec 6 14:08:08 2013 +0100

    Fix inversion between Tinos and Cousine in the comment

diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index d0d9ea2..c9ee79f 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -22,8 +22,8 @@ Microsoft fonts:  Liberation fonts:       Google CrOS core fonts:  StarOffice fo
 ================  ======================  =======================  =================  ==============
 Arial             Liberation Sans         Arimo                    Albany             Albany AMT
 Arial Narrow      Liberation Sans Narrow
-Times New Roman   Liberation Serif        Cousine                  Thorndale          Thorndale AMT
-Courier New       Liberation Mono         Tinos                    Cumberland         Cumberland AMT
+Times New Roman   Liberation Serif        Tinos                    Thorndale          Thorndale AMT
+Courier New       Liberation Mono         Cousine                  Cumberland         Cumberland AMT
 
 Microsoft fonts:  Other fonts:
 ================  ============