Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / part-combine-engraver.cc

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index b6f091442ea329706dcd25dfe2ebb391b4b464f0..121ad3fbd27f6405ce179874177ab800e499f771 100644 (file)
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -15,6 +15,7 @@
 #include "stem.hh"
 #include "stream-event.hh"
 #include "text-interface.hh"
+#include "item.hh"
 
 #include "translator.icc"
 
@@ -38,7 +39,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 +56,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");
@@ -103,7 +104,6 @@ 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 */ "");