* scm/define-markup-commands.scm (fill-line): use

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

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index fd313e476297a9bdc3bd121251c16efe5a1adf13..263bca5aedf712c4bc3207209f7fb6fe90078304 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -10,7 +10,6 @@
 #include "engraver.hh"
 #include "context.hh"
 #include "volta-bracket.hh"
-#include "item.hh"
 #include "note-column.hh"
 #include "bar-line.hh"
 #include "side-position-interface.hh"
@@ -60,41 +59,42 @@ Volta_engraver::Volta_engraver ()
 bool
 Volta_engraver::staff_eligible ()
 {
-  /*
-    UGH.
-   */
-  if (!unsmob_grob (staff_))
-    return true;
-  
-  if (!to_boolean (get_property ("voltaOnThisStaff")))
+  SCM doit =get_property ("voltaOnThisStaff");
+  if (scm_is_bool (doit))
     {
-      /*
-       TODO: this does weird things when you open a piece with a
-       volta spanner.
-       
-       */
-      SCM staffs = get_property ("stavesFound");
+      return to_boolean (doit);
+    }
 
-      /*
-       only put a volta on the top staff.
+
+  if (!unsmob_grob (staff_))
+    return false;
+
+  /*
+    TODO: this does weird things when you open a piece with a
+    volta spanner.
+  */
+  SCM staffs = get_property ("stavesFound");
+
+  /*
+    only put a volta on the top staff.
        
-       May be this is a bit convoluted, and we should have a single
-       volta engraver in score context or somesuch.
+    May be this is a bit convoluted, and we should have a single
+    volta engraver in score context or somesuch.
        
-      */
-      if (!ly_c_pair_p (staffs))
-       {
-         programming_error ("Huh? Volta engraver can't find staffs?");
-         return false;
-       }
-      else if (ly_car (scm_last_pair (staffs)) != staff_)
-       {
-         return false;
-       }
+  */
+  if (!scm_is_pair (staffs))
+    {
+      programming_error ("Huh? Volta engraver can't find staffs?");
+      return false;
+    }
+  else if (scm_car (scm_last_pair (staffs)) != staff_)
+    {
+      return false;
     }
   return true;
 }
 
+
 void
 Volta_engraver::process_music ()
 {
@@ -106,21 +106,21 @@ Volta_engraver::process_music ()
     
   bool  end = false;
   start_string_ = SCM_EOL;
-  while (ly_c_pair_p (cs))
+  while (scm_is_pair (cs))
     {
-      SCM c = ly_car (cs);
+      SCM c = scm_car (cs);
 
-      if (ly_c_pair_p (c)
-         && ly_car (c) == ly_symbol2scm ("volta")
-         && ly_c_pair_p (ly_cdr (c)))
+      if (scm_is_pair (c)
+         && scm_car (c) == ly_symbol2scm ("volta")
+         && scm_is_pair (scm_cdr (c)))
        {
-         if (ly_cadr (c) ==  SCM_BOOL_F)
+         if (scm_cadr (c) ==  SCM_BOOL_F)
            end = true;
          else
-           start_string_ = ly_cadr (c);
+           start_string_ = scm_cadr (c);
        }
       
-      cs = ly_cdr (cs);
+      cs = scm_cdr (cs);
     }
 
   if (volta_span_)
@@ -146,7 +146,7 @@ Volta_engraver::process_music ()
     }
 
   if (volta_span_ && 
-      (ly_c_string_p (start_string_) || ly_c_pair_p (start_string_)))
+      (scm_is_string (start_string_) || scm_is_pair (start_string_)))
     {
       warning (_ ("Already have a volta spanner.  Stopping that one prematurely."));
       
@@ -161,13 +161,13 @@ Volta_engraver::process_music ()
     }
 
   if (!volta_span_ && 
-      (ly_c_string_p (start_string_) || ly_c_pair_p (start_string_)))
+      (scm_is_string (start_string_) || scm_is_pair (start_string_)))
     {
       started_mom_ = now_mom () ;
 
-      volta_span_ = make_spanner ("VoltaBracket");
+      volta_span_ = make_spanner ("VoltaBracket", SCM_EOL);
 
-      announce_grob (volta_span_, SCM_EOL);
+      
       volta_span_->set_property ("text", start_string_);
     }
 }
@@ -207,14 +207,6 @@ Volta_engraver::acknowledge_grob (Grob_info i)
 void
 Volta_engraver::finalize ()
 {
-  if (volta_span_)
-    {
-      typeset_grob (volta_span_);
-    }
-  if (end_volta_span_)
-    {
-      typeset_grob (end_volta_span_);
-    }
 }
 
 
@@ -235,11 +227,22 @@ Volta_engraver::stop_translation_timestep ()
       volta_span_ = 0;
     }
   
-  if (end_volta_span_)
+  if (end_volta_span_ && !end_volta_span_->get_bound (RIGHT))
+    {
+      Grob * cc = unsmob_grob (get_property ("currentCommandColumn"));
+      Item * ci = dynamic_cast<Item*> (cc);
+      end_volta_span_->set_bound (RIGHT, ci);
+    }
+
+  end_volta_span_ =0;
+
+  if (volta_span_ && !volta_span_->get_bound (LEFT))
     {
-      typeset_grob (end_volta_span_);
-      end_volta_span_ =0;
+      Grob * cc = unsmob_grob (get_property ("currentCommandColumn"));
+      Item * ci = dynamic_cast<Item*> (cc);
+      volta_span_->set_bound (LEFT, ci);
     }
+  
 }
 
 /*
@@ -247,7 +250,7 @@ Volta_engraver::stop_translation_timestep ()
  */
 
 ENTER_DESCRIPTION (Volta_engraver,
-/* descr */       "Make volta brackets",
+/* descr */       "Make volta brackets.",
 /* creats*/       "VoltaBracket",
 /* accepts */     "",
 /* acks  */       "bar-line-interface staff-symbol-interface note-column-interface",