X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=3f446eeff73d9caaffbcf351cf77acb8e31a033b;hb=e04d2f37f505bd6de6ae8b3923de9b68a3a64455;hp=5f86f6e401d7ee869fcab4062d4e02051aeda8a7;hpb=06a307a1cddf950cc3dd41f8fac49ced4c714ddd;p=lilypond.git

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 5f86f6e401..3f446eeff7 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--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-head.hh"
@@ -11,20 +11,14 @@
 #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"
 
 static Stencil
 internal_print (Grob *me, string *font_char)
@@ -43,8 +37,11 @@ internal_print (Grob *me, string *font_char)
 
   Font_metric *fm = Font_interface::get_default_font (me);
 
-  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 ())
     {
       string prefix = "noteheads.";
@@ -55,18 +52,20 @@ internal_print (Grob *me, string *font_char)
       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;
 }
@@ -130,7 +129,7 @@ Note_head::get_stem_attachment (Font_metric *fm, string key)
   return att;
 }
 
-MAKE_SCHEME_CALLBACK(Note_head, calc_stem_attachment, 1);
+MAKE_SCHEME_CALLBACK (Note_head, calc_stem_attachment, 1);
 SCM
 Note_head::calc_stem_attachment (SCM smob)
 {
@@ -142,15 +141,11 @@ Note_head::calc_stem_attachment (SCM smob)
   return ly_offset2scm (get_stem_attachment (fm, key));
 }
 
-int
-Note_head::get_balltype (Grob *me)
-{
-  SCM s = me->get_property ("duration-log");
-  return scm_is_number (s) ? min (int (scm_to_int (s)), 2) : 0;
-}
 
-ADD_INTERFACE (Note_head, "note-head-interface",
-	       "Note head",
+ADD_INTERFACE (Note_head,
+	       "A note head.  There are many possible values for"
+	       " @code{style}.  For a complete list, see"
+	       " @ruser{Note head styles}.",
 
 	       /* properties */
 	       "note-names "