From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 28 Jul 2003 12:15:05 +0000 (+0000)
Subject: (get_font): bugfix: take font-name from
X-Git-Tag: release/1.7.30~49
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b743214caaa6e14b15ed048e3b497256b087de28;p=lilypond.git

(get_font): bugfix: take font-name from
alist chain too. This fixes font-name override for \markup.
---

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index dc0882e23c..12bdbf2eb9 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -108,7 +108,7 @@ Font_interface::get_font (Grob *me, SCM chain)
 {
   SCM name = ly_assoc_chain (ly_symbol2scm  ("font-name"), chain);
   
-  if (!gh_string_p (name))
+  if (!gh_pair_p (name) || !gh_string_p (gh_cdr (name)))
     {
       Paper_def * p =  me->get_paper ();
 
@@ -118,6 +118,8 @@ Font_interface::get_font (Grob *me, SCM chain)
       assert (gh_procedure_p (proc));
       name = gh_call2 (proc, fonts, chain);
     }
+  else
+    name  = gh_cdr (name);
   
   SCM mag = ly_assoc_chain (ly_symbol2scm ("font-magnification"), chain);