Guile-1.9 compatibility fixes.

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

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index b97a5ad9c2bbd71782b25f95952a902a376aef81..3ca2d2569acf74d4ba1dcc502dcf33df4f8af906 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  tie-engraver.cc -- implement Tie_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2007 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
+  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 "engraver.hh"
@@ -23,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.
 
@@ -38,6 +49,10 @@ struct Head_event_tuple
   SCM tie_definition_;
   Stream_event *tie_stream_event_;
   Stream_event *tie_event_;
+  // Indicate whether a tie from the same moment has been processed successfully
+  // 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 ()
   {
@@ -45,6 +60,7 @@ struct Head_event_tuple
     tie_definition_ = SCM_EOL;
     tie_event_ = 0;
     tie_stream_event_ = 0;
+    tie_from_chord_created = false;
   }
 };
 
@@ -65,6 +81,7 @@ protected:
   DECLARE_TRANSLATOR_LISTENER (tie);
   void process_music ();
   void typeset_tie (Grob *);
+  void report_unterminated_tie (Head_event_tuple const &);
 public:
   TRANSLATOR_DECLARATIONS (Tie_engraver);
 };
@@ -90,6 +107,15 @@ Tie_engraver::listen_tie (Stream_event *ev)
   ASSIGN_EVENT_ONCE (event_, ev);
 }
 
+void Tie_engraver::report_unterminated_tie (Head_event_tuple const &tie_start)
+{
+  // If tie_from_chord_created is set, we have another note at the same
+  // moment that created a tie, so this is not necessarily an unterminated
+  // tie. Happens e.g. for <c e g>~ g
+  if (!tie_start.tie_from_chord_created)
+    tie_start.head_->warning (_("unterminated tie"));
+}
+
 void
 Tie_engraver::process_music ()
 {
@@ -124,6 +150,7 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
                       left_ev->get_property ("pitch")))
        {
          Grob *p = new Spanner (heads_to_tie_[i].tie_definition_);
+         Moment end = heads_to_tie_[i].end_moment_;
 
          SCM cause = heads_to_tie_[i].tie_event_
            ? heads_to_tie_[i].tie_event_->self_scm ()
@@ -142,6 +169,16 @@ Tie_engraver::acknowledge_note_head (Grob_info i)
          
          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. 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_[j].tie_from_chord_created = true;
+           }
        }
     }
 
@@ -165,7 +202,10 @@ Tie_engraver::start_translation_timestep ()
       for (vsize i = heads_to_tie_.size ();  i--; )
        {
          if (now > heads_to_tie_[i].end_moment_)
-           heads_to_tie_.erase (heads_to_tie_.begin () + i);
+           {
+             report_unterminated_tie (heads_to_tie_[i]);
+             heads_to_tie_.erase (heads_to_tie_.begin () + i);
+           }
        }
     }
 }
@@ -177,16 +217,16 @@ Tie_engraver::stop_translation_timestep ()
   if (ties_.size ())
     {
       if (!wait)
-       heads_to_tie_.clear ();
+        {
+         vector<Head_event_tuple>::iterator it = heads_to_tie_.begin ();
+         for (; it < heads_to_tie_.end (); it++)
+           report_unterminated_tie (*it);
+         heads_to_tie_.clear ();
+        }
 
-      Grob *sep = unsmob_grob (get_property ("breakableSeparationItem"));
       for (vsize i = 0; i < ties_.size (); i++)
-       {
-         if (sep)
-           ties_[i]->set_object  ("separation-item", sep->self_scm ());
-         
          typeset_tie (ties_[i]);
-       }
+
       ties_.clear ();
       tie_column_ = 0;
     }
@@ -201,7 +241,7 @@ Tie_engraver::stop_translation_timestep ()
 
       if (!left_ev)
        {
-         // may happen for ambituses
+         // may happen for ambitus
          continue;
        }
            
@@ -250,9 +290,14 @@ Tie_engraver::stop_translation_timestep ()
     }
 
   if (!wait && new_heads_to_tie.size ())
-    heads_to_tie_.clear ();
+    {
+      vector<Head_event_tuple>::iterator it=heads_to_tie_.begin ();
+      for (; it < heads_to_tie_.end (); it++)
+        report_unterminated_tie (*it);
+      heads_to_tie_.clear ();
+    }
 
-  // hmmm, how to do with copy() ?
+  // 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]);
   
@@ -284,9 +329,16 @@ Tie_engraver::typeset_tie (Grob *her)
 
 ADD_ACKNOWLEDGER (Tie_engraver, note_head);
 ADD_TRANSLATOR (Tie_engraver,
-               /* doc */ "Generate ties between noteheads of equal pitch.",
+               /* doc */
+               "Generate ties between note heads of equal pitch.",
+
                /* create */
                "Tie "
                "TieColumn ",
-               /* read */ "tieWaitForNote",
-               /* write */ "tieMelismaBusy");
+
+               /* read */
+               "tieWaitForNote ",
+
+               /* write */
+               "tieMelismaBusy "
+               );