From 9bb713ea8cca3e9924099bfc3c5ec0dd75a34c15 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 1 Apr 2002 17:14:59 +0000
Subject: [PATCH] * scm/slur.scm (default-slur-extremity-offset-alist)
 (default-phrasing-slur-extremity-offset-alist): Move slur attachments further
 away from note-head, vertically.  Also, leave a horizontal gap between slur
 and stem end.

* lily/beam.cc (get_interbeam): Bugfix: don't look in empty list.
---
 ChangeLog    |  9 +++++++++
 lily/beam.cc |  2 +-
 scm/slur.scm | 16 ++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b455b24401..70e02e4b04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-01  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* scm/slur.scm (default-slur-extremity-offset-alist) 
+	(default-phrasing-slur-extremity-offset-alist): Move slur
+	attachments further away from note-head, vertically.  Also, leave
+	a horizontal gap between slur and stem end.
+
+	* lily/beam.cc (get_interbeam): Bugfix: don't look in empty list.
+
 2002-04-01  Han-Wen  <hanwen@cs.uu.nl>
 
 	* lily/multi-measure-rest.cc (set_spacing_rods): tune rods to the
diff --git a/lily/beam.cc b/lily/beam.cc
index f5ce479bbd..82491cd972 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -80,7 +80,7 @@ Beam::get_interbeam (Grob *me)
   SCM s = me->get_grob_property ("beam-space");
   if (gh_number_p (s))
     return gh_scm2double (s) * ss;
-  else if (gh_list_p (s))
+  else if (s != SCM_EOL && gh_list_p (s))
     return gh_scm2double (scm_list_ref (s,
 					gh_int2scm (multiplicity - 1
 						    <? scm_ilength (s) - 1)))
diff --git a/scm/slur.scm b/scm/slur.scm
index d632839023..6cdeeb1a93 100644
--- a/scm/slur.scm
+++ b/scm/slur.scm
@@ -93,13 +93,13 @@
 ;; stem: Default position is on stem X, at stem end Y
 (define default-slur-extremity-offset-alist
   '(
-    ((head 1 1) . (-0.25 . 0.25))
-    ((head 1 -1) . (-0.25 . 0.25))
-    ((head -1 1) . (-0.25 . 0.25))
-    ((head -1 -1) . (-0.85 . 0.25))
+    ((head 1 1) . (-0.25 . 0.75))
+    ((head 1 -1) . (-0.25 . 0.75))
+    ((head -1 1) . (-0.25 . 0.75))
+    ((head -1 -1) . (-0.85 . 0.75))
 
-    ((stem 1 1) . (0 . 0.5))
-    ((stem -1 -1) . (0 . 0.5))
+    ((stem 1 1) . (-0.125 . 0.5))
+    ((stem -1 -1) . (-0.125 . 0.5))
 
     ((loose-end 1 1) . (-0.4 . 0))
     ((loose-end 1 -1) . (-0.4 . 0))
@@ -118,8 +118,8 @@
     ((head -1 1) . (-0.25 . 1.25))
     ((head -1 -1) . (-0.85 . 1.25))
 
-    ((stem 1 1) . (0 . 1.5))
-    ((stem -1 -1) . (0 . 1.5))
+    ((stem 1 1) . (-0.25 . 1.5))
+    ((stem -1 -1) . (-0.25 . 1.5))
 
     ((loose-end 1 1) . (-0.4 . 0))
     ((loose-end 1 -1) . (-0.4 . 0))
-- 
2.39.5