(process_acknowledged_grobs): new

engraver, redo lyric phrasing, but cleaner and simpler.  Lyrics on
melismata are now left-aligned.

diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index c3d13e688217d8ef29e00db07316608e641c25e6..0c4b3f8a4307848e45e77df2ef83a2d4929180e0 100644 (file)
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -73,12 +73,13 @@ secondVerse = \lyrics {
     }
 
 pianoRH = \notes \relative c''' \repeat volta 2 {
-    g16( fis a g fis g f e d c b a ) | 
+    g16(_\p fis a g fis g f e d c b a ) | 
     <g e>8( <es fis a> <d f b> <c e c'>) r8 r | 
-    r8 c'( e,) f r a | 
-    r8 << { fis( g)} \\ { c,4 } >> r8 <e c g> <e c g> |
+    r8 c'( e,) f r a |
+    \property Voice.DynamicLineSpanner \set #'padding =#3
+    r8_\> << { s8 s8-\! }  << { fis( g)\!} \\ { c,4 } >> >> r8 <e c g> <e c g> |
     <d c a>4. r8 \clef bass  <d b f> <d b f> |
-    e,16 g c g e g d gis b gis d g |
+    e,16_" "_\markup { \italic cresc } g c g e g d gis b gis d g |
     c, e a e c e a,-\f d fis d a d |
     b d g  d b g r4\fermata \clef treble g''8 |
     as4.( g 4.) | fis4. r4 <d g>8 ( |
@@ -119,7 +120,9 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
         \context LyricsVoice = "singer-2" \secondVerse
         >>
      \new PianoStaff <<
-        \property PianoStaff.instrument = \markup { \bold \bigger "2.  " }
+        \property PianoStaff.instrument = \markup {
+            \bold
+            \huge "2.  " }
         \new Staff \pianoRH
         \new Staff \pianoLH
        >> 

diff --git a/lily/new-phrasing-engraver.cc b/lily/new-phrasing-engraver.cc
index 234c430c14c5ccb9acfeeaa57354506995a45356..b0e4931ee1a387cb16448da6c17f4d7def13e19d 100644 (file)
--- a/lily/new-phrasing-engraver.cc
+++ b/lily/new-phrasing-engraver.cc
@@ -18,12 +18,10 @@ struct Phrasing_association
   Link_array<Grob> lyrics_;
   Link_array<Grob> heads_;
   bool melisma_;
-  bool last_melisma_;
   
   Phrasing_association()
   {
     melisma_ = false;
-    last_melisma_ = false;
   }
   
   void clear () {
@@ -143,7 +141,6 @@ New_phrasing_engraver::stop_translation_timestep ()
   for (int i = assocs_.size ();  i--; )
     {
       assocs_[i]->clear ();
-      assocs_[i]->last_melisma_ = assocs_[i]->melisma_;
     }
 }
 
@@ -158,7 +155,7 @@ New_phrasing_engraver::process_acknowledged_grobs ()
 
       Grob *h = a->heads_[0];  
       Direction alignment = CENTER;
-      if (a->melisma_ && !a->last_melisma_)
+      if (a->melisma_)
        alignment = LEFT;
       
       for (int j = 0; j < a->lyrics_.size (); j++)