*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index b8f8b3caf400f7f2a5c14f58409aa088b75342a7..f27f7846ec7f5ec1700a64961671cd78239d6225 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-21  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/slur.cc (outside_slur_callback): read #'padding for
+       slur-padding.
+
+       * lily/parser.yy (score_body): disallow \bookpaper in \score.
+
 2004-09-21  Juergen Reuter  <reuter@ipd.uka.de>
 
        * Documentation/user/notation.itely (ancient flags): documented

diff --git a/lily/slur.cc b/lily/slur.cc
index f695309f45281ff9316112a39f542e0cf1198b7b..7c0580e154520a7aaa8dddefa07f6789ce4ea68b 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -151,7 +151,8 @@ Slur::outside_slur_callback (SCM grob, SCM axis)
   Interval xext = robust_relative_extent (script, cx, X_AXIS);
 
 
-  Real slur_padding = 0.2;     // todo: slur property, script property?
+  Real slur_padding = robust_scm2double (me->get_property ("padding"),
+                                        0.2);  // todo: slur property, script property?
   yext.widen (slur_padding);
   
   Interval bezext (curve.control_[0][X_AXIS],