X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=17db761f2f88463a97463fc3b02a6abffa00a7ce;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5a0c9abf8465c5ee4c106b5f5f0fcb3484d9b668;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 5a0c9abf84..17db761f2f 100644
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
@@ -11,32 +11,23 @@
 #include <cmath>
 #include <cctype>
 #include <algorithm> 		//  min, max
+
 using namespace std;
 
 #include "directional-element-interface.hh"
-#include "dots.hh"
 #include "font-interface.hh"
 #include "international.hh"
-#include "lookup.hh"
-#include "misc.hh"
-#include "music.hh"
-#include "output-def.hh"
-#include "rhythmic-head.hh"
-#include "staff-symbol-referencer.hh"
-#include "staff-symbol.hh"
 #include "warn.hh"
+#include "grob.hh"
 
-/*
-  clean up the mess left by ledger line handling.
-*/
 static Stencil
-internal_print (Grob *me, std::string *font_char)
+internal_print (Grob *me, string *font_char)
 {
   SCM style = me->get_property ("style");
   if (!scm_is_symbol (style))
     style = ly_symbol2scm ("default");
 
-  std::string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2));
+  string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2));
   if (style != ly_symbol2scm ("default"))
     {
       SCM gn = me->get_property ("glyph-name");
@@ -46,29 +37,35 @@ internal_print (Grob *me, std::string *font_char)
 
   Font_metric *fm = Font_interface::get_default_font (me);
 
-  std::string idx = "noteheads.s" + suffix;
-
-  Stencil out = fm->find_by_name (idx);
+  string idx_symmetric;
+  string idx_directed;
+  string idx_either;
+  idx_symmetric = idx_either = "noteheads.s" + suffix;
+  Stencil out = fm->find_by_name (idx_symmetric);
   if (out.is_empty ())
     {
-      std::string prefix = "noteheads.";
+      string prefix = "noteheads.";
+
       Grob *stem = unsmob_grob (me->get_object ("stem"));
       Direction stem_dir = stem ? get_grob_direction (stem) : CENTER;
-
+      
       if (stem_dir == CENTER)
 	programming_error ("must have stem dir for note head");
-
-      idx = prefix + ((stem_dir == UP) ? "u" : "d") + suffix;
-      out = fm->find_by_name (idx);
+      
+      idx_directed = idx_either =
+	prefix + ((stem_dir == UP) ? "u" : "d") + suffix;
+      out = fm->find_by_name (idx_directed);
     }
 
+
   if (out.is_empty ())
     {
-      me->warning (_f ("note head `%s' not found", idx.c_str ()));
+      me->warning (_f ("none of note heads `%s' or `%s' found",
+		       idx_symmetric.c_str (), idx_directed.c_str ()));
       out = Stencil (Box (Interval (0, 0), Interval (0, 0)), SCM_EOL);
     }
   else
-    *font_char = idx;
+    *font_char = idx_either;
 
   return out;
 }
@@ -94,7 +91,7 @@ Note_head::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  std::string idx;
+  string idx;
   return internal_print (me, &idx).smobbed_copy ();
 }
 
@@ -107,15 +104,9 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a)
   return off [a];
 }
 
-MAKE_SCHEME_CALLBACK(Note_head, calc_stem_attachment, 1);
-SCM
-Note_head::calc_stem_attachment (SCM smob)
+Offset
+Note_head::get_stem_attachment (Font_metric *fm, string key)
 {
-  Grob *me  = unsmob_grob (smob);
-  Font_metric *fm = Font_interface::get_default_font (me);
-  std::string key;
-  internal_print (me, &key);
-
   Offset att;
   
   int k = fm->name_to_index (key);
@@ -135,19 +126,24 @@ Note_head::calc_stem_attachment (SCM smob)
 	}
     }
 
-  return ly_offset2scm (att);
+  return att;
 }
 
-
-int
-Note_head::get_balltype (Grob *me)
+MAKE_SCHEME_CALLBACK (Note_head, calc_stem_attachment, 1);
+SCM
+Note_head::calc_stem_attachment (SCM smob)
 {
-  SCM s = me->get_property ("duration-log");
-  return scm_is_number (s) ? min (scm_to_int (s), 2) : 0;
+  Grob *me  = unsmob_grob (smob);
+  Font_metric *fm = Font_interface::get_default_font (me);
+  string key;
+  internal_print (me, &key);
+
+  return ly_offset2scm (get_stem_attachment (fm, key));
 }
 
-ADD_INTERFACE (Note_head, "note-head-interface",
-	       "Note head",
+
+ADD_INTERFACE (Note_head,
+	       "Note head.",
 
 	       /* properties */
 	       "note-names "