From 04f63ddf1c08b2f6a3d0091caf75c9d9827a6539 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 23 Aug 2003 13:18:06 +0000
Subject: [PATCH] * input/test/partial-blank.ly (quickmeasure): syntax

* lily/slur.cc (get_attachment): bugfix: don't crash on non-cons
attachment property.
---
 ChangeLog                               |  5 +++++
 input/test/beam-dir-functions.ly        | 12 ++++++------
 input/test/embedded-postscript.ly       |  6 +++---
 input/test/partial-blank.ly             |  5 ++++-
 input/test/spanner-after-break-tweak.ly |  2 +-
 lily/slur.cc                            |  2 +-
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a283ae4e23..675402963e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-08-23  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* input/test/partial-blank.ly (quickmeasure): syntax
+
+	* lily/slur.cc (get_attachment): bugfix: don't crash on non-cons
+	attachment property.
+
 	* Documentation/user/refman.itely: remove superfluous -'s 
 	(Grace notes): ) fixes.
 
diff --git a/input/test/beam-dir-functions.ly b/input/test/beam-dir-functions.ly
index 3cdfe1e516..906f8d64fb 100644
--- a/input/test/beam-dir-functions.ly
+++ b/input/test/beam-dir-functions.ly
@@ -24,19 +24,19 @@ your favourite algorithm isn't one of these, you can hook up your own.
 \score {
   \notes\relative c'' {\time 3/4
     \property Voice.Beam \set #'dir-function = #beam-dir-majority
-    [c8 g]
+      c8-[ g]
     \property Voice.Beam \set #'dir-function = #beam-dir-mean
-    [c g] 
+      c-[ g] 
     \property Voice.Beam \set #'dir-function = #beam-dir-median
-    [c g]
+      c-[ g]
     
     \time 3/8
     \property Voice.Beam \set #'dir-function = #beam-dir-majority
-    [c8 c g]
+      c8-[ c g]
     \property Voice.Beam \set #'dir-function = #beam-dir-mean
-    [c c g] 
+      c-[ c g] 
     \property Voice.Beam \set #'dir-function = #beam-dir-median
-    [c c g] 
+      c-[ c g] 
   }
 \paper{raggedright = ##t}
 }
diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly
index 77e3789d0f..afc2b3628f 100644
--- a/input/test/embedded-postscript.ly
+++ b/input/test/embedded-postscript.ly
@@ -14,9 +14,9 @@ insert postscript directly into the output.
 
 \score {
   \notes \relative c'' {
-    a-#"\\embeddedps{3 4 moveto 5 3 rlineto stroke}"
-    -#"\\embeddedps{ [ 0 1 ] 0 setdash 3 5 moveto 5 -3 rlineto stroke}"
-    b-#"\\embeddedps{3 4 moveto 0 0 1 2 8 4 20 3.5 rcurveto stroke}"
+    a-"\\embeddedps{3 4 moveto 5 3 rlineto stroke}"
+    -"\\embeddedps{ [ 0 1 ] 0 setdash 3 5 moveto 5 -3 rlineto stroke}"
+    b-"\\embeddedps{3 4 moveto 0 0 1 2 8 4 20 3.5 rcurveto stroke}"
     s2
     a'1
   }
diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly
index d84b349926..1fecce0687 100644
--- a/input/test/partial-blank.ly
+++ b/input/test/partial-blank.ly
@@ -7,7 +7,10 @@ same length, etc.  This thing implements it by adding invisible
 staff with lots of fast notes. "
 }
 
-quickmeasure = \notes {[\repeat unfold 16 c''16]}
+quickmeasure = \notes {
+    \repeat unfold 16 c''16
+}
+
 mel = \notes \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2}
 
 \score {
diff --git a/input/test/spanner-after-break-tweak.ly b/input/test/spanner-after-break-tweak.ly
index b19d37faee..1ecf9d8b0f 100644
--- a/input/test/spanner-after-break-tweak.ly
+++ b/input/test/spanner-after-break-tweak.ly
@@ -27,7 +27,7 @@ after the line break is moved around. "
 \score {\notes \relative c'' { 
     \property Voice.Tie \override #'after-line-breaking-callback =
        #my-callback
-    c1\break ~ c2 ~ c
+    c1 ~ \break c2 ~ c
 }
     \paper { raggedright = ##t } 
     }
diff --git a/lily/slur.cc b/lily/slur.cc
index 023c5a20dd..8e34c59c17 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -288,7 +288,7 @@ Slur::get_attachment (Grob *me, Direction dir,
 		      Grob **common) 
 {
   SCM s = me->get_grob_property ("attachment");
-  if (!gh_symbol_p (index_get_cell (s, dir)))
+  if (!gh_pair_p (s) || !gh_symbol_p (index_get_cell (s, dir)))
     {
       s = set_extremities (me);
     }
-- 
2.39.5