Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

[lilypond.git] / lily / font-interface.cc

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index c9400629ae49589d88c0cc2d8a88ba0350611366..db4aa39d18bc0a7f5d6ff63900f74b4c07653f88 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "font-interface.hh"
@@ -22,7 +22,7 @@ Font_interface::get_default_font (Grob *me)
     {
       SCM chain = music_font_alist_chain (me);
 
-      fm = select_font (me->get_layout (), chain);
+      fm = select_font (me->layout (), chain);
       me->set_property ("font", fm->self_scm ());
     }
 
@@ -33,7 +33,9 @@ SCM
 Font_interface::music_font_alist_chain (Grob *g)
 {
   SCM defaults
-    = g->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+    = g->layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+  if (defaults == SCM_UNDEFINED)
+    defaults = SCM_EOL;
   return g->get_property_alist_chain (defaults);
 }
 
@@ -41,7 +43,9 @@ SCM
 Font_interface::text_font_alist_chain (Grob *g)
 {
   SCM defaults
-    = g->get_layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
+    = g->layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
+  if (defaults == SCM_UNDEFINED)
+    defaults = SCM_EOL;
   return g->get_property_alist_chain (defaults);
 }