(transform_heads): replace

[lilypond.git] / lily / ottava-engraver.cc

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 0cf14c160aded688b1d0643bf78b7e7909a9b479..924f1a6bd1b1d4362dd22b72be273a37ed7b75da 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -8,33 +8,38 @@
 
 #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,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 ("centralCPosition"));
+         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;
     }
 }
@@ -114,11 +118,11 @@ Ottava_spanner_engraver::finalize ()
   typeset_all ();
   if (span_)
     finished_ = span_;
-  typeset_all();
+  typeset_all ();
   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 */     "",