X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-engraver.cc;h=191fd30b5243603753cd5642ed51d4cdc7cd49be;hb=428909a52eedefe201a8cd89876336f76e29fa28;hp=122f4cd9740642444b42214c19a32c62367c4682;hpb=90c42af182fbd8617ae26ea578faf3a6fc254dc6;p=lilypond.git

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index 122f4cd974..191fd30b52 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -2,16 +2,14 @@
   part-combine-engraver.cc -- implement PC-engraver
 
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
 */
 
 #include "engraver.hh"
-#include "item.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "note-head.hh"
 #include "stem.hh"
 #include "side-position-interface.hh"
@@ -32,7 +30,7 @@ private:
 };
 
 bool
-Part_combine_engraver::try_music (Music*m)
+Part_combine_engraver::try_music (Music *m)
 {
   event_ = m;
   return true;
@@ -41,7 +39,7 @@ Part_combine_engraver::try_music (Music*m)
 Part_combine_engraver::Part_combine_engraver ()
 {
   text_ = 0;
-  event_  =0;
+  event_ = 0;
 }
 
 void
@@ -54,14 +52,14 @@ Part_combine_engraver::process_music ()
       SCM text = SCM_EOL;
       if (what == ly_symbol2scm ("solo1"))
 	text = get_property ("soloText");
-      else if (what== ly_symbol2scm ("solo2"))
+      else if (what == ly_symbol2scm ("solo2"))
 	text = get_property ("soloIIText");
       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", event_->self_scm () );
+	  text_ = make_item ("CombineTextScript", event_->self_scm ());
 	  text_->set_property ("text", text);
 	}
     }
@@ -72,34 +70,35 @@ Part_combine_engraver::acknowledge_grob (Grob_info i)
 {
   if (text_)
     {
-      if (Note_head::has_interface (i.grob_))
+      if (Note_head::has_interface (i.grob ()))
 	{
-	  Grob*t = text_;
-	  Side_position_interface::add_support (t, i.grob_);
+	  Grob *t = text_;
+	  Side_position_interface::add_support (t, i.grob ());
 	  if (Side_position_interface::get_axis (t) == X_AXIS
 	      && !t->get_parent (Y_AXIS))
-	    t->set_parent (i.grob_, Y_AXIS);
+	    t->set_parent (i.grob (), Y_AXIS);
 	}
-      if (Stem::has_interface (i.grob_))
+      if (Stem::has_interface (i.grob ()))
 	{
-	  Side_position_interface::add_support (text_, i.grob_);
+	  Side_position_interface::add_support (text_, i.grob ());
 	}
     }
 }
 
-void 
+void
 Part_combine_engraver::stop_translation_timestep ()
 {
-      text_ = 0;
+  text_ = 0;
   event_ = 0;
 }
 
-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 */       "printPartCombineTexts",
-/* write */       "");
+ADD_TRANSLATOR (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 */ "printPartCombineTexts soloText soloIIText "
+		"aDueText",
+		/* write */ "");