X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=097b47912ba0daa1d7375cc416ee89bec8382317;hb=d770aef543262c29157842e46ac775bced34aa90;hp=aca180d14150033e71586e673c011dcac8820ad8;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index aca180d141..097b47912b 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,56 +1,72 @@
 /*
-  extender-engraver.cc -- implement Extender_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1999--2005 Glen Prideaux <glenprideaux@iname.com>,
+  Copyright (C) 1999--2010 Glen Prideaux <glenprideaux@iname.com>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>,
   Jan Nieuwenhuizen <janneke@gnu.org>
-*/
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "context.hh"
 #include "engraver.hh"
-#include "pointer-group-interface.hh"
+#include "international.hh"
 #include "item.hh"
 #include "lyric-extender.hh"
 #include "note-head.hh"
+#include "pointer-group-interface.hh"
+#include "stream-event.hh"
 #include "warn.hh"
+#include "spanner.hh"
+#include "paper-column.hh"
+
+#include "translator.icc"
 
 void completize_extender (Spanner *sp);
 
 class Extender_engraver : public Engraver
 {
-  Music *ev_;
+  Stream_event *ev_;
   Spanner *extender_;
   Spanner *pending_extender_;
+  bool current_lyric_is_skip_;
 
 public:
   TRANSLATOR_DECLARATIONS (Extender_engraver);
 
 protected:
+  DECLARE_TRANSLATOR_LISTENER (extender);
   DECLARE_ACKNOWLEDGER (lyric_syllable);
+
   virtual void finalize ();
-  virtual bool try_music (Music *);
+
   void stop_translation_timestep ();
   void process_music ();
 };
 
 Extender_engraver::Extender_engraver ()
 {
+  current_lyric_is_skip_ = false;
   extender_ = 0;
   pending_extender_ = 0;
   ev_ = 0;
 }
 
-bool
-Extender_engraver::try_music (Music *r)
+IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, extender);
+void
+Extender_engraver::listen_extender (Stream_event *ev)
 {
-  if (!ev_)
-    {
-      ev_ = r;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (ev_, ev);
 }
 
 void
@@ -67,7 +83,10 @@ Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
   if (extender_)
     extender_->set_bound (LEFT, item);
 
-  if (pending_extender_)
+  SCM text = item->get_property ("text");
+  current_lyric_is_skip_ = ly_is_equal (text, scm_from_locale_string (" "));
+
+  if (pending_extender_ && !current_lyric_is_skip_)
     {
       pending_extender_->set_object ("next", item->self_scm ());
       completize_extender (pending_extender_);
@@ -91,13 +110,41 @@ Extender_engraver::stop_translation_timestep ()
 						 ly_symbol2scm ("heads"), h);
 	    }
 
-	  if (pending_extender_)
+        if (pending_extender_)
+          {
+            Pointer_group_interface::add_grob (pending_extender_,
+                                              ly_symbol2scm ("heads"), h);
+            /*
+              The following check addresses the case where the lyrics end before
+              the associated voice. The current_lyric_is_skip_ check is
+              necessary to handle manual melismata, which should not result in
+              extenders being completized. We also need to make sure that we're not
+              in the middle of a note (happens when this function is called because
+              of an event in a voice other than our associated one).
+            */
+            if (!melisma_busy (voice) && !current_lyric_is_skip_)
+              {
+                Moment now = voice->now_mom ();
+                Paper_column *column = (dynamic_cast<Item *> (h))->get_column ();
+                Moment *start_mom = column ? unsmob_moment (column->get_property ("when")) : 0;
+                if (!column || (start_mom->main_part_ == now.main_part_))
+                  {
+                    completize_extender (pending_extender_);
+                    pending_extender_ = 0;
+                  }
+              }
+            }
+        }
+      else
+	{
+	  if (pending_extender_
+	      && !get_property ("extendersOverRests"))
 	    {
-	      Pointer_group_interface::add_grob (pending_extender_,
-						 ly_symbol2scm ("heads"), h);
+	      completize_extender (pending_extender_);
+	      pending_extender_ = 0;
 	    }
+	  
 	}
-
       if (extender_)
 	{
 	  pending_extender_ = extender_;
@@ -115,7 +162,7 @@ completize_extender (Spanner *sp)
     {
       extract_item_set (sp, "heads", heads);
       if (heads.size ())
-	sp->set_bound (RIGHT, heads.top ());
+	sp->set_bound (RIGHT, heads.back ());
     }
 }
 
@@ -141,12 +188,17 @@ Extender_engraver::finalize ()
     }
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
 ADD_TRANSLATOR (Extender_engraver,
-		/* doc */ "Create lyric extenders",
-		/* create */ "LyricExtender",
-		/* accept */ "extender-event",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Create lyric extenders.",
+
+		/* create */
+		"LyricExtender ",
+
+		/* read */
+		"extendersOverRests ",
+
+		/* write */
+		""
+		);