CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/08/15 19:23:02
Modified files:
lily : phrasing-slur-engraver.cc
input/regression: slur-script.ly
. : ChangeLog
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/phrasing-slur-engraver.cc.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/slur-script.ly.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4010&tr2=1.4011&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4010 lilypond/ChangeLog:1.4011
--- lilypond/ChangeLog:1.4010 Mon Aug 15 18:47:47 2005
+++ lilypond/ChangeLog Mon Aug 15 19:23:02 2005
@@ -13,6 +13,9 @@
2005-08-15 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * 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.
Index: lilypond/input/regression/slur-script.ly
diff -u lilypond/input/regression/slur-script.ly:1.12
lilypond/input/regression/slur-script.ly:1.13
--- lilypond/input/regression/slur-script.ly:1.12 Mon Aug 15 18:06:06 2005
+++ lilypond/input/regression/slur-script.ly Mon Aug 15 19:23:02 2005
@@ -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)
Index: lilypond/lily/phrasing-slur-engraver.cc
diff -u lilypond/lily/phrasing-slur-engraver.cc:1.54
lilypond/lily/phrasing-slur-engraver.cc:1.55
--- lilypond/lily/phrasing-slur-engraver.cc:1.54 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/phrasing-slur-engraver.cc Mon Aug 15 19:23:02 2005
@@ -103,7 +103,7 @@
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;
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
