X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=a65a3c14bfb790b2bc9c4713c832c7b9e293acfa;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=23a12a46d05a1c7a02e48cb44b80bb9aecd86ff2;hpb=5b9067e9603298292b420f27a0a665a836bd3644;p=lilypond.git

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 23a12a46d0..a65a3c14bf 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,18 +1,17 @@
 /*
-  font-interface.cc --  implement Font_interface
-  
+  font-interface.cc -- implement Font_interface
+
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "all-font-metrics.hh"
-#include "font-metric.hh"
 #include "font-interface.hh"
-#include "grob.hh"
+
+#include "all-font-metrics.hh"
 #include "output-def.hh"
 #include "warn.hh"
-
+#include "grob.hh"
 
 /* todo: split up this func, reuse in text_item?  */
 Font_metric *
@@ -22,30 +21,21 @@ Font_interface::get_default_font (Grob *me)
   if (!fm)
     {
       SCM chain = music_font_alist_chain (me);
-      
-      fm = select_font (me->get_paper (), 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_paper ()->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);
 }
 
@@ -53,12 +43,22 @@ SCM
 Font_interface::text_font_alist_chain (Grob *g)
 {
   SCM defaults
-    = g->get_paper ()->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);
 }
 
-ADD_INTERFACE (Font_interface, "font-interface",
-	       "Any symbol that is typeset through fixed sets of glyphs, "
-	       " (ie. fonts)",
-	       "font-magnification font font-series font-shape "
-	       "font-family font-encoding font-name font-size");
+ADD_INTERFACE (Font_interface,
+	       "Any symbol that is typeset through fixed sets of glyphs,"
+	       " (i.e., fonts).",
+
+	       /* properties */
+	       "font "
+	       "font-encoding "
+	       "font-family "
+	       "font-name "
+	       "font-series "
+	       "font-shape "
+	       "font-size "
+	       );