[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - more_fonts/fonts officecfg/registry

[Caolán McNamara]

 more_fonts/fonts/fc_local.conf                 |   16 ++++++++++++++--
 officecfg/registry/data/org/openoffice/VCL.xcu |    4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 8e4d52328e87e2d3ced4b6230f00980ea229f2cc
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

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>
commit 11853ae18e27c9b252ade624ab9011d3f0f630d5
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Oct 10 06:57:44 2013 +0000

    #i123456# add Caladea and Carlito as fallback fonts
    (cherry picked from commit c98566be40d6991467dde665af3eb0085d4ad80c)

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index e3b506a..71ff091 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -1534,7 +1534,7 @@
       </node>
       <node oor:name="calibri" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>hiraginomarugothicpronw3;hiraginomarugothicprow3</value>
+          <value>carlito;hiraginomarugothicpronw3;hiraginomarugothicprow3</value>
         </prop>
         <prop oor:name="FontType">
           <value>Normal,SansSerif</value>
@@ -1553,7 +1553,7 @@
       </node>
       <node oor:name="cambria" oor:op="replace">
         <prop oor:name="SubstFonts">
-          <value>applelisung</value>
+          <value>caladea;applelisung</value>
         </prop>
         <prop oor:name="FontType">
           <value>Normal,Serif</value>