X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=4582335d0ef976b9343d057d6087f7feaf4c71c4;hb=ec09bc9bd0802b6f55ae19b6dae4bd5d4b997365;hp=042cf9e5ed8cae2cc37349fe5fb26e0805da045a;hpb=b5ae9c51455439f4fda0879196529ef341858395;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 042cf9e5ed..4582335d0e 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -3,39 +3,45 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2003 Han-Wen Nienhuys
-  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2005 Han-Wen Nienhuys
 */
 
 #include "protected-scm.hh"
 #include "note-column.hh"
-#include "item.hh"
 #include "side-position-interface.hh"
 #include "engraver.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;
 }
 
@@ -45,28 +51,27 @@ 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 (scm_is_string (ott))
 	{
-	  span_  = new Spanner (get_property ("OttavaBracket"));
-	  span_->set_grob_property ("text", ott);
-	  announce_grob (span_, SCM_EOL);
+	  span_ = make_spanner ("OttavaBracket", SCM_EOL);
+	  span_->set_property ("text", ott);
 
-	  SCM c0 (get_property ("centralCPosition"));
+	  SCM c0 (get_property ("middleCPosition"));
 	  SCM oc0 (get_property ("originalCentralCPosition"));
 	  if (scm_less_p (oc0, c0) == SCM_BOOL_T)
-	    span_->set_grob_property ("direction", gh_int2scm (DOWN));
+	    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);
 
@@ -78,7 +83,7 @@ Ottava_spanner_engraver::acknowledge_grob (Grob_info info)
 
 void
 Ottava_spanner_engraver::typeset_all ()
-{  
+{
   if (finished_)
     {
       Direction d = LEFT;
@@ -86,13 +91,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);
-      
-      typeset_grob (finished_);
+
       finished_ = 0;
     }
 }
@@ -102,7 +106,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);
     }
 
@@ -115,14 +119,15 @@ 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*/       "OttavaBracket",
-/* accepts */     "",
-/* acks  */      "note-column-interface",
-/* reads */       "ottavation",
-/* write */       "");
+#include "translator.icc"
+ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column);
+ADD_TRANSLATOR (Ottava_spanner_engraver,
+		/* descr */ "Create a text spanner when the ottavation property changes..",
+		/* creats*/ "OttavaBracket",
+		/* accepts */ "",
+		/* reads */ "ottavation",
+		/* write */ "");