From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 10 Jun 2008 03:17:39 +0000 (-0300)
Subject: Fix #313 (2).
X-Git-Tag: release/2.11.49-1~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4032a02d78c8ff543ad275dc829bace9d5ee02fd;p=lilypond.git

Fix #313 (2).

Reset font-name for musicglyph. Add regtest.
---

diff --git a/input/regression/markup-music-glyph.ly b/input/regression/markup-music-glyph.ly
new file mode 100644
index 0000000000..3afe426c85
--- /dev/null
+++ b/input/regression/markup-music-glyph.ly
@@ -0,0 +1,17 @@
+\header {
+
+  texidoc = "Reset fontname for musicglyph. For unknown glyphs, we print a warning."
+
+}
+
+\version "2.11.47"
+
+{
+  c'^\markup
+  {
+    \override #'(font-name . "Sans")
+    { c'est un B \flat \musicglyph #"UNKNOWN-GLYPH" }
+				% to get \flat, do:
+				%  \normal-text \flat
+  }
+}
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 611e3eb08d..c81a0e2e8f 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -1562,7 +1562,10 @@ the possible glyphs.
 }
 @end lilypond"
 
-  (let* ((font (ly:paper-get-font layout (cons '((font-encoding . fetaMusic))
+  (let* ((font (ly:paper-get-font layout
+				  (cons '((font-encoding . fetaMusic)
+					  (font-name . #f))
+					
 						 props)))
 	 (glyph (ly:font-get-glyph font glyph-name)))
     (if (null? (ly:stencil-expr glyph))