From 02e2838af653f09dc46314e23e53f4250e0ec311 Mon Sep 17 00:00:00 2001 From: Mats Bengtsson Date: Thu, 21 Nov 2002 18:47:49 +0000 Subject: [PATCH] * lily/volta-engraver.cc (process_acknowledged_grobs): Allow for text markup in repeatCommands. --- Documentation/user/refman.itely | 3 ++- lily/volta-engraver.cc | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index a893d2145a..38d1b90e40 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -2349,7 +2349,8 @@ command can be @item 'end-repeat Print a :| bar line @item (volta . @var{text}) - Print a volta bracket saying @var{text}. + Print a volta bracket saying @var{text} (the text can be specified +as a text string or as a markup text, see @ref{Text markup}). @item (volta . #f) Stop a running volta bracket @end table diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 40bf88f557..91f1843537 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -117,7 +117,8 @@ Volta_engraver::process_music () volta_span_ =0; } - if (gh_string_p (start_string_) && volta_span_) + if (volta_span_ && + (gh_string_p (start_string_) || gh_pair_p (start_string_))) { warning (_ ("Already have a volta spanner. Stopping that one prematurely.")); @@ -138,7 +139,8 @@ Volta_engraver::process_music () void Volta_engraver::process_acknowledged_grobs () { - if (!volta_span_ && gh_string_p (start_string_)) + if (!volta_span_ && + (gh_string_p (start_string_) || gh_pair_p (start_string_))) { started_mom_ = now_mom () ; -- 2.39.5