X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=aeb7b4a19bd395bb730178820fcf5c8d150127df;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=3f446eeff73d9caaffbcf351cf77acb8e31a033b;hpb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;p=lilypond.git

diff --git a/lily/note-head.cc b/lily/note-head.cc
index 3f446eeff7..aeb7b4a19b 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 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"
@@ -16,9 +27,11 @@ using namespace std;
 
 #include "directional-element-interface.hh"
 #include "font-interface.hh"
+#include "grob.hh"
 #include "international.hh"
+#include "staff-symbol.hh"
+#include "staff-symbol-referencer.hh"
 #include "warn.hh"
-#include "grob.hh"
 
 static Stencil
 internal_print (Grob *me, string *font_char)
@@ -95,6 +108,31 @@ Note_head::print (SCM smob)
   return internal_print (me, &idx).smobbed_copy ();
 }
 
+MAKE_SCHEME_CALLBACK (Note_head, include_ledger_line_height, 1);
+SCM
+Note_head::include_ledger_line_height (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
+
+  if (staff)
+    {
+      Real ss = Staff_symbol::staff_space (staff);
+      Interval lines = Staff_symbol::line_span (staff) * (ss / 2.0);
+      Real my_pos = Staff_symbol_referencer::get_position (me) * ss / 2.0;
+      Interval my_ext = me->extent (me, Y_AXIS) + my_pos;
+
+      // The +1 and -1 come from the fact that we only want to add
+      // the interval between the note and the first ledger line, not
+      // the whole interval between the note and the staff.
+      Interval iv (min (0.0, lines[UP] - my_ext[DOWN] + 1),
+		   max (0.0, lines[DOWN] - my_ext[UP] - 1));
+      return ly_interval2scm (iv);
+    }
+
+  return ly_interval2scm (Interval (0, 0));
+}
+
 Real
 Note_head::stem_attachment_coordinate (Grob *me, Axis a)
 {
@@ -112,7 +150,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++)
 	{