From 6e1ffdd6b435633d61a67e1092a51fc979b6dc9f Mon Sep 17 00:00:00 2001 From: Mats Bengtsson Date: Thu, 21 Nov 2002 20:09:15 +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 7d7ece992f..181de60db8 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -2400,7 +2400,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 7b3d8da3ae..5579a6d998 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