Avoid collisions with ledger lines.

diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh
index 05da0624c56afe256ba2349a94f32a94c1619c5e..579293d2a40e0d040701dfc7eed116dcd6e29fae 100644 (file)
--- a/lily/include/note-head.hh
+++ b/lily/include/note-head.hh
@@ -31,6 +31,7 @@ public:
   DECLARE_SCHEME_CALLBACK (brew_ez_stencil, (SCM));
   DECLARE_SCHEME_CALLBACK (stem_x_shift, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_stem_attachment, (SCM));
+  DECLARE_SCHEME_CALLBACK (include_ledger_line_height, (SCM));
   DECLARE_GROB_INTERFACE();
 
   static Real stem_attachment_coordinate (Grob *, Axis a);

diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh
index d669038dc84eb30f7d18d5b27d71afee7243b790..e7b87e799a663071002207c17f7e85571a78f7d1 100644 (file)
--- a/lily/include/staff-symbol.hh
+++ b/lily/include/staff-symbol.hh
@@ -36,6 +36,7 @@ public:
   static int get_steps (Grob *);
   static int line_count (Grob *);
   static bool on_line (Grob *me, int pos);
+  static Interval line_span (Grob *);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM));  
   DECLARE_GROB_INTERFACE();

diff --git a/lily/note-head.cc b/lily/note-head.cc
index c63622bbc8452ee98c06103eb210ad97562c7676..18ac2fd43e3020f6100dcd9d26f3409e25417b5c 100644 (file)
--- a/lily/note-head.cc
+++ b/lily/note-head.cc
@@ -27,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)
@@ -106,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)
 {

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index dc57a2320491d4b5175cd9ddd165f2d8f5ee0b28..30def52f2881ea93c9610461bbab3d7146a8eb49 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -208,6 +208,24 @@ Staff_symbol::on_line (Grob *me, int pos)
     return ((abs (pos + line_count (me)) % 2) == 1);
 }
 
+Interval
+Staff_symbol::line_span (Grob *me)
+{
+  SCM line_positions = me->get_property ("line-positions");
+  Interval iv;
+
+  if (scm_is_pair (line_positions))
+    for (SCM s = line_positions; scm_is_pair (s); s = scm_cdr (s))
+      iv.add_point (scm_to_double (scm_car (s)));
+  else
+    {
+      int count = line_count (me);
+      return Interval (-count + 1, count - 1);
+    }
+
+  return iv;
+}
+
 ADD_INTERFACE (Staff_symbol,
               "This spanner draws the lines of a staff.  A staff symbol"
               " defines a vertical unit, the @emph{staff space}.  Quantities"

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 174ad039bf23f4ffd0c7ed2491b765fe12d7f16d..92a62bfcef39a24f0f74231c67d855478d57a6bc 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1295,6 +1295,7 @@
     (NoteHead
      . (
        (duration-log . ,note-head::calc-duration-log)
+       (extra-spacing-height . ,ly:note-head::include-ledger-line-height)
        (glyph-name . ,note-head::calc-glyph-name)
        (stem-attachment . ,ly:note-head::calc-stem-attachment)
        (stencil . ,ly:note-head::print)