X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=9862dab7263814a8b77912f1600f76425190d463;hb=ca3b8c69a4a3d6bf69fcf7e36b32e0175bb7ff18;hp=e7778a8d4c814bd2fdbedd0d3b23c471c3ab3e79;hpb=ca4a47ffd343a3672c0e13b801eeb2647866ce98;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index e7778a8d4c..9862dab726 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,46 +1,62 @@
 /*
-  text-spanner-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--2010 Han-Wen Nienhuys
 
-  (c) 2000--2004 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 "note-column.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 "text-interface.hh"
+
 
 class Ottava_spanner_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS (Ottava_spanner_engraver);  
+  TRANSLATOR_DECLARATIONS (Ottava_spanner_engraver);
 protected:
   virtual void finalize ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
-  virtual void stop_translation_timestep ();
+
+  DECLARE_ACKNOWLEDGER (note_column);
+
+  void process_music ();
+  void stop_translation_timestep ();
   virtual void derived_mark () const;
 private:
   Spanner *span_;
   Spanner *finished_;
-  
+
   SCM last_ottavation_;
-  
+
   void typeset_all ();
 };
 
 void
 Ottava_spanner_engraver::derived_mark () const
 {
-  scm_gc_mark (last_ottavation_ );
+  scm_gc_mark (last_ottavation_);
 }
 
 Ottava_spanner_engraver::Ottava_spanner_engraver ()
 {
   finished_ = 0;
-  span_ =0;
+  span_ = 0;
   last_ottavation_ = SCM_EOL;
 }
 
@@ -50,28 +66,26 @@ Ottava_spanner_engraver::process_music ()
   SCM ott = get_property ("ottavation");
   if (ott != last_ottavation_)
     {
-      finished_= span_;
+      finished_ = span_;
       span_ = 0;
-      if (scm_is_string (ott))
+      if (Text_interface::is_markup (ott))
 	{
-	  span_  = make_spanner ("OttavaBracket", SCM_EOL);
+	  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_int2num (DOWN));
+	  SCM offset (get_property ("middleCOffset"));
+	  if (robust_scm2double (offset, 0) > 0)
+	    span_->set_property ("direction", scm_from_int (DOWN));
 	}
     }
   last_ottavation_ = ott;
 }
 
 void
-Ottava_spanner_engraver::acknowledge_grob (Grob_info info)
+Ottava_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
-  Item *it = dynamic_cast<Item*> (info.grob_);
-  if (span_ && it && Note_column::has_interface (info.grob_))
+  Item *it = info.item ();
+  if (span_ && it)
     {
       Side_position_interface::add_support (span_, it);
 
@@ -83,7 +97,7 @@ Ottava_spanner_engraver::acknowledge_grob (Grob_info info)
 
 void
 Ottava_spanner_engraver::typeset_all ()
-{  
+{
   if (finished_)
     {
       Direction d = LEFT;
@@ -91,12 +105,12 @@ Ottava_spanner_engraver::typeset_all ()
 	{
 	  if (!finished_->get_bound (RIGHT))
 	    {
-	      Grob* e = unsmob_grob (get_property ("currentMusicalColumn"));
+	      Grob *e = unsmob_grob (get_property ("currentMusicalColumn"));
 	      finished_->set_bound (d, e);
 	    }
 	}
       while (flip (&d) != LEFT);
-      
+
       finished_ = 0;
     }
 }
@@ -106,7 +120,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);
     }
 
@@ -123,10 +137,22 @@ Ottava_spanner_engraver::finalize ()
   last_ottavation_ = SCM_EOL;
 }
 
-ENTER_DESCRIPTION (Ottava_spanner_engraver,
-/* descr */       "Create a text spanner when the ottavation property changes..",
-/* creats*/       "OttavaBracket",
-/* accepts */     "",
-/* acks  */      "note-column-interface",
-/* reads */       "ottavation",
-/* write */       "");
+#include "translator.icc"
+
+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 */
+		"middleCOffset "
+		"ottavation "
+		"currentMusicalColumn ",
+		
+		/* write */
+		""
+		);