* lily/volta-engraver.cc (process_acknowledged_grobs):

	Allow for text markup in repeatCommands.

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index a893d2145a57ad7c01e210ece183cf3808524ecf..38d1b90e40b366411417a7c2a6d7932add478e1f 100644 (file)
--- 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 40bf88f5576f593e9f388c9dde46b2f8633132ed..91f184353766bcceaa23f5c0dc549c1ffb0e1a82 100644 (file)
--- 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 () ;