From 05aa1e37e344eff7601ddb6604d3113fe97b895f Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Tue, 21 Sep 2004 21:59:55 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog    | 7 +++++++
 lily/slur.cc | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b8f8b3caf4..f27f7846ec 100644
--- 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 f695309f45..7c0580e154 100644
--- 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],
-- 
2.39.5