* lily/open-type-font.cc (load_scheme_table): new function

[lilypond.git] / lily / note-head.cc

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 7ab1d8b9d05f70de895115f5dc7f77607524b435..b5781a7a018d5be680bfd7874df1910301bbe391 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -5,16 +5,18 @@
 
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
+#include "note-head.hh"
+
 #include <math.h>
-#include <ctype.h>
+#include <cctype>
 
+#include "directional-element-interface.hh"
 #include "staff-symbol.hh"
 #include "misc.hh"
 #include "dots.hh"
-#include "note-head.hh"
 #include "warn.hh"
 #include "font-interface.hh"
-#include "stencil.hh"
 #include "event.hh"
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
@@ -25,7 +27,7 @@
   clean up the mess left by ledger line handling.
 */
 static Stencil
-internal_print (Grob *me)
+internal_print (Grob *me, String * font_char)
 {
   SCM style  = me->get_property ("style");
   if (!scm_is_symbol (style))
@@ -36,13 +38,38 @@ internal_print (Grob *me)
   SCM log = scm_int2num (Note_head::get_balltype (me));
   SCM proc = me->get_property ("glyph-name-procedure");
   SCM scm_font_char = scm_call_2 (proc, log, style);
-  String font_char = "noteheads-" + ly_scm2string (scm_font_char);
 
   Font_metric * fm = Font_interface::get_default_font (me);
-  Stencil out = fm->find_by_name (font_char);
+
+  Direction stem_dir = CENTER;
+  if (Grob *stem = unsmob_grob (me->get_property ("stem")))
+    {
+      stem_dir = get_grob_direction (stem);
+      if (stem_dir == CENTER)
+       {
+         programming_error ("Must have stem dir for note head");
+       }
+    }
+  
+  Stencil out;
+
+  String prefix = "noteheads.";
+  String idx =
+    prefix + ((stem_dir == UP) ? "u" : "d")  + ly_scm2string (scm_font_char);
+  out = fm->find_by_name (idx);
   if (out.is_empty ())
     {
-      me->warning (_f ("note head `%s' not found", font_char.to_str0 ()));
+      idx = prefix + "s" + ly_scm2string (scm_font_char);
+      out = fm->find_by_name (idx);
+    }
+  
+  if (out.is_empty())
+    {
+      me->warning (_f ("note head `%s' not found", idx.to_str0 ()));
+    }
+  else
+    {
+      *font_char = idx;
     }
 
   return out;
@@ -55,35 +82,10 @@ Note_head::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  return internal_print (me).smobbed_copy ();
+  String idx;
+  return internal_print (me, &idx).smobbed_copy ();
 }
 
-/*
-  Compute the width the head without ledgers.
-
-  -- there used to be some code from the time that ledgers
-  did take space. Nowadays, we can simply take the standard extent.
- */
-Interval
-Note_head::head_extent (Grob *me, Axis a)
-{
-  SCM brewer = me->get_property ("print-function");
-  if (brewer == Note_head::print_proc)
-    {
-      Stencil mol = internal_print (me);
-  
-      if (!mol.is_empty ())
-       return mol.extent (a);
-    }
-  else
-    {
-      Stencil * mol = me->get_stencil ();
-      if (mol)
-       return  mol->extent (a) ;
-    }
-  
-  return Interval (0,0);
-}
 
 MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1);
 SCM
@@ -131,23 +133,14 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
   
   if (brewer == Note_head::print_proc)
     {
-      SCM style  = me->get_property ("style");
-      if (!scm_is_symbol (style))
-       {
-         return 0.0;
-       }
-      
-      SCM log = scm_int2num (Note_head::get_balltype (me));
-      SCM proc = me->get_property ("glyph-name-procedure");
-      SCM scm_font_char = scm_call_2 (proc, log, style);
-      String font_char = "noteheads-" + ly_scm2string (scm_font_char);
-
-      int k = fm->name_to_index (font_char) ;
+      String key;
+      internal_print (me, &key);
 
+      int k = fm->name_to_index (key) ;
       if (k >= 0)
        {
          Box b = fm->get_indexed_char (k);
-         Offset wxwy = fm->get_indexed_wxwy (k);
+         Offset wxwy = fm->attachment_point (key);
          Interval v = b[a];
          if (!v.is_empty ())
            return 2 * (wxwy[a] - v.center ()) / v.length ();
@@ -162,10 +155,10 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
     return 0.0;
   
   SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a));
-  if (!ly_c_pair_p (result))
+  if (!scm_is_pair (result))
     return 0.0;
 
-  result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result);
+  result = (a == X_AXIS) ? scm_car (result) : scm_cdr (result);
   
   return robust_scm2double (result,0);
 }