*** empty log message ***

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

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 23a12a46d05a1c7a02e48cb44b80bb9aecd86ff2..d96529383a607058bd59ca2783cb40629d67b72b 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -6,13 +6,12 @@
   (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.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 *
@@ -23,7 +22,7 @@ Font_interface::get_default_font (Grob *me)
     {
       SCM chain = music_font_alist_chain (me);
       
-      fm = select_font (me->get_paper (), chain);
+      fm = select_font (me->get_layout (), chain);
       me->set_property ("font", fm->self_scm ());
     }
   
@@ -45,7 +44,7 @@ SCM
 Font_interface::music_font_alist_chain (Grob *g)
 {
   SCM defaults
-    = g->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+    = g->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
   return g->get_property_alist_chain (defaults);
 }
 
@@ -53,7 +52,7 @@ SCM
 Font_interface::text_font_alist_chain (Grob *g)
 {
   SCM defaults
-    = g->get_paper ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
+    = g->get_layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
   return g->get_property_alist_chain (defaults);
 }