X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpart-combine-engraver.cc;h=e6a2ceca65ad242c43cbe214591ae3662fd812f5;hb=8e1bf39ba8b390db542d203b6c301e09f834637d;hp=3196ffa4d09b9c39e9e1048c55eca5202a220c27;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index 3196ffa4d0..e6a2ceca65 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -20,9 +20,9 @@ class Part_combine_engraver : public Engraver
   TRANSLATOR_DECLARATIONS (Part_combine_engraver);
 
 protected:
-  DECLARE_ACKNOWLEDGER(note_head);
-  DECLARE_ACKNOWLEDGER(stem);
-  
+  DECLARE_ACKNOWLEDGER (note_head);
+  DECLARE_ACKNOWLEDGER (stem);
+
   void process_music ();
   void stop_translation_timestep ();
   virtual bool try_music (Music *);
@@ -59,7 +59,7 @@ Part_combine_engraver::process_music ()
       else if (what == ly_symbol2scm ("unisono"))
 	text = get_property ("aDueText");
 
-      if (Text_interface::markup_p (text))
+      if (Text_interface::is_markup (text))
 	{
 	  text_ = make_item ("CombineTextScript", event_->self_scm ());
 	  text_->set_property ("text", text);
@@ -84,7 +84,7 @@ void
 Part_combine_engraver::acknowledge_stem (Grob_info i)
 {
   if (text_)
-      Side_position_interface::add_support (text_, i.grob ());
+    Side_position_interface::add_support (text_, i.grob ());
 }
 
 void
@@ -95,13 +95,13 @@ Part_combine_engraver::stop_translation_timestep ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Part_combine_engraver, note_head);
-ADD_ACKNOWLEDGER(Part_combine_engraver, stem);
+ADD_ACKNOWLEDGER (Part_combine_engraver, note_head);
+ADD_ACKNOWLEDGER (Part_combine_engraver, stem);
 ADD_TRANSLATOR (Part_combine_engraver,
-		/* descr */ "Part combine engraver for orchestral scores:		"
+		/* doc */ "Part combine engraver for orchestral scores:		"
 		"Print markings a2, Solo, Solo II, and unisono ",
-		/* creats*/ "CombineTextScript",
-		/* accepts */ "part-combine-event",
-		/* reads */ "printPartCombineTexts soloText soloIIText "
+		/* create */ "CombineTextScript",
+		/* accept */ "part-combine-event",
+		/* read */ "printPartCombineTexts soloText soloIIText "
 		"aDueText",
 		/* write */ "");