X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=9ffdd234058dd9c6a91662a6ce759774210fa6ee;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=ced1f123ce2b0fd9ebefc5b62ada4b974d88d52c;hpb=ccf8655fa768604e43971a84d814236c707dc283;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index ced1f123ce..9ffdd23405 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,11 +1,22 @@
 /*
-  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--2007 Glen Prideaux <glenprideaux@iname.com>,
+  Copyright (C) 1999--2014 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"
@@ -18,7 +29,6 @@
 #include "stream-event.hh"
 #include "warn.hh"
 #include "spanner.hh"
-
 #include "translator.icc"
 
 void completize_extender (Spanner *sp);
@@ -34,6 +44,7 @@ public:
 
 protected:
   DECLARE_TRANSLATOR_LISTENER (extender);
+  DECLARE_TRANSLATOR_LISTENER (completize_extender);
   DECLARE_ACKNOWLEDGER (lyric_syllable);
 
   virtual void finalize ();
@@ -56,6 +67,23 @@ Extender_engraver::listen_extender (Stream_event *ev)
   ASSIGN_EVENT_ONCE (ev_, ev);
 }
 
+/*
+  A CompletizeExtenderEvent is sent at the end of each lyrics block
+  to ensure any pending extender can be correctly terminated if the lyrics
+  end before the associated voice (this prevents the right bound being extended
+  to the next note-column if no lyric follows the extender)
+*/
+IMPLEMENT_TRANSLATOR_LISTENER (Extender_engraver, completize_extender);
+void
+Extender_engraver::listen_completize_extender (Stream_event * /* ev */)
+{
+  if (pending_extender_)
+    {
+      completize_extender (pending_extender_);
+      pending_extender_ = 0;
+    }
+}
+
 void
 Extender_engraver::process_music ()
 {
@@ -84,37 +112,36 @@ Extender_engraver::stop_translation_timestep ()
   if (extender_ || pending_extender_)
     {
       Context *voice = get_voice_to_lyrics (context ());
-      Grob *h = voice ? get_current_note_head (voice) : 0;
+      Grob *h = voice ? get_current_note_head (voice, to_boolean (get_property ("includeGraceNotes"))) : 0;
 
       if (h)
-	{
-	  if (extender_)
-	    {
-	      Pointer_group_interface::add_grob (extender_,
-						 ly_symbol2scm ("heads"), h);
-	    }
-
-	  if (pending_extender_)
-	    {
-	      Pointer_group_interface::add_grob (pending_extender_,
-						 ly_symbol2scm ("heads"), h);
-	    }
-	}
+        {
+          if (extender_)
+            {
+              Pointer_group_interface::add_grob (extender_,
+                                                 ly_symbol2scm ("heads"), h);
+            }
+
+          if (pending_extender_)
+            {
+              Pointer_group_interface::add_grob (pending_extender_,
+                                                 ly_symbol2scm ("heads"), h);
+            }
+        }
       else
-	{
-	  if (pending_extender_
-	      && !get_property ("extendersOverRests"))
-	    {
-	      completize_extender (pending_extender_);
-	      pending_extender_ = 0;
-	    }
-	  
-	}
+        {
+          if (pending_extender_
+              && !get_property ("extendersOverRests"))
+            {
+              completize_extender (pending_extender_);
+              pending_extender_ = 0;
+            }
+        }
       if (extender_)
-	{
-	  pending_extender_ = extender_;
-	  extender_ = 0;
-	}
+        {
+          pending_extender_ = extender_;
+          extender_ = 0;
+        }
     }
 
   ev_ = 0;
@@ -127,7 +154,7 @@ completize_extender (Spanner *sp)
     {
       extract_item_set (sp, "heads", heads);
       if (heads.size ())
-	sp->set_bound (RIGHT, heads.back ());
+        sp->set_bound (RIGHT, heads.back ());
     }
 }
 
@@ -139,7 +166,7 @@ Extender_engraver::finalize ()
       completize_extender (extender_);
 
       if (!extender_->get_bound (RIGHT))
-	extender_->warning (_ ("unterminated extender"));
+        extender_->warning (_ ("unterminated extender"));
       extender_ = 0;
     }
 
@@ -148,14 +175,23 @@ Extender_engraver::finalize ()
       completize_extender (pending_extender_);
 
       if (!pending_extender_->get_bound (RIGHT))
-	pending_extender_->warning (_ ("unterminated extender"));
+        pending_extender_->warning (_ ("unterminated extender"));
       pending_extender_ = 0;
     }
 }
 
 ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
 ADD_TRANSLATOR (Extender_engraver,
-		/* doc */ "Create lyric extenders",
-		/* create */ "LyricExtender",
-		/* read */ "extendersOverRests",
-		/* write */ "");
+                /* doc */
+                "Create lyric extenders.",
+
+                /* create */
+                "LyricExtender ",
+
+                /* read */
+                "extendersOverRests "
+                "includeGraceNotes ",
+
+                /* write */
+                ""
+               );