X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=db4aa39d18bc0a7f5d6ff63900f74b4c07653f88;hb=e10092cbaddbbe8bf2a3668eb70ee4dafb54af8a;hp=e48f8e0116669eab582d6923cbeea52714ca6b51;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index e48f8e0116..db4aa39d18 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,9 +1,9 @@
 /*
   font-interface.cc -- implement Font_interface
-  
+
   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"
@@ -21,30 +21,21 @@ Font_interface::get_default_font (Grob *me)
   if (!fm)
     {
       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 ());
     }
-  
-  return fm;
-}
 
-LY_DEFINE (ly_font_interface_get_default_font, "ly:get-default-font",
-	  1 , 0, 0, (SCM grob),
-	  "Return the default font for grob @var{gr}.")
-{
-  Grob *gr = unsmob_grob (grob);
-  SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "grob");
-
-  return Font_interface::get_default_font (gr)->self_scm ();
+  return fm;
 }
 
-
 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);
 }
 
@@ -52,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);
 }