From 053c81171a5a3d4f4c3e3bd78c170cb7f07762f7 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 2 Sep 2005 21:02:19 +0000 Subject: [PATCH] (DynamicLineSpanner): Add X-extent-callback. Fixes hairpin-slur collision. --- ChangeLog | 5 +++++ input/regression/slur-dynamics.ly | 17 +++++++++++++++++ lily/hairpin.cc | 8 ++++++-- lily/slur-engraver.cc | 2 +- scm/define-grobs.scm | 1 + 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 input/regression/slur-dynamics.ly diff --git a/ChangeLog b/ChangeLog index 8ec8ab2097..63209dcbd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-02 Jan Nieuwenhuizen + + * scm/define-grobs.scm (DynamicLineSpanner): Add + X-extent-callback. Fixes hairpin-slur collision. + 2005-08-31 Graham Percival * Documentation/user/advanced-notation.itely, diff --git a/input/regression/slur-dynamics.ly b/input/regression/slur-dynamics.ly new file mode 100644 index 0000000000..83d867d8d9 --- /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 6e9591130c..7a817f2364 100644 --- 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 f24a377c3d..3d48426464 100644 --- 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 dd9f7e1db9..fd984274e5 100644 --- 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) -- 2.39.2