Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 110acce0a0926a7fb7deab87fc10136cb5034d39..d5212ded7fbd43f657f9f361253c0baf890002f5 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -3,12 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "engraver.hh"
+
+#include "international.hh"
 #include "note-column.hh"
 #include "side-position-interface.hh"
-#include "engraver.hh"
 
 class Text_spanner_engraver : public Engraver
 {
@@ -16,10 +18,10 @@ public:
   TRANSLATOR_DECLARATIONS (Text_spanner_engraver);
 protected:
   virtual void finalize ();
-  DECLARE_ACKNOWLEDGER(note_column);
+  DECLARE_ACKNOWLEDGER (note_column);
   virtual bool try_music (Music *);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
   Spanner *span_;
@@ -57,9 +59,7 @@ Text_spanner_engraver::process_music ()
   if (event_drul_[STOP])
     {
       if (!span_)
-       {
-         event_drul_[STOP]->origin ()->warning (_ ("can't find start of text spanner"));
-       }
+       event_drul_[STOP]->origin ()->warning (_ ("can't find start of text spanner"));
       else
        {
          finished_ = span_;
@@ -71,9 +71,7 @@ Text_spanner_engraver::process_music ()
   if (event_drul_[START])
     {
       if (current_event_)
-       {
-         event_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
-       }
+       event_drul_[START]->origin ()->warning (_ ("already have a text spanner"));
       else
        {
          current_event_ = event_drul_[START];
@@ -140,11 +138,10 @@ Text_spanner_engraver::finalize ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER(Text_spanner_engraver,note_column);
+ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 ADD_TRANSLATOR (Text_spanner_engraver,
-               /* descr */ "Create text spanner from a Music.",
-               /* creats*/ "TextSpanner",
-               /* accepts */ "text-span-event",
-               /* acks  */ "",
-               /* reads */ "",
+               /* doc */ "Create text spanner from a Music.",
+               /* create */ "TextSpanner",
+               /* accept */ "text-span-event",
+               /* read */ "",
                /* write */ "");