[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - more_fonts/fonts

[Caolán McNamara]

 more_fonts/fonts/fc_local.conf |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit a046875b590bb840790a0d2aa2f63154d0d2f9a8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 10 10:12:44 2013 +0100

    update local font.conf for Calibri/Carlito Cambria/Caladea
    
    Change-Id: I9391876f2b09750ad5f44483f489743581948d21
    Reviewed-on: https://gerrit.libreoffice.org/6587
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf
index c442c83..6af763c 100644
--- a/more_fonts/fonts/fc_local.conf
+++ b/more_fonts/fonts/fc_local.conf
@@ -11,13 +11,25 @@
 	  </default>
 	</alias>
 
-<!-- -->
 	<alias binding="same">
 	  <family>Arial Narrow</family>
 	  <accept>
 	  <family>Liberation Sans Narrow</family>
 	  </accept>
 	</alias>
-<!-- -->
+
+	<alias binding="same">
+	  <family>Calibri</family>
+	  <accept>
+	  <family>Carlito</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Cambria</family>
+	  <accept>
+	  <family>Caladea</family>
+	  </accept>
+	</alias>
 
 </fontconfig>