lilypond-1.5.3

diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly
new file mode 100644 (file)
index 0000000..ae47e1b
--- /dev/null
+++ b/input/test/repeat-manual.ly
@@ -0,0 +1,20 @@
+
+\version "1.3.146"
+
+
+\score { \notes {
+% First a normal looking repeat:
+ c2 c
+    \property Score.repeatCommands = #'((volta "1."))
+ c c
+    \property Score.repeatCommands = #'((volta #f) end-repeat (volta "2."))
+ c c
+    \property Score.repeatCommands = #'((volta #f))
+% Then a more strange one:
+ c c
+    \property Score.repeatCommands = #'((volta "93") end-repeat)
+ c c
+    \property Score.repeatCommands = #'((volta #f))
+ c c
+}
+}

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index a3e14ce4833708d9a8cbc45e2ead04821ec6761a..1227a9315bc25bbdbd0880f7b7e05dd59d891306 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -59,7 +59,8 @@ Volta_engraver::process_music ()
     {
       SCM c = gh_car (cs);
 
-      if (gh_pair_p (c) && gh_car (c) == ly_symbol2scm ("volta"))
+      if (gh_pair_p (c) && gh_car (c) == ly_symbol2scm ("volta")
+         && gh_pair_p (gh_cdr (c)))
        {
          if (gh_cadr (c) ==  SCM_BOOL_F)
            end = true;