*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 9d720f1d8116ee971bbcfd20881f1688f2100c1e..9ad3924d2afef3da383d1d53883eda373248b523 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
 
 2005-08-15  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * 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 6eacd8101edeff719ed4b466967adc0ac4ef5065..04f0b3f64788962c61679e52f691645b85bf422a 100644 (file)
--- 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 b5087e2f491fbb7fa4b643b3267a994e1f19d4f1..72b900c804e53bd8ae86db8a5d882872d89fa833 100644 (file)
--- 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;