Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 4bb180ef167e3da13f9cf0b80e203998760fbb6e..f5b0527bd170350bc634cb14a51d5bd64828636c 100644 (file)
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -6,10 +6,11 @@
   (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "warn.hh"
-#include "spanner.hh"
-#include "rhythmic-head.hh"
 #include "engraver.hh"
+#include "international.hh"
+#include "rhythmic-head.hh"
+#include "spanner.hh"
+#include "warn.hh"
 
 /**
    Create line-spanner grobs for glissandi lines that connect note
@@ -23,8 +24,9 @@ public:
 protected:
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   virtual void finalize ();
-  void stop_translation_timestep ();
   virtual bool try_music (Music *);
+
+  void stop_translation_timestep ();
   void process_music ();
 private:
   Spanner *line_;
@@ -87,7 +89,7 @@ Glissando_engraver::finalize ()
 {
   if (line_)
     {
-      String msg = _ ("unterminated glissando");
+      string msg = _ ("unterminated glissando");
 
       if (event_)
        event_->origin ()->warning (msg);