2003 -> 2004

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

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index e849a1d3f011ed883139a40df79f46ab4320ba56..0cd2ece3b327fb68b0c5156532326903fcbed447 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -3,8 +3,7 @@
 
   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"
@@ -36,6 +35,7 @@ Ottava_spanner_engraver::Ottava_spanner_engraver ()
 {
   finished_ = 0;
   span_ =0;
+  last_ottavation_ = SCM_EOL;
 }
 
 void
@@ -48,12 +48,16 @@ Ottava_spanner_engraver::process_music ()
       span_ = 0;
       if (gh_string_p (ott))
        {
-         span_  = new Spanner (get_property ("OttavaSpanner"));
-         span_->set_grob_property ("edge-text", gh_cons (ott, SCM_EOL));
+         span_  = make_spanner ("OttavaBracket");
+         span_->set_grob_property ("text", ott);
          announce_grob (span_, SCM_EOL);
+
+         SCM c0 (get_property ("centralCPosition"));
+         SCM oc0 (get_property ("originalCentralCPosition"));
+         if (scm_less_p (oc0, c0) == SCM_BOOL_T)
+           span_->set_grob_property ("direction", gh_int2scm (DOWN));
        }
     }
-
   last_ottavation_ = ott;
 }
 
@@ -64,6 +68,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 +80,6 @@ Ottava_spanner_engraver::typeset_all ()
 {  
   if (finished_)
     {
-      Side_position_interface::add_staff_support (finished_);
-
       Direction d = LEFT;
       do
        {
@@ -112,11 +115,12 @@ Ottava_spanner_engraver::finalize ()
   if (span_)
     finished_ = span_;
   typeset_all();
+  last_ottavation_ = SCM_EOL;
 }
 
 ENTER_DESCRIPTION(Ottava_spanner_engraver,
 /* descr */       "Create a text spanner when the ottavation property changes..",
-/* creats*/       "OttavaSpanner",
+/* creats*/       "OttavaBracket",
 /* accepts */     "",
 /* acks  */      "note-column-interface",
 /* reads */       "ottavation",