From 93b53e7fafae08d88056a03234fab7b88987f6b4 Mon Sep 17 00:00:00 2001 From: janneke Date: Mon, 15 Aug 2005 19:23:02 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 3 +++ input/regression/slur-script.ly | 4 ++-- lily/phrasing-slur-engraver.cc | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d720f1d81..9ad3924d2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ 2005-08-15 Jan Nieuwenhuizen + * lily/phrasing-slur-engraver.cc (acknowledge_extra_object): + Cut-and paste update. + * input/regression/slur-script.ly: Add example of reverting inside-slur for fingering. diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly index 6eacd8101e..04f0b3f647 100644 --- a/input/regression/slur-script.ly +++ b/input/regression/slur-script.ly @@ -18,8 +18,8 @@ b(-. d-.) b_1( b b_1_2_3) - %% Allow Fingering to go inside slur, by reverting the #f value. - \once \revert Fingering #'inside-slur + %% 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) diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index b5087e2f49..72b900c804 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -103,7 +103,7 @@ Phrasing_slur_engraver::acknowledge_extra_object (Grob_info info) for (int i = end_slurs_.size (); i--;) Slur::add_extra_encompass (end_slurs_[i], e); } - else if (!to_boolean (inside) + else if (inside == SCM_BOOL_F && e->name () != "DynamicText") { Grob *slur = slurs_.size () ? slurs_[0] : 0; -- 2.39.5