* scm/chord-name.scm: remove new-chord-name-brew-molecule ; use

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

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index d120bd2d0e220a4ffd24f116cadab67b2e9febda..65fc05983af68b2a332f38de061bdf712eae03fa 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -15,45 +15,6 @@
 #include "warn.hh"
 
 
-/*
-  TODO revise font handling.
-
-
-* relative sizes should relate to staff-space, eg.  font-staff-space
-= 1.2 ^ relative-size
-
-* If a relative size is given, lily should magnify the closest
-design size font to match that. (ie. fonts should have variable
-scaling)
-
-(this requires that fonts are stored as (filename , designsize))
-
-
-  
- */
-
-SCM
-Font_interface::font_alist_chain (Grob *me)
-{
-  /*
-    Ugh: why the defaults?
-   */
-  SCM defaults = me->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
-
-  SCM ch = me->get_property_alist_chain (defaults);
-  return ch;
-}
-
-
-MAKE_SCHEME_CALLBACK(Font_interface, get_property_alist_chain, 1);
-SCM
-Font_interface::get_property_alist_chain (SCM grob)
-{
-  Grob * g = unsmob_grob (grob);
-  SCM_ASSERT_TYPE(g, grob, SCM_ARG1, __FUNCTION__, "grob");
-  return  font_alist_chain (g);
-}
-
 /*
   todo: split up this func, reuse in text_item? 
  */
@@ -64,7 +25,7 @@ Font_interface::get_default_font (Grob*me)
   if (fm)
     return fm;
 
-  fm = get_font (me->get_paper (),  font_alist_chain (me));
+  fm = select_font (me->get_paper (),  font_alist_chain (me));
   me->set_grob_property ("font", fm->self_scm ());
   return fm;
 }
@@ -81,134 +42,16 @@ LY_DEFINE(ly_font_interface_get_default_font,
 }
 
 
-Font_metric *
-Font_interface::get_font (Paper_def *paper, SCM chain)
-{
-  SCM name = ly_assoc_chain (ly_symbol2scm  ("font-name"), chain);
-  
-  if (!gh_pair_p (name) || !gh_string_p (gh_cdr (name)))
-    {
-      SCM proc = paper->lookup_variable (ly_symbol2scm ("properties-to-font"));
-      SCM fonts = paper->lookup_variable (ly_symbol2scm ("fonts"));
-
-      assert (gh_procedure_p (proc));
-      name = gh_call2 (proc, fonts, chain);
-    }
-  else
-    name  = gh_cdr (name);
-  
-  SCM mag = ly_assoc_chain (ly_symbol2scm ("font-magnification"), chain);
-  
-  Real rmag = gh_pair_p (mag) && gh_number_p (gh_cdr (mag))
-    ? gh_scm2double (gh_cdr (mag)) : 1.0;
-  
-  Font_metric *fm = paper->find_font (name, rmag);
-  return fm;
-}
-
-/*
-SCM routines for looking up fonts.
-
-wtk-fugue2, SCM:
-
-real   0m31.862s
-user   0m29.110s
-sys    0m0.260s
-
-wtk-fugue2, C++:
-
-real   0m26.964s
-user   0m24.850s
-sys    0m0.280s
-
-
-so a 14% speedup.
-
-*/
-
-static SCM shape_sym, family_sym, series_sym, rel_str0_sym, design_str0_sym, wild_sym;
-
-
-static void
-init_syms ()
-{
-  shape_sym  = scm_permanent_object (ly_symbol2scm ("font-shape"));
-  family_sym = scm_permanent_object (ly_symbol2scm ("font-family"));
-  series_sym = scm_permanent_object (ly_symbol2scm ("font-series"));
-  rel_str0_sym = scm_permanent_object (ly_symbol2scm ("font-relative-size"));
-  design_str0_sym = scm_permanent_object (ly_symbol2scm ("font-design-size"));
-  wild_sym = scm_permanent_object (ly_symbol2scm ("*"));
-}
-
-ADD_SCM_INIT_FUNC(fi_init_syms, init_syms);
-
-bool
-Font_interface::wild_compare (SCM field_val, SCM val)
-{
-  return (val == SCM_BOOL_F || field_val == wild_sym || field_val == val);
-}
-
-
-MAKE_SCHEME_CALLBACK (Font_interface,properties_to_font_name,2);
 SCM
-Font_interface::properties_to_font_name (SCM fonts, SCM alist_chain)
+Font_interface::font_alist_chain (Grob*g)
 {
-  SCM shape = SCM_BOOL_F;
-  SCM family = SCM_BOOL_F;
-  SCM series = SCM_BOOL_F;
-
+  SCM defaults = g->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
   
-  SCM point_str0 = ly_assoc_chain (design_str0_sym, alist_chain);
-  SCM rel_str0 = SCM_BOOL_F;
-
-  shape = ly_assoc_chain (shape_sym, alist_chain);
-  family = ly_assoc_chain (family_sym, alist_chain);
-  series = ly_assoc_chain (series_sym, alist_chain);
-
-  if (gh_pair_p (shape))
-    shape = ly_cdr (shape);
-  if (gh_pair_p (family))
-    family = ly_cdr (family);
-  if (gh_pair_p (series))
-    series = ly_cdr (series);
-
-
-  if (gh_pair_p (point_str0))
-    point_str0 = ly_cdr (point_str0);
-  else
-    {
-      rel_str0 = ly_assoc_chain (rel_str0_sym, alist_chain);
-      if (gh_pair_p (rel_str0))
-       rel_str0 = ly_cdr (rel_str0);
-    }
+  return g->get_property_alist_chain (defaults);
+}
 
-  for (SCM s = fonts ; gh_pair_p (s); s = ly_cdr (s))
-    {
-      SCM qlist = ly_caar (s);
 
-      if (!wild_compare (scm_list_ref (qlist, gh_int2scm (1)), series))
-       continue;
-      if (!wild_compare (scm_list_ref (qlist, gh_int2scm (2)), shape))
-       continue;
-      if (!wild_compare (scm_list_ref (qlist, gh_int2scm (3)), family))
-       continue;
   
-      if (point_str0 == SCM_BOOL_F && !wild_compare (ly_car (qlist), rel_str0))
-       continue;
-          
-      SCM qname = ly_cdar (s);
-      return qname;
-    }
-
-  warning (_ ("couldn't find any font satisfying "));
-  scm_write (scm_list_n (point_str0, shape, series , family, rel_str0,
-                        SCM_UNDEFINED), scm_current_error_port ());
-  scm_flush (scm_current_error_port ());
- 
-  return scm_makfrom0str ("cmr10");
-  
-}
-
 
 
 ADD_INTERFACE (Font_interface, "font-interface",