Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 01d9c5e1b7bf92fbd25e1fc5b1aade58fd19d6e4..16f51c82b344422fcfb2caec317c03e1627690d3 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -1,56 +1,64 @@
-/*   
-  font-interface.cc --  implement Font_interface
-  
+/*
+  font-interface.cc -- implement Font_interface
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 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 "score-element.hh"
-#include "paper-def.hh"
 
+#include "all-font-metrics.hh"
+#include "output-def.hh"
+#include "warn.hh"
+#include "grob.hh"
 
-SCM
-Font_interface::font_alist_chain (Score_element *me)
+/* todo: split up this func, reuse in text_item?  */
+Font_metric *
+Font_interface::get_default_font (Grob *me)
 {
-  SCM defaults = gh_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
-                                   me->paper_l ()->style_sheet_ ));
+  Font_metric *fm = unsmob_metrics (me->get_property ("font"));
+  if (!fm)
+    {
+      SCM chain = music_font_alist_chain (me);
 
-  SCM ch = gh_list (me->mutable_property_alist_,
-                   me->immutable_property_alist_,
-                   defaults,
-                   SCM_UNDEFINED);
+      fm = select_font (me->layout (), chain);
+      me->set_property ("font", fm->self_scm ());
+    }
 
-  return ch;
+  return fm;
 }
 
-/*
-  todo: split up this func, reuse in text_item? 
- */
-Font_metric *
-Font_interface::get_default_font (Score_element*me)
+SCM
+Font_interface::music_font_alist_chain (Grob *g)
 {
-  Font_metric * fm =  unsmob_metrics (me->get_elt_property ("font"));
-  if (fm)
-    return fm;
-
-  SCM ss = me->paper_l ()->style_sheet_;
-
-  SCM proc = gh_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"),
-                               ss));
+  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 fonts = gh_cdr (scm_assoc (ly_symbol2scm ("fonts"), ss));
-  SCM defaults = gh_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
-                                   ss));
+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);
+}
 
-  assert (gh_procedure_p (proc));
-  SCM font_name = gh_call2 (proc, fonts, font_alist_chain (me));
+ADD_INTERFACE (Font_interface,
+              "Any symbol that is typeset through fixed sets of glyphs,"
+              " (i.e., fonts).",
 
-  fm = me->paper_l ()->find_font (font_name, 1.0);
-  me->set_elt_property ("font", fm->self_scm ());
-  return fm;
-}
+              /* properties */
+              "font "
+              "font-encoding "
+              "font-family "
+              "font-name "
+              "font-series "
+              "font-shape "
+              "font-size "
+              );