* make/lilypond.fedora.spec.in (Requires): scrap kpathsea/tex

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

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 587cc9c155748fc91d13f71f17df8d808200a9a5..a5f34a71fa9555471647e8ed0ae283dd1d063135 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -3,16 +3,15 @@
   
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "all-font-metrics.hh"
-#include "font-metric.hh"
 #include "font-interface.hh"
-#include "grob.hh"
-#include "paper-def.hh"
-#include "warn.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 *
@@ -21,9 +20,12 @@ Font_interface::get_default_font (Grob *me)
   Font_metric *fm = unsmob_metrics (me->get_property ("font"));
   if (!fm)
     {
-      fm = select_font (me->get_paper (), font_alist_chain (me));
+      SCM chain = music_font_alist_chain (me);
+      
+      fm = select_font (me->get_layout (), chain);
       me->set_property ("font", fm->self_scm ());
     }
+  
   return fm;
 }
 
@@ -37,10 +39,20 @@ LY_DEFINE (ly_font_interface_get_default_font, "ly:get-default-font",
   return Font_interface::get_default_font (gr)->self_scm ();
 }
 
+
+SCM
+Font_interface::music_font_alist_chain (Grob *g)
+{
+  SCM defaults
+    = g->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+  return g->get_property_alist_chain (defaults);
+}
+
 SCM
-Font_interface::font_alist_chain (Grob *g)
+Font_interface::text_font_alist_chain (Grob *g)
 {
-  SCM defaults = g->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+  SCM defaults
+    = g->get_layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
   return g->get_property_alist_chain (defaults);
 }
 
@@ -48,4 +60,4 @@ 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-name font-size");
+              "font-family font-encoding font-name font-size");