Fix repeatCommands volta markup.

diff --git a/input/new/volta-text-markup-using-repeatcommands.ly b/input/new/volta-text-markup-using-repeatcommands.ly
new file mode 100644 (file)
index 0000000..0d72332
--- /dev/null
+++ b/input/new/volta-text-markup-using-repeatcommands.ly
@@ -0,0 +1,27 @@
+\version "2.11.48"
+
+\header {
+  lsrtags = "repeats"
+  texidoc = "Though volte are best specified using
+@code{\\repeat volta}, the context property @code{repeatCommands}
+must be used in cases where the volta text needs more advanced
+formatting with @code{\\markup}.
+
+Since @code{repeatCommands} takes a list, the simplest method of
+including markup is to use an identifier for the text and embed
+it in the command list using the Scheme syntax
+@w{@code{#(list (list 'volta textIdentifier))}}. Start- and end-repeat commands
+can be added as separate list elements:"
+doctitle = "Volta text markup using @code{\\repeatCommands}"
+}
+
+voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } }
+
+\relative c'' {
+  c1
+  \set Score.repeatCommands = #(list (list 'volta voltaAdLib) 'start-repeat)
+  c4 b d e
+  \set Score.repeatCommands = #'((volta #f) (volta "4.") end-repeat)
+  f1
+  \set Score.repeatCommands = #'((volta #f))
+}

diff --git a/input/regression/volta-markup-text.ly b/input/regression/volta-markup-text.ly
new file mode 100644 (file)
index 0000000..46a2a3b
--- /dev/null
+++ b/input/regression/volta-markup-text.ly
@@ -0,0 +1,17 @@
+\version "2.11.48"
+
+\header {
+  texidoc = "Volte using @code{repeatCommands} can have markup
+text."
+}
+
+voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } }
+
+\relative c'' {
+  c1
+  \set Score.repeatCommands = #(list (list 'volta voltaAdLib) 'start-repeat)
+  c4 b d e
+  \set Score.repeatCommands = #'((volta #f) (volta "4.") end-repeat)
+  f1
+  \set Score.repeatCommands = #'((volta #f))
+}

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3138b964419eb27905c0f648cebe6c3888fa1542..e75c1b4042653dca5d64662a3c5ef88f72c3a15d 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2144,6 +2144,7 @@
        (thickness . 1.6)  ;;  line-thickness
        (edge-height . (2.0 . 2.0)) ;; staff-space;
        (font-size . -4)
+       (word-space . 0.6)
        (direction . ,UP)
        (meta . ((class . Spanner)
                 (interfaces . (volta-bracket-interface