From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Thu, 25 Nov 2010 16:33:14 +0000 (+0100)
Subject: Ties: Print out a warning for unterminated ties
X-Git-Tag: release/2.13.41-1~3^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1a795132908c1a1d3717da023c2853c551ea4b6f;p=lilypond.git

Ties: Print out a warning for unterminated ties

Do not silently clear a tie attempt, but notify the user that a tie
could not be created (typically either due to a typo or due to a missing
tieWaitForNote)

In a chord, a tie is only unterminated if none of the notes of the
chord create a tie. All other notes of that chord are possible
candidates for a tie start, but not neccesary. For this, I simply
suppress the warning if a note from the same moment already caused
a tie.
E.g. in <c e g>~ g, the g will create a tie, but the c and e should
not trigger a warning!
---

diff --git a/input/regression/tie-unterminated.ly b/input/regression/tie-unterminated.ly
new file mode 100644
index 0000000000..d2fe1e7981
--- /dev/null
+++ b/input/regression/tie-unterminated.ly
@@ -0,0 +1,14 @@
+\version "2.13.41"
+#(ly:set-option 'warning-as-error #f)
+
+\header {
+  texidoc = "When a tie is followed only by unmatching notes and the tie cannot
+  be created, lilypond prints out a warning unless @code{tieWaitForNote} is set."
+}
+
+\relative c' {
+  c1~ c |
+  c1~ <e c> |
+  c1~ d |
+  <c e>1~ c |
+}
diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index bfae185d3c..d636db8253 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -49,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 ()
   {
@@ -56,6 +60,7 @@ struct Head_event_tuple
     tie_definition_ = SCM_EOL;
     tie_event_ = 0;
     tie_stream_event_ = 0;
+    tie_from_chord_created = false;
   }
 };
 
@@ -76,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);
 };
@@ -101,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 ()
 {
@@ -135,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 ()
@@ -153,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. Neede 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;
+	    }
 	}
     }
 
@@ -176,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);
+	    }
 	}
     }
 }
@@ -188,7 +217,12 @@ 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 ();
+        }
 
       for (vsize i = 0; i < ties_.size (); i++)
 	  typeset_tie (ties_[i]);
@@ -256,7 +290,12 @@ 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 () ?
   for (vsize i = 0; i < new_heads_to_tie.size (); i++)