X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=de787fd852bf2e4ff04a1fdb96d80d54e412dc89;hb=378c9a561c8ce179398a88066e803aba6ea00afc;hp=3255c8bd8fafa62dc8add5e80570d3b0bbbe8377;hpb=a0f4b682135cf77e168a7201adbb4d083a1972d4;p=lilypond.git

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 3255c8bd8f..de787fd852 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,45 +1,75 @@
-/*   
-  font-interface.cc --  implement Font_interface
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 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 "score-element.hh"
-#include "paper-def.hh"
 
-/*
-  todO : split up this func, reuse in text_item? 
- */
+#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 *
-Font_interface::get_default_font (Score_element*me)
+Font_interface::get_default_font (Grob *me)
 {
-  Font_metric * fm =  unsmob_metrics (me->get_elt_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);
 
-  SCM ss = me->paper_l ()->style_sheet_;
+      fm = select_font (me->layout (), chain);
+      me->set_property ("font", fm->self_scm ());
+    }
 
-  SCM proc = gh_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"),
-				ss));
-
-  SCM fonts = gh_cdr (scm_assoc (ly_symbol2scm ("fonts"), ss));
-  SCM defaults = gh_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
-				    ss));
+  return fm;
+}
 
-  assert (gh_procedure_p (proc));
-  SCM font_name = gh_call2 (proc, fonts,
-			    gh_list (me->mutable_property_alist_,
-				     me->immutable_property_alist_,
-				     defaults,
-				     SCM_UNDEFINED));
+SCM
+Font_interface::music_font_alist_chain (Grob *g)
+{
+  SCM defaults
+    = g->layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+  if (SCM_UNBNDP (defaults))
+    defaults = SCM_EOL;
+  return g->get_property_alist_chain (defaults);
+}
 
-  fm = me->paper_l ()->find_font (font_name, 1.0);
-  me->set_elt_property ("font", fm->self_scm ());
-  return fm;
+SCM
+Font_interface::text_font_alist_chain (Grob *g)
+{
+  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).",
+
+               /* properties */
+               "font "
+               "font-encoding "
+               "font-family "
+               "font-name "
+               "font-series "
+               "font-shape "
+               "font-size "
+              );