summaryrefslogtreecommitdiff
path: root/input
diff options
context:
space:
mode:
authorPaul Morris <paulwmorris@gmail.com>2015-11-26 08:11:37 -0500
committerJames Lowe <pkx166h@gmail.com>2015-12-04 17:41:19 +0000
commited3e5abd8003297e02e3f90dc8755e33a6619135 (patch)
tree05d2878dcc93585238024b386a03192f4cdf2e10 /input
parent250726a9cc8040956bba2533099c6d2fffdbc58f (diff)
Implement rounded-box whiteout style
Diffstat (limited to 'input')
-rw-r--r--input/regression/whiteout-lower-layers.ly26
-rw-r--r--input/regression/whiteout.ly13
2 files changed, 29 insertions, 10 deletions
diff --git a/input/regression/whiteout-lower-layers.ly b/input/regression/whiteout-lower-layers.ly
index 8549cbc783..15c59e5770 100644
--- a/input/regression/whiteout-lower-layers.ly
+++ b/input/regression/whiteout-lower-layers.ly
@@ -10,23 +10,35 @@ TimeSignature whites out the Tie but not the StaffSymbol.
\relative {
\time 3/4
- \override Staff.StaffSymbol.layer = #4
- \once \override Tie.layer = #2
+ \override Staff.StaffSymbol.layer = 4
+ \once \override Tie.layer = 2
b'2.~
\once \override Staff.TimeSignature.whiteout = ##t
- \once \override Staff.TimeSignature.layer = #3
+ \once \override Staff.TimeSignature.layer = 3
\time 5/4
b4
}
\relative c' {
\time 3/4
- \override Staff.StaffSymbol.layer = #4
- \once \override Tie.layer = #2
+ \override Staff.StaffSymbol.layer = 4
+ \once \override Tie.layer = 2
+ b'2.~
+ \once \override Staff.TimeSignature.whiteout-style = #'rounded-box
+ \once \override Staff.TimeSignature.whiteout = 3
+ \once \override Staff.TimeSignature.layer = 3
+ \time 5/4
+ b4
+}
+
+\relative c' {
+ \time 3/4
+ \override Staff.StaffSymbol.layer = 4
+ \once \override Tie.layer = 2
b'2.~
\once \override Staff.TimeSignature.whiteout-style = #'outline
- \once \override Staff.TimeSignature.whiteout = #3
- \once \override Staff.TimeSignature.layer = #3
+ \once \override Staff.TimeSignature.whiteout = 3
+ \once \override Staff.TimeSignature.layer = 3
\time 5/4
b4
}
diff --git a/input/regression/whiteout.ly b/input/regression/whiteout.ly
index 7e10de9727..543d94f369 100644
--- a/input/regression/whiteout.ly
+++ b/input/regression/whiteout.ly
@@ -2,8 +2,9 @@
texidoc = "The whiteout command underlays a white background under a
markup. The shape is determined by @code{whiteout-style}. The default
-is @code{box} which produces a white rectangle. @code{outline}
-approximates the outline of the markup."
+is @code{box} which produces a rectangle. @code{rounded-box} produces
+a rounded rectangle. @code{outline} approximates the outline of the
+markup."
}
\version "2.19.32"
@@ -25,7 +26,13 @@ approximates the outline of the markup."
c
c-\markup {
\override #'(thickness . 3)
- \override #'(whiteout-style . outline)
+ \override #'(style . rounded-box)
+ \whiteout foo
+ }
+ c
+ c-\markup {
+ \override #'(thickness . 3)
+ \override #'(style . outline)
\whiteout foo
}
c