X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=878c3031a413fc42c2866dcfae9f890cecf712d4;hb=20d2040d6608a0d5e575b517e69237c1e3d2adf8;hp=587cc9c155748fc91d13f71f17df8d808200a9a5;hpb=6817805afca5e84e74479bdd951609b80210095b;p=lilypond.git

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 587cc9c155..878c3031a4 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--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,15 +20,18 @@ 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;
 }
 
 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}.")
+	   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");
@@ -38,9 +40,18 @@ LY_DEFINE (ly_font_interface_get_default_font, "ly:get-default-font",
 }
 
 SCM
-Font_interface::font_alist_chain (Grob *g)
+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::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 +59,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");