* input/regression (lyric-melisma-alignment.ly):
new regression test; test lyricMelismaAlignment settings with automatic
and manual melismata
* input/regression (lyric-melisma-manual.ly):
style nitpicks
* lily/lyric-engraver.cc (process_music):
set 'self-alignment-X for manual melismata using lyricMelismaAlignment
instead of hard-coding to LEFT
--- /dev/null
+\version "2.13.49"
+
+\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 __ _ _ _
+}
-\header {
-
- texidoc = "Melisma's may be entered manually by substituting
- @code{_} for lyrics on notes that are part of the melisma."
-
-}
-
-\paper {
- ragged-right = ##t
+
+\header {
+ texidoc = "Melismata may be entered manually by substituting
+@code{_} for lyrics on notes that are part of the melisma."
}
\relative c' {
\set melismaBusyProperties = #'()
}
\relative c' {
\set melismaBusyProperties = #'()
- c d( e) f f( e) e e }
-\addlyrics
- { Ky -- _ _ ri __ _ _ _ e }
+ c4 d( e) f
+ f4( e) e e
+}
+\addlyrics {
+ Ky -- _ _ ri __ _ _ _ e
+}
if (ly_is_equal (text, scm_from_locale_string (" ")))
{
if (last_text_)
if (ly_is_equal (text, scm_from_locale_string (" ")))
{
if (last_text_)
- last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
+ last_text_->set_property ("self-alignment-X",
+ get_property ("lyricMelismaAlignment"));
}
else
text_ = make_item ("LyricText", event_->self_scm ());
}
else
text_ = make_item ("LyricText", event_->self_scm ());