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

[Akira TAGOH]

 conf.d/30-metric-aliases.conf |   11 +++++++++++
 conf.d/45-latin.conf          |   16 ++++++++++++++++
 2 files changed, 27 insertions(+)

New commits:
commit 104a2af0dd60f68a1e3f9e5f99e6180336ce28c2
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Aug 21 13:12:41 2013 +0900

    Bug 63399 - Add default aliases for Georgia, Garamond, Palatino Linotype, Trebuchet MS

diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf
index 09fd526..aa62ed4 100644
--- a/conf.d/45-latin.conf
+++ b/conf.d/45-latin.conf
@@ -45,6 +45,22 @@
 		<family>Thorndale</family>
 		<default><family>serif</family></default>
 	</alias>
+	<alias>
+		<family>Georgia</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Garamond</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Palatino Linotype</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Trebuchet MS</family>
+		<default><family>serif</family></default>
+	</alias>
 <!--
   Sans-serif faces
  -->
commit 010c973df5544996f5d8774e361d45daa5b61b52
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Aug 21 13:12:22 2013 +0900

    Bug 68340 - More metric compat fonts

diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index f25052a..0fd0b8a 100644
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -230,6 +230,7 @@
 	<alias binding="same">
 	  <family>Helvetica</family>
 	  <accept>
+	  <family>TeX Gyre Heros</family>
 	  <family>Nimbus Sans L</family>
 	  </accept>
 	</alias>
@@ -237,6 +238,7 @@
 	<alias binding="same">
 	  <family>Times</family>
 	  <accept>
+	  <family>TeX Gyre Termes</family>
 	  <family>Nimbus Roman No9 L</family>
 	  </accept>
 	</alias>
@@ -253,6 +255,7 @@
 	<alias binding="same">
 	  <family>Arial</family>
 	  <accept>
+	    <family>TeX Gyre Heros</family>
 	    <family>Arimo</family>
 	    <family>Liberation Sans</family>
 	    <family>Albany</family>
@@ -270,6 +273,7 @@
 	<alias binding="same">
 	  <family>Times New Roman</family>
 	  <accept>
+	    <family>TeX Gyre Termes</family>
 	    <family>Tinos</family>
 	    <family>Liberation Serif</family>
 	    <family>Thorndale</family>
@@ -278,6 +282,13 @@
 	</alias>
 
 	<alias binding="same">
+	  <family>Georgia</family>
+	  <accept>
+	    <family>Gelasio</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
 	  <family>Courier New</family>
 	  <accept>
 	    <family>Cousine</family>