X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=e7778a8d4c814bd2fdbedd0d3b23c471c3ab3e79;hb=c730a0aab8ce3fd1785b5815122e061534e53d1c;hp=b18cf8e54e36f9b6b9782d71a033714a5a473fe3;hpb=5909b455a9173f6117086835c5e5a282f8fd31f8;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index b18cf8e54e..e7778a8d4c 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2003 Han-Wen Nienhuys
+  (c) 2000--2004 Han-Wen Nienhuys
 */
 
 #include "protected-scm.hh"
@@ -15,21 +15,27 @@
 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 ()
 {
@@ -46,16 +52,16 @@ Ottava_spanner_engraver::process_music ()
     {
       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_int2num (DOWN));
 	}
     }
   last_ottavation_ = ott;
@@ -91,7 +97,6 @@ Ottava_spanner_engraver::typeset_all ()
 	}
       while (flip (&d) != LEFT);
       
-      typeset_grob (finished_);
       finished_ = 0;
     }
 }
@@ -114,11 +119,11 @@ Ottava_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     finished_ = span_;
-  typeset_all();
+  typeset_all ();
   last_ottavation_ = SCM_EOL;
 }
 
-ENTER_DESCRIPTION(Ottava_spanner_engraver,
+ENTER_DESCRIPTION (Ottava_spanner_engraver,
 /* descr */       "Create a text spanner when the ottavation property changes..",
 /* creats*/       "OttavaBracket",
 /* accepts */     "",