From 4f024dcc499b2595765fa88c3fe40c7bfed4c527 Mon Sep 17 00:00:00 2001 From: janneke Date: Thu, 18 Aug 2005 09:26:26 +0000 Subject: [PATCH] * scm/define-grob-properties.scm (avoid-slur): New property. * lily/phrasing-slur-engraver.cc (acknowledge_extra_object): * lily/slur-engraver.cc (acknowledge_extra_object): Invoke outside_slur_callback if avoid-slur != #'inside. * scm/define-grobs.scm (Fingering, Textscript): No inside-slur/outside-slur preference. (DynamicLineSpanner): Always outside slur. * input/regression/slur-script.ly: More tests. --- ChangeLog | 17 ++++++++++++++++- Documentation/topdocs/NEWS.tely | 6 +++--- input/regression/slur-script.ly | 26 +++++++++++++++----------- lily/phrasing-slur-engraver.cc | 6 +++--- lily/side-position-interface.cc | 3 ++- lily/slur-engraver.cc | 6 +++--- lily/slur.cc | 7 +++++-- scm/define-grob-properties.scm | 6 +++--- scm/define-grobs.scm | 6 ++---- 9 files changed, 52 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc9950f146..0217a72a03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-08-18 Jan Nieuwenhuizen + + * scm/define-grob-properties.scm (avoid-slur): New property. + + * lily/phrasing-slur-engraver.cc (acknowledge_extra_object): + * lily/slur-engraver.cc (acknowledge_extra_object): Invoke + outside_slur_callback if avoid-slur != #'inside. + + * scm/define-grobs.scm (Fingering, Textscript): No + inside-slur/outside-slur preference. + (DynamicLineSpanner): Always outside slur. + + * input/regression/slur-script.ly: More tests. + 2005-08-17 Graham Percival * Documentation/user/lilypond-book: fix notime entry. @@ -138,7 +152,8 @@ * lily/rest-collision.cc (do_shift): spello. - * input/proportional.ly: use #'used property. Set break-overshoot property. + * input/proportional.ly: use #'used property. Set break-overshoot + property. * mf/feta-arrow.mf: center on arrow tip center, iso. tip edge. diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index fbf1584981..ce1b7c309a 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -50,13 +50,13 @@ This feature was sponsored by Yoshinobu Ishizaki @item Text scripts such as fingering instructions and dynamics avoid -collisions with Slurs +collisions with slurs @lilypond[fragment,relative=1] { - b_1( b _1_3_5) + b_1( f'_1_2_3 c_3_4_5 a) + b( f'\p b,) c-2_\markup { \italic {"cresc."}}( f c) - c-3( c\f c) } @end lilypond diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly index 04f0b3f647..bf3162ec2c 100644 --- a/input/regression/slur-script.ly +++ b/input/regression/slur-script.ly @@ -1,12 +1,13 @@ \header { - texidoc = "A slur avoids collisions with scripts. Only articulations - go inside the slur, dynamic markings, fingerings texts etc. go outside - of slur. + texidoc = "A slur avoids collisions with scripts. Articulations + go inside the slur, dynamic markings go outside the slur. + Fingerings and texts are placed either inside or outside. - For different configurations, the scripts can be moved manually." - } + For different configurations, the defaults can be changed, and + scripts can be moved manually." + } \version "2.6.0" \layout { @@ -17,12 +18,15 @@ b4-.( b-. b-.) b(-. d-.) - b_1( b b_1_2_3) - %% Allow Fingering to go inside slur. - \override Fingering #'inside-slur = ##t - b( d_1 b) - c_\markup { \italic {"cresc."}}( f c) - c( c\f c) + b_1( f'_1_2_3 c_3_4_5 a) + b( f'\p b,) + + %% Do not force dynamics outside slur, only avoid collisions. + \override DynamicLineSpanner #'avoid-slur = #'() + \override DynamicLineSpanner #'padding = #0.3 + b( e\p e\f b) + + c_\markup { \italic {"cresc."}}( c c) \once \override Script #'padding = #1.2 b-.( b-. \once \override Script #'padding = #1.2 diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 72b900c804..2be42433a2 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -94,16 +94,16 @@ void Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) { Grob *e = info.grob (); - SCM inside = e->get_property ("inside-slur"); + SCM avoid = e->get_property ("avoid-slur"); if (Tie::has_interface (e) - || to_boolean (inside)) + || avoid == ly_symbol2scm ("inside")) { for (int i = slurs_.size (); i--;) Slur::add_extra_encompass (slurs_[i], e); for (int i = end_slurs_.size (); i--;) Slur::add_extra_encompass (end_slurs_[i], e); } - else if (inside == SCM_BOOL_F + else if (avoid != ly_symbol2scm ("inside") && e->name () != "DynamicText") { Grob *slur = slurs_.size () ? slurs_[0] : 0; diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 0acb79da21..97790b3830 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -263,4 +263,5 @@ ADD_INTERFACE (Side_position_interface, "side-position-interface", "side-relative-direction " "side-support-elements " "slur-padding " - "staff-padding "); + "staff-padding " + ); diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 58b71d4aa2..6f76ed297f 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -93,16 +93,16 @@ void Slur_engraver::acknowledge_extra_object (Grob_info info) { Grob *e = info.grob (); - SCM inside = e->get_property ("inside-slur"); + SCM avoid = e->get_property ("avoid-slur"); if (Tie::has_interface (e) - || to_boolean (inside)) + || avoid == ly_symbol2scm ("inside")) { for (int i = slurs_.size (); i--;) Slur::add_extra_encompass (slurs_[i], e); for (int i = end_slurs_.size (); i--;) Slur::add_extra_encompass (end_slurs_[i], e); } - else if (inside == SCM_BOOL_F + else if (avoid != ly_symbol2scm ("inside") && e->name () != "DynamicText") { Grob *slur = slurs_.size () ? slurs_[0] : 0; diff --git a/lily/slur.cc b/lily/slur.cc index 9956bea231..bdf7539241 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -184,6 +184,7 @@ Slur::outside_slur_callback (SCM grob, SCM axis) bool consider[] = { false, false, false }; Real ys[] = {0, 0, 0}; bool do_shift = false; + SCM avoid = script->get_property ("avoid-slur"); for (int d = LEFT, k = 0; d <= RIGHT; d++, k++) { @@ -201,8 +202,10 @@ Slur::outside_slur_callback (SCM grob, SCM axis) consider[k] = true; /* Request shift if slur is contained script's Y, or if - script is fully inside slur. */ - if (yext.contains (ys[k]) || dir * ys[k] > dir * yext[-dir]) + script is inside slur and avoid == outside. */ + if (yext.contains (ys[k]) + || (avoid == ly_symbol2scm ("outside") + && dir * ys[k] > dir * yext[-dir])) do_shift = true; } } diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index b6a8dde3e3..8a477c570b 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -276,9 +276,9 @@ slur, the closer it is to this height.") (horizontal-shift ,integer? "An integer that identifies ranking of note-column for horizontal shifting. This is used by @internalsref{note-collision-interface}.") - (inside-slur ,boolean? "If set, this script should be inside the -slur. If set to false, the script places itself around the slur. If -unset, script and slur ignore each other ") + (avoid-slur ,symbol? "Method of handling slur collisions. +Choices are @{around}, @{ignore}, @{inside}, @{outside}. If +unset, script and slur ignore eachother.") (inspect-quants ,number-pair? "If debugging is set, set beam quant to this position, and print the respective scores.") diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index af88579662..2aa0c7dc4f 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -20,7 +20,7 @@ (Accidental . ( (print-function . ,Accidental_interface::print) - (inside-slur . #t) + (avoid-slur . inside) (cautionary-style . parentheses) (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((class . Item) @@ -478,7 +478,7 @@ (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (staff-padding . 0.1) (padding . 0.6) - (inside-slur . #f) + (avoid-slur . outside) (slur-padding . 0.3) (minimum-space . 1.2) (direction . -1) @@ -536,7 +536,6 @@ ;; sync with TextScript (?) (padding . 0.5) - (inside-slur . #f) (slur-padding . 0.2) (staff-padding . 0.5) (self-alignment-X . 0) @@ -1409,7 +1408,6 @@ (padding . 0.5) (staff-padding . 0.5) (before-line-breaking-callback . ,Script_interface::before_line_breaking) - (inside-slur . #f) (slur-padding . 0.5) (script-priority . 200) ;; todo: add X self alignment? -- 2.39.5