Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 6afa928387e49ee6358aefefa26df994a8b7c6e6..01bf1d85c6f4a38e1d9ef26e6925124b95ef6a6b 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -1,9 +1,9 @@
 /*
-  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--2006 Han-Wen Nienhuys
+  (c) 2000--2007 Han-Wen Nienhuys
 */
 
 #include "protected-scm.hh"
@@ -60,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));
        }
     }
@@ -132,5 +131,10 @@ ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column);
 ADD_TRANSLATOR (Ottava_spanner_engraver,
                /* doc */ "Create a text spanner when the ottavation property changes..",
                /* create */ "OttavaBracket",
-               /* read */ "ottavation",
+               /* read */ "ottavation "
+               "originalMiddleCPosition "
+               "currentMusicalColumn "
+               
+               ,
+               
                /* write */ "");