*** 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 1952395857d3bffe7baacfa37b04b1f22ec7bf8f..f0a340c363f3d70c7a72edfbcc0115cecad832fd 100644 (file)
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
   
@@ -19,7 +19,7 @@
 
 class Part_combine_engraver : public Engraver
 {
-  TRANSLATOR_DECLARATIONS(Part_combine_engraver);
+  TRANSLATOR_DECLARATIONS (Part_combine_engraver);
 
 protected:
   virtual void acknowledge_grob (Grob_info);
@@ -48,9 +48,9 @@ void
 Part_combine_engraver::process_music ()
 {
   if (event_
-      && to_boolean (get_property ("soloADue")))
+      && to_boolean (get_property ("printPartCombineTexts")))
     {
-      SCM what = event_->get_mus_property ("part-combine-status");
+      SCM what = event_->get_property ("part-combine-status");
       SCM text = SCM_EOL;
       if (what == ly_symbol2scm ("solo1"))
        text = get_property ("soloText");
@@ -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_->set_grob_property ("text", text);
-         announce_grob (text_, event_->self_scm ());
+         text_ =  make_item ("CombineTextScript", event_->self_scm () );
+         text_->set_property ("text", text);
        }
     }
 }
@@ -91,20 +90,16 @@ Part_combine_engraver::acknowledge_grob (Grob_info i)
 void 
 Part_combine_engraver::stop_translation_timestep ()
 {
-  if (text_)
-    {
-      typeset_grob (text_);
       text_ = 0;
-    }
   event_ = 0;
 }
 
-ENTER_DESCRIPTION(Part_combine_engraver,
+ENTER_DESCRIPTION (Part_combine_engraver,
 /* descr */       "Part combine engraver for orchestral scores:                "
                  "Print markings a2, Solo, Solo II, and unisono ",
 /* creats*/       "CombineTextScript",
 /* accepts */     "part-combine-event",
 /* acks  */       "multi-measure-rest-interface "
 "slur-interface stem-interface note-head-interface"
-,/* reads */       "soloADue",
+,/* reads */       "printPartCombineTexts",
 /* write */       "");