X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=e1297714e2e936764af0f912373d7cd60af78471;hb=e65a2fb4c6e0e2e75f457531cab49aaf74364015;hp=01d9c5e1b7bf92fbd25e1fc5b1aade58fd19d6e4;hpb=867530093ed5374d6e28d2c11a933f3b991c226e;p=lilypond.git

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 01d9c5e1b7..e1297714e2 100644
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,56 +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.
 
-#include "all-font-metrics.hh"
-#include "font-metric.hh"
-#include "font-interface.hh"
-#include "score-element.hh"
-#include "paper-def.hh"
+  Copyright (C) 2000--2010 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.
 
-SCM
-Font_interface::font_alist_chain (Score_element *me)
-{
-  SCM defaults = gh_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
-				    me->paper_l ()->style_sheet_ ));
+  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.
 
-  SCM ch = gh_list (me->mutable_property_alist_,
-		    me->immutable_property_alist_,
-		    defaults,
-		    SCM_UNDEFINED);
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-  return ch;
-}
+#include "font-interface.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;
-
-  SCM ss = me->paper_l ()->style_sheet_;
+  Font_metric *fm = unsmob_metrics (me->get_property ("font"));
+  if (!fm)
+    {
+      SCM chain = music_font_alist_chain (me);
 
-  SCM proc = gh_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"),
-				ss));
+      fm = select_font (me->layout (), chain);
+      me->set_property ("font", fm->self_scm ());
+    }
 
-  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, font_alist_chain (me));
+SCM
+Font_interface::music_font_alist_chain (Grob *g)
+{
+  SCM defaults
+    = g->layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+  if (defaults == SCM_UNDEFINED)
+    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 (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).",
+
+	       /* properties */
+	       "font "
+	       "font-encoding "
+	       "font-family "
+	       "font-name "
+	       "font-series "
+	       "font-shape "
+	       "font-size "
+	       );