X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=e9bcbe94d5ffdb3f53bd5b9da14a749e7f067dbb;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=4dc46d96739f7aca6cd2e05531a2112e679feecc;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 4dc46d9673..e9bcbe94d5 100644
--- 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
 {
@@ -20,7 +32,7 @@ public:
 protected:
   virtual void finalize ();
 
-  DECLARE_ACKNOWLEDGER (note_column);
+  void acknowledge_note_column (Grob_info);
 
   void process_music ();
   void stop_translation_timestep ();
@@ -40,7 +52,8 @@ Ottava_spanner_engraver::derived_mark () const
   scm_gc_mark (last_ottavation_);
 }
 
-Ottava_spanner_engraver::Ottava_spanner_engraver ()
+Ottava_spanner_engraver::Ottava_spanner_engraver (Context *c)
+  : Engraver (c)
 {
   finished_ = 0;
   span_ = 0;
@@ -51,20 +64,19 @@ void
 Ottava_spanner_engraver::process_music ()
 {
   SCM ott = get_property ("ottavation");
-  if (ott != last_ottavation_)
+  if (!scm_is_eq (ott, last_ottavation_))
     {
       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 ("originalCentralCPosition"));
-	  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 +90,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 +100,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 = unsmob<Grob> (get_property ("currentMusicalColumn"));
+              finished_->set_bound (d, e);
+            }
+        }
 
       finished_ = 0;
     }
@@ -108,7 +118,7 @@ Ottava_spanner_engraver::stop_translation_timestep ()
 {
   if (span_ && !span_->get_bound (LEFT))
     {
-      Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
+      Grob *e = unsmob<Grob> (get_property ("currentMusicalColumn"));
       span_->set_bound (LEFT, e);
     }
 
@@ -127,10 +137,25 @@ Ottava_spanner_engraver::finalize ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column);
+
+void
+Ottava_spanner_engraver::boot ()
+{
+  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",
-		/* write */ "");
+                /* doc */
+                "Create a text spanner when the ottavation property changes.",
+
+                /* create */
+                "OttavaBracket ",
+
+                /* read */
+                "middleCOffset "
+                "ottavation "
+                "currentMusicalColumn ",
+
+                /* write */
+                ""
+               );