X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=f4da2e415312ecd155b471833696f213f9a337e8;hb=f4c0b9541aceba91c49b08207e7fa9a1adb0d2c7;hp=99fbe7e3c6ed26b391faf3f392fca27f4328f26a;hpb=1d1f85702652995fe2531ed26a2db8756fb3b4ee;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 99fbe7e3c6..f4da2e4153 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -3,38 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Han-Wen Nienhuys
+  (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 ();
+  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;
 }
 
@@ -44,13 +49,12 @@ 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))
 	{
-	  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"));
@@ -64,8 +68,8 @@ Ottava_spanner_engraver::process_music ()
 void
 Ottava_spanner_engraver::acknowledge_grob (Grob_info info)
 {
-  Item *it = dynamic_cast<Item*> (info.grob_);
-  if (span_ && it && Note_column::has_interface (info.grob_))
+  Item *it = dynamic_cast<Item *> (info.grob ());
+  if (span_ && it && Note_column::has_interface (info.grob ()))
     {
       Side_position_interface::add_support (span_, it);
 
@@ -77,7 +81,7 @@ Ottava_spanner_engraver::acknowledge_grob (Grob_info info)
 
 void
 Ottava_spanner_engraver::typeset_all ()
-{  
+{
   if (finished_)
     {
       Direction d = LEFT;
@@ -85,12 +89,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;
     }
 }
@@ -100,7 +104,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);
     }
 
@@ -117,10 +121,10 @@ 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 */       "");
+ADD_TRANSLATOR (Ottava_spanner_engraver,
+		/* descr */ "Create a text spanner when the ottavation property changes..",
+		/* creats*/ "OttavaBracket",
+		/* accepts */ "",
+		/* acks  */ "note-column-interface",
+		/* reads */ "ottavation",
+		/* write */ "");