From 6b459286d3248bda8d5da99b76bb9195ba560318 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 01:02:02 +0000 Subject: [PATCH] lilypond-1.5.3 --- input/test/repeat-manual.ly | 20 ++++++++++++++++++++ lily/volta-engraver.cc | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 input/test/repeat-manual.ly diff --git a/input/test/repeat-manual.ly b/input/test/repeat-manual.ly new file mode 100644 index 0000000000..ae47e1be34 --- /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 a3e14ce483..1227a9315b 100644 --- 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; -- 2.39.5