X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=cfb88a2c3a69083c7966b68f077fde7f3303ef96;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e849a1d3f011ed883139a40df79f46ab4320ba56;hpb=aab300b4e582627497ab12f8ea8609f03a3c8d84;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index e849a1d3f0..cfb88a2c3a 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,41 +1,51 @@
 /*
-  text-spanner-engraver.cc -- implement Ottava_spanner_engraver
+  ottava-engraver.cc -- implement Ottava_spanner_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2003 Han-Wen Nienhuys
-  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2008 Han-Wen Nienhuys
 */
 
 #include "protected-scm.hh"
 #include "note-column.hh"
-#include "item.hh"
 #include "side-position-interface.hh"
 #include "engraver.hh"
+#include "spanner.hh"
+#include "text-interface.hh"
+#include "item.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_;
-  
-  Protected_scm last_ottavation_;
-  
+
+  SCM last_ottavation_;
+
   void typeset_all ();
 };
 
+void
+Ottava_spanner_engraver::derived_mark () const
+{
+  scm_gc_mark (last_ottavation_);
+}
 
 Ottava_spanner_engraver::Ottava_spanner_engraver ()
 {
   finished_ = 0;
-  span_ =0;
+  span_ = 0;
+  last_ottavation_ = SCM_EOL;
 }
 
 void
@@ -44,26 +54,29 @@ Ottava_spanner_engraver::process_music ()
   SCM ott = get_property ("ottavation");
   if (ott != last_ottavation_)
     {
-      finished_= span_;
+      finished_ = span_;
       span_ = 0;
-      if (gh_string_p (ott))
+      if (Text_interface::is_markup (ott))
 	{
-	  span_  = new Spanner (get_property ("OttavaSpanner"));
-	  span_->set_grob_property ("edge-text", gh_cons (ott, SCM_EOL));
-	  announce_grob (span_, SCM_EOL);
+	  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;
 }
 
 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);
+
       if (!span_->get_bound (LEFT))
 	span_->set_bound (LEFT, it);
       span_->set_bound (RIGHT, it);
@@ -72,23 +85,20 @@ Ottava_spanner_engraver::acknowledge_grob (Grob_info info)
 
 void
 Ottava_spanner_engraver::typeset_all ()
-{  
+{
   if (finished_)
     {
-      Side_position_interface::add_staff_support (finished_);
-
       Direction d = LEFT;
       do
 	{
 	  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);
-      
-      typeset_grob (finished_);
+
       finished_ = 0;
     }
 }
@@ -98,7 +108,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);
     }
 
@@ -111,13 +121,26 @@ Ottava_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     finished_ = span_;
-  typeset_all();
+  typeset_all ();
+  last_ottavation_ = SCM_EOL;
 }
 
-ENTER_DESCRIPTION(Ottava_spanner_engraver,
-/* descr */       "Create a text spanner when the ottavation property changes..",
-/* creats*/       "OttavaSpanner",
-/* 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 */
+		"ottavation "
+		"originalMiddleCPosition "
+		"currentMusicalColumn ",
+		
+		/* write */
+		""
+		);