X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=1c03808819f8e63fcee449e2af8087c2780605e2;hb=7a2fef70490f4f212c6ce2fe3b51a2724b183366;hp=cb89b5ae17d52dad44277c75ce144026444a27bb;hpb=b09527bcc958ce0e30070a66d098b89d0f50b591;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index cb89b5ae17..1c03808819 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 + (c) 1997--2007 Han-Wen Nienhuys */ #include "note-head.hh" @@ -11,20 +11,14 @@ #include #include #include // 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) @@ -135,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) { @@ -147,15 +141,9 @@ 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, + "Note head.", /* properties */ "note-names "