X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=a987b147e59d087a0be43195d4d600ee0c9ed6dd;hb=ca20eaa74e7e762c0611de26cc2267909ae27e02;hp=cd207cc872da052aeca3c8553c441a0a4cb83766;hpb=37ec023ff30dca4f6850331fbd526940f8570939;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index cd207cc872..a987b147e5 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -3,12 +3,11 @@
 
   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"
 
@@ -21,20 +20,26 @@ protected:
   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,18 +49,18 @@ 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_  = make_spanner ("OttavaBracket");
+	  span_  = make_spanner ("OttavaBracket", SCM_EOL);
 	  span_->set_property ("text", ott);
-	  announce_grob (span_, SCM_EOL);
+	  
 
 	  SCM c0 (get_property ("middleCPosition"));
 	  SCM oc0 (get_property ("originalCentralCPosition"));
 	  if (scm_less_p (oc0, c0) == SCM_BOOL_T)
-	    span_->set_property ("direction", gh_int2scm (DOWN));
+	    span_->set_property ("direction", scm_int2num (DOWN));
 	}
     }
   last_ottavation_ = ott;
@@ -91,7 +96,6 @@ Ottava_spanner_engraver::typeset_all ()
 	}
       while (flip (&d) != LEFT);
       
-      typeset_grob (finished_);
       finished_ = 0;
     }
 }
@@ -118,7 +122,7 @@ Ottava_spanner_engraver::finalize ()
   last_ottavation_ = SCM_EOL;
 }
 
-ENTER_DESCRIPTION (Ottava_spanner_engraver,
+ADD_TRANSLATOR (Ottava_spanner_engraver,
 /* descr */       "Create a text spanner when the ottavation property changes..",
 /* creats*/       "OttavaBracket",
 /* accepts */     "",