From: Neil Puttock <n.puttock@gmail.com>
Date: Mon, 7 Feb 2011 23:36:26 +0000 (+0000)
Subject: Use lyricMelismaAlignment for manual melismata alignment.
X-Git-Tag: release/2.13.49-1~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2236ce5873feb1e196a6dc27c85e13fd730ae1a7;p=lilypond.git

Use lyricMelismaAlignment for manual melismata alignment.

* 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
---

diff --git a/input/regression/lyric-melisma-alignment.ly b/input/regression/lyric-melisma-alignment.ly
new file mode 100644
index 0000000000..4255ce376c
--- /dev/null
+++ b/input/regression/lyric-melisma-alignment.ly
@@ -0,0 +1,18 @@
+\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  __ _ _ _
+}
diff --git a/input/regression/lyric-melisma-manual.ly b/input/regression/lyric-melisma-manual.ly
index 11e3f44cbd..08d31cc7c5 100644
--- a/input/regression/lyric-melisma-manual.ly
+++ b/input/regression/lyric-melisma-manual.ly
@@ -1,17 +1,15 @@
-\header {
-
-  texidoc = "Melisma's may be entered manually by substituting
-  @code{_} for lyrics on notes that are part of the melisma."
-
-}
-
 \version "2.12.0"
-\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 = #'()
-  c d( e) f f( e) e e  }
-\addlyrics
- { Ky -- _ _ ri __ _ _ _  e }
+  c4 d( e) f
+  f4( e) e e
+}
+\addlyrics {
+  Ky -- _ _ ri __ _ _ _  e
+}
diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 136a501358..ffae2783ba 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -73,7 +73,8 @@ Lyric_engraver::process_music ()
       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 ());