*** empty log message ***

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

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index a941876ef3f798aceacea6a3f2e2e8716ca63131..f0a340c363f3d70c7a72edfbcc0115cecad832fd 100644 (file)
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -48,7 +48,7 @@ void
 Part_combine_engraver::process_music ()
 {
   if (event_
-      && to_boolean (get_property ("soloADue")))
+      && to_boolean (get_property ("printPartCombineTexts")))
     {
       SCM what = event_->get_property ("part-combine-status");
       SCM text = SCM_EOL;
@@ -59,11 +59,10 @@ Part_combine_engraver::process_music ()
       else if (what == ly_symbol2scm ("unisono"))
        text = get_property ("aDueText");
 
-      if (Text_item::markup_p (text))
+      if (Text_interface::markup_p (text))
        {
-         text_ =  make_item ("CombineTextScript");
+         text_ =  make_item ("CombineTextScript", event_->self_scm () );
          text_->set_property ("text", text);
-         announce_grob (text_, event_->self_scm ());
        }
     }
 }
@@ -91,11 +90,7 @@ Part_combine_engraver::acknowledge_grob (Grob_info i)
 void 
 Part_combine_engraver::stop_translation_timestep ()
 {
-  if (text_)
-    {
-      typeset_grob (text_);
       text_ = 0;
-    }
   event_ = 0;
 }
 
@@ -106,5 +101,5 @@ ENTER_DESCRIPTION (Part_combine_engraver,
 /* accepts */     "part-combine-event",
 /* acks  */       "multi-measure-rest-interface "
 "slur-interface stem-interface note-head-interface"
-,/* reads */       "soloADue",
+,/* reads */       "printPartCombineTexts",
 /* write */       "");