(option_parser): update to 2.7.40

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

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 0ae1f2af560a822e318f5abb6dc4ef00dc2c1378..1219ac65735ad92dd79b3ce76eddc44641d9b6a3 100644 (file)
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -3,13 +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 "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
@@ -53,9 +54,7 @@ void
 Glissando_engraver::process_music ()
 {
   if (event_)
-    {
-      line_ = make_spanner ("Glissando", event_->self_scm ());
-    }
+    line_ = make_spanner ("Glissando", event_->self_scm ());
 }
 
 void
@@ -73,9 +72,7 @@ void
 Glissando_engraver::stop_translation_timestep ()
 {
   if (last_line_ && last_line_->get_bound (RIGHT))
-    {
-      last_line_ = 0;
-    }
+    last_line_ = 0;
   if (line_)
     {
       if (last_line_)
@@ -91,7 +88,7 @@ Glissando_engraver::finalize ()
 {
   if (line_)
     {
-      String msg = _ ("unterminated glissando");
+      string msg = _ ("unterminated glissando");
 
       if (event_)
        event_->origin ()->warning (msg);
@@ -105,7 +102,7 @@ Glissando_engraver::finalize ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER (Glissando_engraver,rhythmic_head);
+ADD_ACKNOWLEDGER (Glissando_engraver, rhythmic_head);
 ADD_TRANSLATOR (Glissando_engraver,
                /* doc */ "Engrave a glissandi",
                /* create */ "Glissando",