X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-engraver.cc;h=f12cfbad95de5324622307e5c0f4cff712076e6f;hb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;hp=badc17c2f6f3cce94f46f1117598b18df297ea30;hpb=ecf2b5e9dcfa7654803fb0050d7127e0ec7fd934;p=lilypond.git

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index badc17c2f6..f12cfbad95 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -1,15 +1,25 @@
 /*
-  part-combine-engraver.cc -- implement PC-engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
   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"
-#include "multi-measure-rest.hh"
 #include "note-head.hh"
 #include "side-position-interface.hh"
 #include "stem.hh"
@@ -28,46 +38,74 @@ protected:
   DECLARE_ACKNOWLEDGER (stem);
 
   DECLARE_TRANSLATOR_LISTENER (part_combine);
+  DECLARE_TRANSLATOR_LISTENER (note);
   void process_music ();
   void stop_translation_timestep ();
+  void create_item (Stream_event *ev);
+
 private:
   Item *text_;
-  Stream_event *event_;
+  Stream_event *new_event_; // Event happened at this moment
+  bool note_found_;
+  // Event possibly from an earlier moment waiting to create a text:
+  Stream_event *waiting_event_;
 };
 
 IMPLEMENT_TRANSLATOR_LISTENER (Part_combine_engraver, part_combine);
 void
 Part_combine_engraver::listen_part_combine (Stream_event *ev)
 {
-  ASSIGN_EVENT_ONCE (event_, ev);
+  ASSIGN_EVENT_ONCE (new_event_, ev);
+  // If two events occur at the same moment, discard the second as the
+  // warning indicates:
+  waiting_event_ = new_event_;
+}
+
+IMPLEMENT_TRANSLATOR_LISTENER (Part_combine_engraver, note);
+void
+Part_combine_engraver::listen_note (Stream_event *)
+{
+  note_found_ = true;
 }
 
 Part_combine_engraver::Part_combine_engraver ()
 {
   text_ = 0;
-  event_ = 0;
+  new_event_ = 0;
+  waiting_event_ = 0;
+  note_found_ = false;
+}
+
+void
+Part_combine_engraver::create_item (Stream_event *ev)
+{
+  SCM what = ev->get_property ("class");
+  SCM text = SCM_EOL;
+  if (what == ly_symbol2scm ("solo-one-event"))
+    text = get_property ("soloText");
+  else if (what == ly_symbol2scm ("solo-two-event"))
+    text = get_property ("soloIIText");
+  else if (what == ly_symbol2scm ("unisono-event"))
+    text = get_property ("aDueText");
+
+  if (Text_interface::is_markup (text))
+    {
+      text_ = make_item ("CombineTextScript", ev->self_scm ());
+      text_->set_property ("text", text);
+    }
 }
 
 void
 Part_combine_engraver::process_music ()
 {
-  if (event_
+  if (waiting_event_
       && to_boolean (get_property ("printPartCombineTexts")))
     {
-      SCM what = event_->get_property ("class");
-      SCM text = SCM_EOL;
-      if (what == ly_symbol2scm ("solo-one-event"))
-	text = get_property ("soloText");
-      else if (what == ly_symbol2scm ("solo-two-event"))
-	text = get_property ("soloIIText");
-      else if (what == ly_symbol2scm ("unisono-event"))
-	text = get_property ("aDueText");
-
-      if (Text_interface::is_markup (text))
-	{
-	  text_ = make_item ("CombineTextScript", event_->self_scm ());
-	  text_->set_property ("text", text);
-	}
+      if (note_found_ || !to_boolean (get_property ("partCombineTextsOnNote")))
+        {
+          create_item (waiting_event_);
+          waiting_event_ = 0;
+        }
     }
 }
 
@@ -95,7 +133,8 @@ void
 Part_combine_engraver::stop_translation_timestep ()
 {
   text_ = 0;
-  event_ = 0;
+  new_event_ = 0;
+  note_found_ = false;
 }
 
 ADD_ACKNOWLEDGER (Part_combine_engraver, note_head);
@@ -110,6 +149,7 @@ ADD_TRANSLATOR (Part_combine_engraver,
 
 		/* read */
 		"printPartCombineTexts "
+		"partCombineTextsOnNote "
 		"soloText "
 		"soloIIText "
 		"aDueText ",