From 0fbbdc6c58432060770d3d4f76e063c2028c0023 Mon Sep 17 00:00:00 2001
From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Sat, 8 Aug 2015 19:06:50 +0900
Subject: [PATCH] Issue 4544 / 2: Fix LilyPond default fonts definition

Due to conf file loading order, generic font aliases
`serif', `sans-serif', 'monospace' were unavailable
in LilyPond default fonts definition.
So the glyphs that are not contained
in the list of font definition,
like Japanese glyphs were used unexpected font.

This commit changes
LilyPond default fonts definition loading order
for enabling the aliases.
---
 ...onts.conf.in => 00-lilypond-fonts.conf.in} | 14 --------------
 mf/99-lilypond-fonts.conf.in                  | 19 +++++++++++++++++++
 scm/font.scm                                  |  4 ++--
 3 files changed, 21 insertions(+), 16 deletions(-)
 rename mf/{lilypond-fonts.conf.in => 00-lilypond-fonts.conf.in} (78%)
 create mode 100644 mf/99-lilypond-fonts.conf.in

diff --git a/mf/lilypond-fonts.conf.in b/mf/00-lilypond-fonts.conf.in
similarity index 78%
rename from mf/lilypond-fonts.conf.in
rename to mf/00-lilypond-fonts.conf.in
index e32baf8147..91f90af420 100644
--- a/mf/lilypond-fonts.conf.in
+++ b/mf/00-lilypond-fonts.conf.in
@@ -41,18 +41,4 @@
     </default>
   </alias>
 
-  <!--
-      Reject bitmap fonts
-      from fontconfig 70-no-bitmaps.conf
-      LilyPond can not use bitmap fonts.
-  -->
-
-  <selectfont>
-    <rejectfont>
-      <pattern>
-	<patelt name="scalable"><bool>false</bool></patelt>
-      </pattern>
-    </rejectfont>
-  </selectfont>
-
 </fontconfig>
diff --git a/mf/99-lilypond-fonts.conf.in b/mf/99-lilypond-fonts.conf.in
new file mode 100644
index 0000000000..83f8b5376e
--- /dev/null
+++ b/mf/99-lilypond-fonts.conf.in
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+  <!--
+      Reject bitmap fonts
+      from fontconfig 70-no-bitmaps.conf
+      LilyPond can not use bitmap fonts.
+  -->
+
+  <selectfont>
+    <rejectfont>
+      <pattern>
+	<patelt name="scalable"><bool>false</bool></patelt>
+      </pattern>
+    </rejectfont>
+  </selectfont>
+
+</fontconfig>
diff --git a/scm/font.scm b/scm/font.scm
index cad14c9ec5..5adf258831 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -251,8 +251,8 @@ used.  This is used to select the proper design size for the text fonts.
 ; 'typewriter.
 ;
 ; Note that 'LilyPond Serif', 'LilyPond Sans Serif' and 'Lilypond Monospace'
-; are aliases that are defined in mf/lilypond-fonts.conf.in (source file)
-; or fonts/lilypond-fonts.conf (installed file).
+; are aliases that are defined in mf/00-lilypond-fonts.conf.in (source file)
+; or fonts/00-lilypond-fonts.conf (installed file).
 
 (define*-public (set-global-fonts #:key 
   (music "emmentaler")
-- 
2.39.2