* 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.

diff --git a/ChangeLog b/ChangeLog
index b455b24401d39baa681b2e14d1b7eb229e6404a0..70e02e4b0426239624f853973f92173eb767d9f9 100644 (file)
--- 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 f5ce479bbde423b21b88b91100cbb8bcba24e67c..82491cd972bc365fa337d06ded36056d7287d31c 100644 (file)
--- 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 d632839023a41271bff55706095440cc32aea27e..6cdeeb1a93ec53802af124c95b91919487ce0b39 100644 (file)
--- 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))