Run grand replace for 2015.

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

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index c1afcfed3c7dee3588a244a62e469530e05da739..a2562b785a1151b90adb4a68e7de4356e68a0a6b 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,17 +1,29 @@
 /*
-  ottova-engraver.cc -- implement Ottava_spanner_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2015 Han-Wen Nienhuys
 
-  (c) 2000--2007 Han-Wen Nienhuys
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "protected-scm.hh"
+#include "engraver.hh"
+#include "item.hh"
 #include "note-column.hh"
+#include "protected-scm.hh"
 #include "side-position-interface.hh"
-#include "engraver.hh"
 #include "spanner.hh"
-#include "item.hh"
+#include "text-interface.hh"
 
 class Ottava_spanner_engraver : public Engraver
 {
@@ -55,16 +67,15 @@ Ottava_spanner_engraver::process_music ()
     {
       finished_ = span_;
       span_ = 0;
-      if (scm_is_string (ott))
-       {
-         span_ = make_spanner ("OttavaBracket", SCM_EOL);
-         span_->set_property ("text", ott);
-
-         SCM c0 (get_property ("middleCPosition"));
-         SCM oc0 (get_property ("originalMiddleCPosition"));
-         if (scm_less_p (oc0, c0) == SCM_BOOL_T)
-           span_->set_property ("direction", scm_from_int (DOWN));
-       }
+      if (Text_interface::is_markup (ott))
+        {
+          span_ = make_spanner ("OttavaBracket", SCM_EOL);
+          span_->set_property ("text", ott);
+
+          SCM offset (get_property ("middleCOffset"));
+          if (robust_scm2double (offset, 0) > 0)
+            span_->set_property ("direction", scm_from_int (DOWN));
+        }
     }
   last_ottavation_ = ott;
 }
@@ -78,7 +89,7 @@ Ottava_spanner_engraver::acknowledge_note_column (Grob_info info)
       Side_position_interface::add_support (span_, it);
 
       if (!span_->get_bound (LEFT))
-       span_->set_bound (LEFT, it);
+        span_->set_bound (LEFT, it);
       span_->set_bound (RIGHT, it);
     }
 }
@@ -88,16 +99,14 @@ Ottava_spanner_engraver::typeset_all ()
 {
   if (finished_)
     {
-      Direction d = LEFT;
-      do
-       {
-         if (!finished_->get_bound (RIGHT))
-           {
-             Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
-             finished_->set_bound (d, e);
-           }
-       }
-      while (flip (&d) != LEFT);
+      for (LEFT_and_RIGHT (d))
+        {
+          if (!finished_->get_bound (RIGHT))
+            {
+              Grob *e = Grob::unsmob (get_property ("currentMusicalColumn"));
+              finished_->set_bound (d, e);
+            }
+        }
 
       finished_ = 0;
     }
@@ -108,7 +117,7 @@ Ottava_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);
     }
 
@@ -130,12 +139,17 @@ Ottava_spanner_engraver::finalize ()
 ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column);
 
 ADD_TRANSLATOR (Ottava_spanner_engraver,
-               /* doc */ "Create a text spanner when the ottavation property changes..",
-               /* create */ "OttavaBracket",
-               /* read */ "ottavation "
-               "originalMiddleCPosition "
-               "currentMusicalColumn "
-               
-               ,
-               
-               /* write */ "");
+                /* doc */
+                "Create a text spanner when the ottavation property changes.",
+
+                /* create */
+                "OttavaBracket ",
+
+                /* read */
+                "middleCOffset "
+                "ottavation "
+                "currentMusicalColumn ",
+
+                /* write */
+                ""
+               );