* 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 1bdb0dcac5ae75e4ba9066c958a1ca6977fa9c7e..b5781a7a018d5be680bfd7874df1910301bbe391 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -8,7 +8,7 @@
 
 #include "note-head.hh"
 
-#include <cmath>
+#include <math.h>
 #include <cctype>
 
 #include "directional-element-interface.hh"
@@ -53,12 +53,11 @@ internal_print (Grob *me, String * font_char)
   
   Stencil out;
 
-  String prefix = "noteheads-";
+  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 ()
-      && stem_dir)
+  if (out.is_empty ())
     {
       idx = prefix + "s" + ly_scm2string (scm_font_char);
       out = fm->find_by_name (idx);
@@ -141,7 +140,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
       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 ();