X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fextender-engraver.cc;h=624a6bc062e809b734849058c1d410f323bd72b8;hb=0d79b28f11fd1d08301c1990bfe224b5f661824e;hp=c740b51daba2e7215e63d94f6ac647e889c12a1a;hpb=91821bd59959b1289f2d711509017a4dacebecd2;p=lilypond.git

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index c740b51dab..624a6bc062 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,26 +1,41 @@
 /*
-  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>,
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  Copyright (C) 1999--2015 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 "translator.icc"
 
 void completize_extender (Spanner *sp);
 
 class Extender_engraver : public Engraver
 {
-  Music *ev_;
+  Stream_event *ev_;
   Spanner *extender_;
   Spanner *pending_extender_;
 
@@ -28,29 +43,44 @@ public:
   TRANSLATOR_DECLARATIONS (Extender_engraver);
 
 protected:
-  DECLARE_ACKNOWLEDGER (lyric_syllable);
+  void listen_extender (Stream_event *);
+  void listen_completize_extender (Stream_event *);
+  void acknowledge_lyric_syllable (Grob_info);
+
   virtual void finalize ();
-  virtual bool try_music (Music *);
+
   void stop_translation_timestep ();
   void process_music ();
 };
 
-Extender_engraver::Extender_engraver ()
+Extender_engraver::Extender_engraver (Context *c)
+  : Engraver (c)
 {
   extender_ = 0;
   pending_extender_ = 0;
   ev_ = 0;
 }
 
-bool
-Extender_engraver::try_music (Music *r)
+void
+Extender_engraver::listen_extender (Stream_event *ev)
 {
-  if (!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)
+*/
+void
+Extender_engraver::listen_completize_extender (Stream_event * /* ev */)
+{
+  if (pending_extender_)
     {
-      ev_ = r;
-      return true;
+      completize_extender (pending_extender_);
+      pending_extender_ = 0;
     }
-  return false;
 }
 
 void
@@ -84,25 +114,33 @@ Extender_engraver::stop_translation_timestep ()
       Grob *h = voice ? get_current_note_head (voice) : 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_
+              && !to_boolean (get_property ("extendersOverRests")))
+            {
+              completize_extender (pending_extender_);
+              pending_extender_ = 0;
+            }
+        }
       if (extender_)
-	{
-	  pending_extender_ = extender_;
-	  extender_ = 0;
-	}
+        {
+          pending_extender_ = extender_;
+          extender_ = 0;
+        }
     }
 
   ev_ = 0;
@@ -115,9 +153,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 ());
     }
 }
 
@@ -129,7 +165,7 @@ Extender_engraver::finalize ()
       completize_extender (extender_);
 
       if (!extender_->get_bound (RIGHT))
-	extender_->warning (_ ("unterminated extender"));
+        extender_->warning (_ ("unterminated extender"));
       extender_ = 0;
     }
 
@@ -138,17 +174,29 @@ 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;
     }
 }
 
-#include "translator.icc"
+void
+Extender_engraver::boot ()
+{
+  ADD_LISTENER (Extender_engraver, extender);
+  ADD_LISTENER (Extender_engraver, completize_extender);
+  ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
+}
 
-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 */
+                ""
+               );