X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=041f9046ed470e9ee45a6ecbdfc0ff7d7c22784f;hb=9b6f379c589a3faec6c4bbdbb7853ef2a0e500f2;hp=efea867822abf2b12ebab55865b6d5a5b266a2e1;hpb=44ad1d66c072e4d6545e75c769c86a460cb1df13;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index efea867822..041f9046ed 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2006 Glen Prideaux <glenprideaux@iname.com>,
+  (c) 1999--2009 Glen Prideaux <glenprideaux@iname.com>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>,
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
@@ -35,7 +35,9 @@ public:
 protected:
   DECLARE_TRANSLATOR_LISTENER (extender);
   DECLARE_ACKNOWLEDGER (lyric_syllable);
+
   virtual void finalize ();
+
   void stop_translation_timestep ();
   void process_music ();
 };
@@ -96,9 +98,23 @@ Extender_engraver::stop_translation_timestep ()
 	    {
 	      Pointer_group_interface::add_grob (pending_extender_,
 						 ly_symbol2scm ("heads"), h);
+             if (!melisma_busy (voice))
+               {
+                 completize_extender (pending_extender_);
+                 pending_extender_ = 0;
+               }
 	    }
 	}
-
+      else
+	{
+	  if (pending_extender_
+	      && !get_property ("extendersOverRests"))
+	    {
+	      completize_extender (pending_extender_);
+	      pending_extender_ = 0;
+	    }
+	  
+	}
       if (extender_)
 	{
 	  pending_extender_ = extender_;
@@ -144,7 +160,15 @@ Extender_engraver::finalize ()
 
 ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
 ADD_TRANSLATOR (Extender_engraver,
-		/* doc */ "Create lyric extenders",
-		/* create */ "LyricExtender",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Create lyric extenders.",
+
+		/* create */
+		"LyricExtender ",
+
+		/* read */
+		"extendersOverRests ",
+
+		/* write */
+		""
+		);