X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-engraver.cc;h=cebee4ed9e67ed6895be1b4d1edbdec9e5ba42e8;hb=cc29cb407317df1e50ab28449b4c0ba7c24a579e;hp=b6f091442ea329706dcd25dfe2ebb391b4b464f0;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index b6f091442e..cebee4ed9e 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -1,11 +1,22 @@
 /*
-  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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2010 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"
@@ -15,6 +26,7 @@
 #include "stem.hh"
 #include "stream-event.hh"
 #include "text-interface.hh"
+#include "item.hh"
 
 #include "translator.icc"
 
@@ -38,7 +50,7 @@ IMPLEMENT_TRANSLATOR_LISTENER (Part_combine_engraver, part_combine);
 void
 Part_combine_engraver::listen_part_combine (Stream_event *ev)
 {
-  event_ = ev;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 Part_combine_engraver::Part_combine_engraver ()
@@ -55,9 +67,9 @@ Part_combine_engraver::process_music ()
     {
       SCM what = event_->get_property ("class");
       SCM text = SCM_EOL;
-      if (what == ly_symbol2scm ("solo1-event"))
+      if (what == ly_symbol2scm ("solo-one-event"))
 	text = get_property ("soloText");
-      else if (what == ly_symbol2scm ("solo2-event"))
+      else if (what == ly_symbol2scm ("solo-two-event"))
 	text = get_property ("soloIIText");
       else if (what == ly_symbol2scm ("unisono-event"))
 	text = get_property ("aDueText");
@@ -100,10 +112,19 @@ Part_combine_engraver::stop_translation_timestep ()
 ADD_ACKNOWLEDGER (Part_combine_engraver, note_head);
 ADD_ACKNOWLEDGER (Part_combine_engraver, stem);
 ADD_TRANSLATOR (Part_combine_engraver,
-		/* doc */ "Part combine engraver for orchestral scores:		"
-		"Print markings a2, Solo, Solo II, and unisono ",
-		/* create */ "CombineTextScript",
-		/* accept */ "part-combine-event",
-		/* read */ "printPartCombineTexts soloText soloIIText "
-		"aDueText",
-		/* write */ "");
+		/* doc */
+		"Part combine engraver for orchestral scores: Print markings"
+		" @q{a2}, @q{Solo}, @q{Solo II}, and @q{unisono}.",
+
+		/* create */
+		"CombineTextScript ",
+
+		/* read */
+		"printPartCombineTexts "
+		"soloText "
+		"soloIIText "
+		"aDueText ",
+
+		/* write */
+		""
+		);