Fix 1111: Break dynamic line spanner if different direction is explicitly given

[lilypond.git] / lily / extender-engraver.cc

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 097b47912ba0daa1d7375cc416ee89bec8382317..49fcbcaf3f598d6a55895c1238cb46685dcacd75 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2010 Glen Prideaux <glenprideaux@iname.com>,
+  Copyright (C) 1999--2011 Glen Prideaux <glenprideaux@iname.com>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>,
   Jan Nieuwenhuizen <janneke@gnu.org>
 
@@ -18,6 +18,7 @@
   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 "international.hh"
@@ -28,8 +29,6 @@
 #include "stream-event.hh"
 #include "warn.hh"
 #include "spanner.hh"
-#include "paper-column.hh"
-
 #include "translator.icc"
 
 void completize_extender (Spanner *sp);
@@ -39,13 +38,13 @@ class Extender_engraver : public Engraver
   Stream_event *ev_;
   Spanner *extender_;
   Spanner *pending_extender_;
-  bool current_lyric_is_skip_;
 
 public:
   TRANSLATOR_DECLARATIONS (Extender_engraver);
 
 protected:
   DECLARE_TRANSLATOR_LISTENER (extender);
+  DECLARE_TRANSLATOR_LISTENER (completize_extender);
   DECLARE_ACKNOWLEDGER (lyric_syllable);
 
   virtual void finalize ();
@@ -56,7 +55,6 @@ protected:
 
 Extender_engraver::Extender_engraver ()
 {
-  current_lyric_is_skip_ = false;
   extender_ = 0;
   pending_extender_ = 0;
   ev_ = 0;
@@ -69,6 +67,24 @@ 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 ()
 {
@@ -83,10 +99,7 @@ Extender_engraver::acknowledge_lyric_syllable (Grob_info i)
   if (extender_)
     extender_->set_bound (LEFT, item);
 
-  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_)
+  if (pending_extender_)
     {
       pending_extender_->set_object ("next", item->self_scm ());
       completize_extender (pending_extender_);
@@ -100,7 +113,7 @@ 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)
        {
@@ -110,31 +123,12 @@ Extender_engraver::stop_translation_timestep ()
                                                 ly_symbol2scm ("heads"), h);
            }
 
-        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;
-                  }
-              }
-            }
-        }
+         if (pending_extender_)
+           {
+             Pointer_group_interface::add_grob (pending_extender_,
+                                                ly_symbol2scm ("heads"), h);
+           }
+       }
       else
        {
          if (pending_extender_
@@ -143,7 +137,6 @@ Extender_engraver::stop_translation_timestep ()
              completize_extender (pending_extender_);
              pending_extender_ = 0;
            }
-         
        }
       if (extender_)
        {
@@ -197,7 +190,8 @@ ADD_TRANSLATOR (Extender_engraver,
                "LyricExtender ",
 
                /* read */
-               "extendersOverRests ",
+               "extendersOverRests "
+               "includeGraceNotes ",
 
                /* write */
                ""