Uniformize, internalize.

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

diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index fd70968f15877d5f76e5d6ef9eb5e4a45034f294..2712a2a150976517628d675afe3a91eb2842abb9 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--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
   
@@ -40,7 +40,7 @@ Part_combine_engraver::try_music (Music*m)
 Part_combine_engraver::Part_combine_engraver ()
 {
   text_ = 0;
-  event_  =0;
+  event_  = 0;
 }
 
 void
@@ -53,7 +53,7 @@ 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");
@@ -93,12 +93,12 @@ Part_combine_engraver::stop_translation_timestep ()
   event_ = 0;
 }
 
-ENTER_DESCRIPTION (Part_combine_engraver,
+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",
+"slur-interface stem-interface note-head-interface",
+/* reads */       "printPartCombineTexts",
 /* write */       "");