resolve merge

[lilypond.git] / input / regression / lyric-melisma-alignment.ly

diff --git a/input/regression/lyric-melisma-alignment.ly b/input/regression/lyric-melisma-alignment.ly
new file mode 100644 (file)
index 0000000..67d82ab
--- /dev/null
+++ b/input/regression/lyric-melisma-alignment.ly
@@ -0,0 +1,18 @@
+\version "2.14.0"
+
+\header {
+  texidoc = "@code{lyricMelismaAlignment} sets the default alignment for melismata.
+It works with both automatic and manual melismata."
+}
+
+\relative c' {
+  c4^"auto"( d e f)
+  \set melismaBusyProperties = #'()
+  c4^"manual" d e f
+}
+\addlyrics {
+  \set lyricMelismaAlignment = #RIGHT
+  right-align __
+  \set lyricMelismaAlignment = #CENTER
+  center  __ _ _ _
+}