From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Fri, 12 Jun 2015 07:23:37 +0000 (+0900)
Subject: Issue 4441 / 2: Add local fontconfig configuration file loading
X-Git-Tag: release/2.19.22-1~36
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6831c973d078b4e41025c27b725887028aff3e73;p=lilypond.git

Issue 4441 / 2: Add local fontconfig configuration file loading

This commit becomes that
LilyPond local (dedicated) fontconfig configuration file
`fonts/lilypond-fonts.conf' can be used.
---

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 8c84584cae..26a9799b76 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -49,6 +49,17 @@ init_fontconfig ()
   else
     debug_output (_f ("Adding font directory: %s", dir.c_str ()));
 
+  string conf (lilypond_datadir + "/fonts/lilypond-fonts.conf");
+
+  if (!FcConfigParseAndLoad (font_config_global,
+                             (FcChar8 *)conf.c_str (),
+                             FcFalse))
+    error (_f ("failed adding fontconfig configuration file: %s",
+               conf.c_str ()));
+  else
+    debug_output (_f ("Adding fontconfig configuration file: %s",
+                      conf.c_str ()));
+
   debug_output (_ ("Building font database..."));
 
   FcConfigBuildFonts (font_config_global);