X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=924f1a6bd1b1d4362dd22b72be273a37ed7b75da;hb=f817c9010f8016d5e9c19ec3b167e7d485538eb3;hp=e849a1d3f011ed883139a40df79f46ab4320ba56;hpb=aab300b4e582627497ab12f8ea8609f03a3c8d84;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index e849a1d3f0..924f1a6bd1 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -3,39 +3,44 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2003 Han-Wen Nienhuys
-  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 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;
 }
 
 void
@@ -44,16 +49,20 @@ 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_  = new Spanner (get_property ("OttavaSpanner"));
-	  span_->set_grob_property ("edge-text", gh_cons (ott, SCM_EOL));
-	  announce_grob (span_, SCM_EOL);
+	  span_  = make_spanner ("OttavaBracket", SCM_EOL);
+	  span_->set_property ("text", ott);
+	  
+
+	  SCM c0 (get_property ("middleCPosition"));
+	  SCM oc0 (get_property ("originalCentralCPosition"));
+	  if (scm_less_p (oc0, c0) == SCM_BOOL_T)
+	    span_->set_property ("direction", scm_int2num (DOWN));
 	}
     }
-
   last_ottavation_ = ott;
 }
 
@@ -64,6 +73,7 @@ Ottava_spanner_engraver::acknowledge_grob (Grob_info info)
   if (span_ && it && Note_column::has_interface (info.grob_))
     {
       Side_position_interface::add_support (span_, it);
+
       if (!span_->get_bound (LEFT))
 	span_->set_bound (LEFT, it);
       span_->set_bound (RIGHT, it);
@@ -75,8 +85,6 @@ Ottava_spanner_engraver::typeset_all ()
 {  
   if (finished_)
     {
-      Side_position_interface::add_staff_support (finished_);
-
       Direction d = LEFT;
       do
 	{
@@ -88,7 +96,6 @@ Ottava_spanner_engraver::typeset_all ()
 	}
       while (flip (&d) != LEFT);
       
-      typeset_grob (finished_);
       finished_ = 0;
     }
 }
@@ -111,12 +118,13 @@ 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*/       "OttavaSpanner",
+/* creats*/       "OttavaBracket",
 /* accepts */     "",
 /* acks  */      "note-column-interface",
 /* reads */       "ottavation",