Run grand replace for 2015.

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

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index c18bf098f2e03855dbfa4096b9d29331805abd96..8b0e72265d41bdd401fd31606fdb7c0556e05a3c 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -69,28 +69,28 @@ Text_spanner_engraver::process_music ()
   if (event_drul_[STOP])
     {
       if (!span_)
-       event_drul_[STOP]->origin ()->warning (_ ("cannot find start of text spanner"));
+        event_drul_[STOP]->origin ()->warning (_ ("cannot find start of text spanner"));
       else
-       {
-         finished_ = span_;
-         announce_end_grob (finished_, SCM_EOL);
-         span_ = 0;
-         current_event_ = 0;
-       }
+        {
+          finished_ = span_;
+          announce_end_grob (finished_, SCM_EOL);
+          span_ = 0;
+          current_event_ = 0;
+        }
     }
 
   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];
-         span_ = make_spanner ("TextSpanner", event_drul_[START]->self_scm ());
+        {
+          current_event_ = event_drul_[START];
+          span_ = make_spanner ("TextSpanner", event_drul_[START]->self_scm ());
 
-         Side_position_interface::set_axis (span_, Y_AXIS);
-         event_drul_[START] = 0;
-       }
+          Side_position_interface::set_axis (span_, Y_AXIS);
+          event_drul_[START] = 0;
+        }
     }
 }
 
@@ -100,10 +100,10 @@ Text_spanner_engraver::typeset_all ()
   if (finished_)
     {
       if (!finished_->get_bound (RIGHT))
-       {
-         Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
-         finished_->set_bound (RIGHT, e);
-       }
+        {
+          Grob *e = Grob::unsmob (get_property ("currentMusicalColumn"));
+          finished_->set_bound (RIGHT, e);
+        }
       finished_ = 0;
     }
 }
@@ -113,7 +113,7 @@ Text_spanner_engraver::stop_translation_timestep ()
 {
   if (span_ && !span_->get_bound (LEFT))
     {
-      Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+      Grob *e = Grob::unsmob (get_property ("currentMusicalColumn"));
       span_->set_bound (LEFT, e);
     }
 
@@ -139,33 +139,33 @@ Text_spanner_engraver::acknowledge_note_column (Grob_info info)
   if (span_)
     {
       Pointer_group_interface::add_grob (span_,
-                                        ly_symbol2scm ("note-columns"),
-                                        info.grob ());
+                                         ly_symbol2scm ("note-columns"),
+                                         info.grob ());
       if (!span_->get_bound (LEFT))
-       add_bound_item (span_, info.grob ());
+        add_bound_item (span_, info.grob ());
     }
   else if (finished_)
     {
       Pointer_group_interface::add_grob (finished_,
-                                        ly_symbol2scm ("note-columns"),
-                                        info.grob ());
+                                         ly_symbol2scm ("note-columns"),
+                                         info.grob ());
       if (!finished_->get_bound (RIGHT))
-       add_bound_item (finished_, info.grob ());
+        add_bound_item (finished_, info.grob ());
     }
 }
 
 ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 
 ADD_TRANSLATOR (Text_spanner_engraver,
-               /* doc */
-               "Create text spanner from an event.",
+                /* doc */
+                "Create text spanner from an event.",
 
-               /* create */
-               "TextSpanner ",
+                /* create */
+                "TextSpanner ",
 
-               /* read */
-               "currentMusicalColumn ",
+                /* read */
+                "currentMusicalColumn ",
 
-               /* write */
-               ""
-               );
+                /* write */
+                ""
+               );