Merge branch 'master' into lilypond/translation

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index d636db8253832eb56bcc9221e8d1bfffdde2e91d..edaba06c7c0720e1dcc35321acf9010cee298226 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 #include "translator.icc"
 
 /**
-   Manufacture ties.  Acknowledge noteheads, and put them into a
+   Manufacture ties.  Acknowledge note heads, and put them into a
    priority queue. If we have a TieEvent, connect the notes that finish
    just at this time, and note that start at this time.
 
@@ -53,7 +53,7 @@ struct Head_event_tuple
   // This is needed for tied chords, e.g. <c e g>~ g, because otherwise the c
   // and e will trigger a warning for an unterminated tie!
   bool tie_from_chord_created;
-  
+
   Head_event_tuple ()
   {
     head_ = 0;
@@ -82,6 +82,7 @@ protected:
   void process_music ();
   void typeset_tie (Grob *);
   void report_unterminated_tie (Head_event_tuple const &);
+  bool has_autosplit_end (Stream_event *event);
 public:
   TRANSLATOR_DECLARATIONS (Tie_engraver);
 };
@@ -116,6 +117,18 @@ void Tie_engraver::report_unterminated_tie (Head_event_tuple const &tie_start)
     tie_start.head_->warning (_("unterminated tie"));
 }
 
+/*
+  Determines whether the end of an event was created by
+  a split in Completion_heads_engraver or by user input.
+*/
+bool
+Tie_engraver::has_autosplit_end (Stream_event *event)
+{
+  if (event)
+    return to_boolean (event->get_property ("autosplit-end"));
+  return false;
+}
+
 void
 Tie_engraver::process_music ()
 {
@@ -145,9 +158,13 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
       */
       if (!right_ev || !left_ev)
        continue;
-      
-      if (ly_is_equal (right_ev->get_property ("pitch"),
-                      left_ev->get_property ("pitch")))
+
+      /*
+        Make a tie only if pitches are equal or if event end was not generated by
+        Completion_heads_engraver.
+      */
+      if (ly_is_equal (right_ev->get_property ("pitch"), left_ev->get_property ("pitch"))
+         && (!Tie_engraver::has_autosplit_end (left_ev)))
        {
          Grob *p = new Spanner (heads_to_tie_[i].tie_definition_);
          Moment end = heads_to_tie_[i].end_moment_;
@@ -155,7 +172,7 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
          SCM cause = heads_to_tie_[i].tie_event_
            ? heads_to_tie_[i].tie_event_->self_scm ()
            : heads_to_tie_[i].tie_stream_event_->self_scm ();
-         
+
          announce_grob (p, cause);
          Tie::set_head (p, LEFT, th);
          Tie::set_head (p, RIGHT, h);
@@ -164,20 +181,22 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
          if (is_direction (unsmob_stream_event (cause)->get_property ("direction")))
            {
              Direction d = to_dir (unsmob_stream_event (cause)->get_property ("direction"));
-             p->set_property ("direction", scm_from_int (d)); 
+             p->set_property ("direction", scm_from_int (d));
            }
-         
+
          ties_.push_back (p);
          heads_to_tie_.erase (heads_to_tie_.begin () + i);
 
-         // Prevent all other tied notes ending at the same moment (assume
-         // implicitly the notes have also started at the same moment!)
-         // from triggering an "unterminated tie" warning. Neede e.g. for
-         // <c e g>~ g
+         /*
+           Prevent all other tied notes ending at the same moment (assume
+           implicitly the notes have also started at the same moment!)
+           from triggering an "unterminated tie" warning. Needed e.g. for
+           <c e g>~ g
+         */
          for (vsize j = heads_to_tie_.size (); j--;)
            {
              if (heads_to_tie_[j].end_moment_ == end)
-               heads_to_tie_[i].tie_from_chord_created = true;
+               heads_to_tie_[j].tie_from_chord_created = true;
            }
        }
     }
@@ -193,9 +212,6 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
 void
 Tie_engraver::start_translation_timestep ()
 {
-  context ()->set_property ("tieMelismaBusy",
-                           ly_bool2scm (heads_to_tie_.size ()));
-
   if (heads_to_tie_.size () && !to_boolean (get_property ("tieWaitForNote")))
     {
       Moment now = now_mom ();
@@ -208,6 +224,9 @@ Tie_engraver::start_translation_timestep ()
            }
        }
     }
+
+  context ()->set_property ("tieMelismaBusy",
+                           ly_bool2scm (heads_to_tie_.size ()));
 }
 
 void
@@ -232,7 +251,13 @@ Tie_engraver::stop_translation_timestep ()
     }
 
   vector<Head_event_tuple> new_heads_to_tie;
-  
+
+  /*
+    Whether tie event has been processed and can be deleted or should
+    be kept for later portions of a split note.
+  */
+  bool event_processed = false;
+
   for (vsize i = 0; i < now_heads_.size (); i++)
     {
       Grob *head = now_heads_[i];
@@ -241,11 +266,14 @@ Tie_engraver::stop_translation_timestep ()
 
       if (!left_ev)
        {
-         // may happen for ambituses
+         // may happen for ambitus
          continue;
        }
-           
-      
+
+      // We only want real notes to cause ties, not e.g. pitched trills
+      if (!left_ev->in_event_class ("note-event"))
+          continue;
+
       SCM left_articulations = left_ev->get_property ("articulations");
 
       Stream_event *tie_event = 0;
@@ -257,13 +285,16 @@ Tie_engraver::stop_translation_timestep ()
          Stream_event *ev = unsmob_stream_event (scm_car (s));
          if (!ev)
            continue;
-         
+
          if (ev->in_event_class ("tie-event"))
            tie_event = ev;
        }
-         
-      if (left_ev && (tie_event || tie_stream_event))
+
+      if (left_ev && (tie_event || tie_stream_event)
+         && (!Tie_engraver::has_autosplit_end (left_ev)))
        {
+         event_processed = true;
+
          Head_event_tuple event_tup;
 
          SCM start_definition
@@ -284,7 +315,7 @@ Tie_engraver::stop_translation_timestep ()
              end += get_event_length (left_ev);
            }
          event_tup.end_moment_ = end;
-           
+
          new_heads_to_tie.push_back (event_tup);
        }
     }
@@ -300,8 +331,14 @@ Tie_engraver::stop_translation_timestep ()
   // hmmm, how to do with copy () ?
   for (vsize i = 0; i < new_heads_to_tie.size (); i++)
     heads_to_tie_.push_back (new_heads_to_tie[i]);
-  
-  event_ = 0;
+
+  /*
+    Discard event only if it has been processed with at least one
+    appropriate note.
+  */
+  if (event_processed)
+    event_ = 0;
+
   now_heads_.clear ();
 }