From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Sat, 8 Aug 2015 10:06:50 +0000 (+0900)
Subject: Issue 4544 / 2: Fix LilyPond default fonts definition
X-Git-Tag: release/2.19.26-1~52
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=0fbbdc6c58432060770d3d4f76e063c2028c0023;p=lilypond.git

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.
---

diff --git a/mf/00-lilypond-fonts.conf.in b/mf/00-lilypond-fonts.conf.in
new file mode 100644
index 0000000000..91f90af420
--- /dev/null
+++ b/mf/00-lilypond-fonts.conf.in
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+  <!--
+  Define LilyPond default fonts. Where a character doesn't exist in the
+  first font listed, the next font listed will be used instead for that
+  character. Also see scm/font.scm.
+  -->
+
+  <alias binding="strong">
+    <family>LilyPond Serif</family>
+    <prefer>
+      <family>Century Schoolbook L</family>
+      <family>DejaVu Serif</family>
+    </prefer>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+
+  <alias binding="strong">
+    <family>LilyPond Sans Serif</family>
+    <prefer>
+      <family>Nimbus Sans L</family>
+      <family>DejaVu Sans</family>
+    </prefer>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+
+  <alias binding="strong">
+    <family>LilyPond Monospace</family>
+    <prefer>
+      <family>Nimbus Mono L</family>
+      <family>DejaVu Sans Mono</family>
+    </prefer>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+
+</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/mf/lilypond-fonts.conf.in b/mf/lilypond-fonts.conf.in
deleted file mode 100644
index e32baf8147..0000000000
--- a/mf/lilypond-fonts.conf.in
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-  <!--
-  Define LilyPond default fonts. Where a character doesn't exist in the
-  first font listed, the next font listed will be used instead for that
-  character. Also see scm/font.scm.
-  -->
-
-  <alias binding="strong">
-    <family>LilyPond Serif</family>
-    <prefer>
-      <family>Century Schoolbook L</family>
-      <family>DejaVu Serif</family>
-    </prefer>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-
-  <alias binding="strong">
-    <family>LilyPond Sans Serif</family>
-    <prefer>
-      <family>Nimbus Sans L</family>
-      <family>DejaVu Sans</family>
-    </prefer>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-
-  <alias binding="strong">
-    <family>LilyPond Monospace</family>
-    <prefer>
-      <family>Nimbus Mono L</family>
-      <family>DejaVu Sans Mono</family>
-    </prefer>
-    <default>
-      <family>monospace</family>
-    </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/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")