Merge with master

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

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 6bec8a6c394e77f1c106f6afe0055818a0cfc523..c1afcfed3c7dee3588a244a62e469530e05da739 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,15 +1,17 @@
 /*
-  text-spanner-engraver.cc -- implement Ottava_spanner_engraver
+  ottova-engraver.cc -- implement Ottava_spanner_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys
+  (c) 2000--2007 Han-Wen Nienhuys
 */
 
 #include "protected-scm.hh"
 #include "note-column.hh"
 #include "side-position-interface.hh"
 #include "engraver.hh"
+#include "spanner.hh"
+#include "item.hh"
 
 class Ottava_spanner_engraver : public Engraver
 {
@@ -17,9 +19,9 @@ public:
   TRANSLATOR_DECLARATIONS (Ottava_spanner_engraver);
 protected:
   virtual void finalize ();
- 
+
   DECLARE_ACKNOWLEDGER (note_column);
-  
+
   void process_music ();
   void stop_translation_timestep ();
   virtual void derived_mark () const;
@@ -59,7 +61,7 @@ Ottava_spanner_engraver::process_music ()
          span_->set_property ("text", ott);
 
          SCM c0 (get_property ("middleCPosition"));
-         SCM oc0 (get_property ("originalCentralCPosition"));
+         SCM oc0 (get_property ("originalMiddleCPosition"));
          if (scm_less_p (oc0, c0) == SCM_BOOL_T)
            span_->set_property ("direction", scm_from_int (DOWN));
        }
@@ -70,7 +72,7 @@ Ottava_spanner_engraver::process_music ()
 void
 Ottava_spanner_engraver::acknowledge_note_column (Grob_info info)
 {
-  Item *it = info.item();
+  Item *it = info.item ();
   if (span_ && it)
     {
       Side_position_interface::add_support (span_, it);
@@ -124,10 +126,16 @@ Ottava_spanner_engraver::finalize ()
 }
 
 #include "translator.icc"
+
 ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column);
+
 ADD_TRANSLATOR (Ottava_spanner_engraver,
                /* doc */ "Create a text spanner when the ottavation property changes..",
                /* create */ "OttavaBracket",
-               /* accept */ "",
-               /* read */ "ottavation",
+               /* read */ "ottavation "
+               "originalMiddleCPosition "
+               "currentMusicalColumn "
+               
+               ,
+               
                /* write */ "");