X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fottava-engraver.cc;h=f1042877963d6b3eba29f0973cdb9f2b7f90b843;hb=6d9291efacbdf3b0cd65218f5c9d81fd8861ac70;hp=4582335d0ef976b9343d057d6087f7feaf4c71c4;hpb=811be522d0b79493159f47789e5621dc85493495;p=lilypond.git

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 4582335d0e..f104287796 100644
--- 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;
@@ -58,9 +60,8 @@ Ottava_spanner_engraver::process_music ()
 	  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)
+	  SCM offset (get_property ("middleCOffset"));
+	  if (robust_scm2double (offset, 0) > 0)
 	    span_->set_property ("direction", scm_from_int (DOWN));
 	}
     }
@@ -70,7 +71,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 +125,21 @@ Ottava_spanner_engraver::finalize ()
 }
 
 #include "translator.icc"
+
 ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column);
+
 ADD_TRANSLATOR (Ottava_spanner_engraver,
-		/* descr */ "Create a text spanner when the ottavation property changes..",
-		/* creats*/ "OttavaBracket",
-		/* accepts */ "",
-		/* reads */ "ottavation",
-		/* write */ "");
+		/* doc */
+		"Create a text spanner when the ottavation property changes.",
+
+		/* create */
+		"OttavaBracket ",
+
+		/* read */
+		"ottavation "
+		"originalMiddleCPosition "
+		"currentMusicalColumn ",
+		
+		/* write */
+		""
+		);