(DynamicLineSpanner): Add

X-extent-callback.  Fixes hairpin-slur collision.

diff --git a/ChangeLog b/ChangeLog
index 8ec8ab20970cfd85e2e3321dfff7147b6babc780..63209dcbd5786e968f259fe6ec4128025733bf13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-02  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/define-grobs.scm (DynamicLineSpanner): Add
+       X-extent-callback.  Fixes hairpin-slur collision.
+
 2005-08-31  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/advanced-notation.itely,

diff --git a/input/regression/slur-dynamics.ly b/input/regression/slur-dynamics.ly
new file mode 100644 (file)
index 0000000..83d867d
--- /dev/null
+++ b/input/regression/slur-dynamics.ly
@@ -0,0 +1,17 @@
+
+\header {
+
+  texidoc = "Dynamics avoid collision with slur."
+}
+
+\version "2.6.0"
+\layout {
+  indent = 0\mm
+  raggedright = ##t
+}
+\relative
+{
+  b(^"dyn outside" b f'\p b,)
+
+  g( d'\< d \! g,)
+}

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 6e9591130ce35bb23f53abf373dd153a1c906e5d..7a817f2364a738631ddff877415d475fb7b1c951 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -163,6 +163,10 @@ Hairpin::print (SCM smob)
 }
 
 ADD_INTERFACE (Hairpin, "hairpin-interface",
-              "A hairpin (de)crescendo.",
-              "grow-direction height bound-padding adjacent-hairpins");
+              "A hairpin crescendo/decrescendo.",
+              "adjacent-hairpins "
+              "bound-padding "
+              "grow-direction "
+              "height "
+              );
 

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index f24a377c3d71dd8a6019911cc08e5d80479f0e93..3d48426464dacdeca56da1ac06cb865a727be2c4 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -33,8 +33,8 @@ protected:
   virtual bool try_music (Music *);
 
   DECLARE_ACKNOWLEDGER (accidental);
-  DECLARE_ACKNOWLEDGER (fingering);
   DECLARE_ACKNOWLEDGER (dynamic_line_spanner);
+  DECLARE_ACKNOWLEDGER (fingering);
   DECLARE_ACKNOWLEDGER (note_column);
   DECLARE_ACKNOWLEDGER (script);
   DECLARE_ACKNOWLEDGER (text_script);

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index dd9f7e1db9888f14e33db2f11bc878a57ecf4783..fd984274e54252b61fc76f1320d51e31c9dfe8ca 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -475,6 +475,7 @@
      . (
        (axes . (1))
        (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (X-extent-callback . ,Axis_group_interface::group_extent_callback)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        (staff-padding . 0.1)
        (padding . 0.6)