From 176547a34da87fc8964b0f8a09603156e107da68 Mon Sep 17 00:00:00 2001
From: Neil Puttock <n.puttock@gmail.com>
Date: Wed, 4 Jun 2008 22:32:49 +0100
Subject: [PATCH] Fix repeatCommands volta markup.

---
 .../volta-text-markup-using-repeatcommands.ly | 27 +++++++++++++++++++
 input/regression/volta-markup-text.ly         | 17 ++++++++++++
 scm/define-grobs.scm                          |  1 +
 3 files changed, 45 insertions(+)
 create mode 100644 input/new/volta-text-markup-using-repeatcommands.ly
 create mode 100644 input/regression/volta-markup-text.ly

diff --git a/input/new/volta-text-markup-using-repeatcommands.ly b/input/new/volta-text-markup-using-repeatcommands.ly
new file mode 100644
index 0000000000..0d72332a10
--- /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
index 0000000000..46a2a3b2af
--- /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 3138b96441..e75c1b4042 100644
--- 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
-- 
2.39.2