X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=c63622bbc8452ee98c06103eb210ad97562c7676;hb=2e581052026c48aed3e44fd32de74b8308f8434d;hp=cb89b5ae17d52dad44277c75ce144026444a27bb;hpb=b09527bcc958ce0e30070a66d098b89d0f50b591;p=lilypond.git

diff --git a/lily/note-head.cc b/lily/note-head.cc
index cb89b5ae17..c63622bbc8 100644
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -1,9 +1,20 @@
 /*
-  notehead.cc -- implement Note_head
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "note-head.hh"
@@ -11,20 +22,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)
@@ -118,7 +123,7 @@ Note_head::get_stem_attachment (Font_metric *fm, string key)
   int k = fm->name_to_index (key);
   if (k >= 0)
     {
-      Box b = fm->get_indexed_char (k);
+      Box b = fm->get_indexed_char_dimensions (k);
       Offset wxwy = fm->attachment_point (key);
       for (int i = X_AXIS ; i < NO_AXES; i++)
 	{
@@ -135,7 +140,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)
 {
@@ -147,15 +152,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 "