X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=5e5f18ceb3f8a83d133820d762228c06a0cc44ad;hb=8cf69a467ad7650f5ca9da6fe2dfd4c7c088b239;hp=d48e60a4c050cbc195b4a55ceb40d9ea2ad9fc55;hpb=d1514c75fb3f45f7a490ebe64a005e435a9e4493;p=lilypond.git

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index d48e60a4c0..5e5f18ceb3 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,60 +1,76 @@
-/*   
-  font-interface.cc --  implement Font_interface
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-#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? 
- */
+/* 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<Font_metric> (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 (SCM_UNBNDP (defaults))
+    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 (SCM_UNBNDP (defaults))
+    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 "
+               "font-features "
+              );