(AncientRemoveEmptyStaffContext): switch on

[lilypond.git] / lily / text-engraver.cc

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 72a81264525c74262c686ff8ff2d20a56eb10813..4787661847d5831eb62fcd24464616521be9a7ab 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -24,11 +24,11 @@ public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
   virtual bool try_music (Music *m);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_acknowledged ();
+  void stop_translation_timestep ();
+  void process_acknowledged ();
 
-  DECLARE_ACKNOWLEDGER(stem);
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
 };
 
 bool
@@ -66,9 +66,7 @@ void
 Text_engraver::acknowledge_stem (Grob_info inf)
 {
   for (int i = 0; i < texts_.size (); i++)
-    {
-      Side_position_interface::add_support (texts_[i], inf.grob ());
-    }
+    Side_position_interface::add_support (texts_[i], inf.grob ());
 }
 
 void
@@ -95,7 +93,7 @@ Text_engraver::process_acknowledged ()
       /* see script-engraver.cc */
       priority += i;
 
-      text->set_property ("script-priority", scm_int2num (priority));
+      text->set_property ("script-priority", scm_from_int (priority));
 
       Direction dir = to_dir (r->get_property ("direction"));
       if (dir)
@@ -121,11 +119,11 @@ Text_engraver::Text_engraver ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Text_engraver, stem);
-ADD_ACKNOWLEDGER(Text_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Text_engraver, stem);
+ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head);
 ADD_TRANSLATOR (Text_engraver,
-               /* descr */ "Create text-scripts",
-               /* creats*/ "TextScript",
-               /* accepts */ "text-script-event",
-               /* reads */ "",
+               /* doc */ "Create text-scripts",
+               /* create */ "TextScript",
+               /* accept */ "text-script-event",
+               /* read */ "",
                /* write */ "");