* scm/output-gnome.scm (FIXME-glyph-string): New function. Cannot

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

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 20f629e1b670082a34511c0229d3bf5624b224e9..924f1a6bd1b1d4362dd22b72be273a37ed7b75da 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -8,7 +8,6 @@
 
 #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,13 +49,13 @@ Ottava_spanner_engraver::process_music ()
   SCM ott = get_property ("ottavation");
   if (ott != last_ottavation_)
     {
-      finished_= span_;
+      finished_ = span_;
       span_ = 0;
-      if (ly_c_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"));
@@ -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 */     "",