* input/regression/{many}.ly: refresh, trying to guess how

[lilypond.git] / lily / font-interface.cc

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index dc6bd81d57117680f793c74021d18815d90095b1..4c3bf6524b9e774438f38ad1863845daea04d19f 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -3,77 +3,58 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "all-font-metrics.hh"
 #include "font-metric.hh"
 #include "font-interface.hh"
-#include "score-element.hh"
+#include "grob.hh"
 #include "paper-def.hh"
+#include "warn.hh"
 
 
-SCM
-Font_interface::font_alist_chain (Score_element *me)
-{
-  SCM defaults = gh_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
-                                   me->paper_l ()->style_sheet_ ));
-
-  SCM ch = gh_list (me->mutable_property_alist_,
-                   me->immutable_property_alist_,
-                   defaults,
-                   SCM_UNDEFINED);
-
-  return ch;
-}
-
 /*
   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"));
+  Font_metric * fm =  unsmob_metrics (me->get_grob_property ("font"));
   if (fm)
     return fm;
 
-  fm = get_font (me,  font_alist_chain (me));
-  me->set_elt_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;
 }
 
-Font_metric *
-Font_interface::get_font (Score_element *me, SCM chain)
-{
-  
-  SCM ss = me->paper_l ()->style_sheet_;
-
-  SCM proc = gh_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"),
-                               ss));
 
-  SCM fonts = gh_cdr (scm_assoc (ly_symbol2scm ("fonts"), ss));
-
-  assert (gh_procedure_p (proc));
-  SCM font_name = gh_call2 (proc, fonts, chain);
-
-  Font_metric *fm = me->paper_l ()->find_font (font_name, 1.0);
+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}.")
+{
+  Grob * gr  = unsmob_grob (grob);
+  SCM_ASSERT_TYPE(gr, grob, SCM_ARG1, __FUNCTION__, "grob");
 
-  return fm;
+  return Font_interface::get_default_font (gr)->self_scm ();
 }
 
+
 SCM
-Font_interface::add_style (Score_element* me, SCM style, SCM chain)
+Font_interface::font_alist_chain (Grob*g)
 {
-  assert (gh_symbol_p (style));
+  SCM defaults = g->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
   
-  SCM sheet = me->paper_l ()->style_sheet_;
-      
-  SCM style_alist = gh_cdr (scm_assoc (ly_symbol2scm ("style-alist"), sheet));
-  SCM entry = scm_assoc (style, style_alist);
-  if (gh_pair_p (entry))
-    {
-      chain = gh_cons (gh_cdr (entry), chain);
-    }
-  return chain;
+  return g->get_property_alist_chain (defaults);
 }
+
+
+  
+
+
+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");