X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=1990dccb7bf99c11b541765a6f2508a2ffb164f8;hb=6fb6249345ce846c8c55f843b21c6e85024a720b;hp=65fc05983af68b2a332f38de061bdf712eae03fa;hpb=11b3094461e045deafd0e2b1cef8c60f79e259a1;p=lilypond.git

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 65fc05983a..1990dccb7b 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,59 +1,64 @@
-/*   
-  font-interface.cc --  implement Font_interface
-  
+/*
+  font-interface.cc -- implement Font_interface
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "all-font-metrics.hh"
-#include "font-metric.hh"
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #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? 
- */
+/* todo: split up this func, reuse in text_item?  */
 Font_metric *
-Font_interface::get_default_font (Grob*me)
+Font_interface::get_default_font (Grob *me)
 {
-  Font_metric * fm =  unsmob_metrics (me->get_grob_property ("font"));
-  if (fm)
-    return fm;
+  Font_metric *fm = unsmob_metrics (me->get_property ("font"));
+  if (!fm)
+    {
+      SCM chain = music_font_alist_chain (me);
+
+      fm = select_font (me->layout (), chain);
+      me->set_property ("font", fm->self_scm ());
+    }
 
-  fm = select_font (me->get_paper (),  font_alist_chain (me));
-  me->set_grob_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}.")
+SCM
+Font_interface::music_font_alist_chain (Grob *g)
 {
-  Grob * gr  = unsmob_grob (grob);
-  SCM_ASSERT_TYPE(gr, grob, SCM_ARG1, __FUNCTION__, "grob");
-
-  return Font_interface::get_default_font (gr)->self_scm ();
+  SCM defaults
+    = g->layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+  if (defaults == SCM_UNDEFINED)
+    defaults = SCM_EOL;
+  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->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,
+	       "Any symbol that is typeset through fixed sets of glyphs, "
+	       "(i.e., fonts).",
 
-  
-
-
-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-design-size font-relative-size");
+	       /* properties */
+	       "font "
+	       "font-encoding "
+	       "font-family "
+	       "font-name "
+	       "font-series "
+	       "font-shape "
+	       "font-size "
+	       );