release: 1.5.34

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

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index e4dae39b63e223caf2b90593bb05e1caf0329135..4d03ac6ea3857575e003a4066fb99751c5974d84 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,6 +14,7 @@
 #include "note-column.hh"
 #include "bar.hh"
 #include "side-position-interface.hh"
+#include "staff-symbol.hh"
 
 /*
   Create Volta spanners, by reading repeatCommands  property, usually
@@ -22,8 +23,7 @@
 class Volta_engraver : public Engraver
 {
 public:
-  Volta_engraver();
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS(Volta_engraver);
 protected:
 
   virtual void acknowledge_grob (Grob_info);
@@ -35,14 +35,13 @@ protected:
   Moment started_mom_;
   Spanner *volta_span_p_;
   Spanner *end_volta_span_p_;
-
+  SCM staff_;
   SCM start_str_;
 };
 
-ADD_THIS_TRANSLATOR(Volta_engraver);
-
 Volta_engraver::Volta_engraver ()
 {
+  staff_ = SCM_EOL;
   volta_span_p_ = 0;
   end_volta_span_p_ = 0;
 }
@@ -51,23 +50,45 @@ Volta_engraver::Volta_engraver ()
 void
 Volta_engraver::process_music ()
 {
+  if (unsmob_grob (staff_))
+    {
+      /*
+       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.
+       
+      */
+      if (ly_car (scm_last_pair (staffs)) != staff_)
+       return ;
+    }
+       
+  
   SCM cs = get_property ("repeatCommands");
 
   bool  end = false;
   start_str_ = SCM_EOL;
   while (gh_pair_p (cs))
     {
-      SCM c = gh_car (cs);
+      SCM c = ly_car (cs);
 
-      if (gh_pair_p (c) && gh_car (c) == ly_symbol2scm ("volta"))
+      if (gh_pair_p (c) && ly_car (c) == ly_symbol2scm ("volta")
+         && gh_pair_p (ly_cdr (c)))
        {
-         if (gh_cadr (c) ==  SCM_BOOL_F)
+         if (ly_cadr (c) ==  SCM_BOOL_F)
            end = true;
          else
-           start_str_ = gh_cadr (c);
+           start_str_ = ly_cadr (c);
        }
       
-      cs = gh_cdr (cs);
+      cs = ly_cdr (cs);
     }
 
   if (volta_span_p_)
@@ -84,19 +105,12 @@ Volta_engraver::process_music ()
   
   if (end && !volta_span_p_)
     {
-      warning (_("No volta spanner to end")); // fixme: be more verbose.
+      warning (_ ("No volta spanner to end")); // fixme: be more verbose.
     }
   else if (end)
     {
       end_volta_span_p_ = volta_span_p_;
       volta_span_p_ =0;
-
-      /*
-       maybe do typeset_grob () directly?
-      */
-
-      if (!gh_string_p (start_str_))
-       end_volta_span_p_->set_grob_property ("last-volta", SCM_BOOL_T);
     }
 
   if (gh_string_p (start_str_) && volta_span_p_)
@@ -126,7 +140,7 @@ Volta_engraver::create_grobs ()
 
       volta_span_p_ = new Spanner (get_property ("VoltaBracket"));
       Volta_spanner::set_interface (volta_span_p_);
-      announce_grob (volta_span_p_,0);
+      announce_grob (volta_span_p_, SCM_EOL);
       volta_span_p_->set_grob_property ("text", start_str_);
     }
 }
@@ -134,23 +148,32 @@ Volta_engraver::create_grobs ()
 void
 Volta_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Item* item = dynamic_cast<Item*> (i.elem_l_))
+  if (Item* item = dynamic_cast<Item*> (i.grob_l_))
     {
       if (Note_column::has_interface (item))
        {
          if (volta_span_p_)
            Volta_spanner::add_column (volta_span_p_,item);
-         if (end_volta_span_p_)
-           Volta_spanner::add_column (end_volta_span_p_,item);      
        }
       if (Bar::has_interface (item))
        {
          if (volta_span_p_)
            Volta_spanner::add_bar (volta_span_p_, item);
          if (end_volta_span_p_)
-           Volta_spanner::add_bar(end_volta_span_p_ , item);
+           Volta_spanner::add_bar (end_volta_span_p_ , item);
        }
     }
+  else if (Staff_symbol::has_interface (i.grob_l_))
+    {
+      /*
+       We only want to know about a single staff: then we add to the
+       support.  */
+      if (staff_ != SCM_EOL)
+       staff_ = SCM_UNDEFINED;
+
+      if (staff_ != SCM_UNDEFINED)
+       staff_ = i.grob_l_->self_scm();
+    }
 }
 
 void
@@ -158,7 +181,7 @@ Volta_engraver::finalize ()
 {
   if (volta_span_p_)
     {
-      typeset_grob(volta_span_p_);
+      typeset_grob (volta_span_p_);
     }
   if (end_volta_span_p_)
     {
@@ -173,9 +196,7 @@ Volta_engraver::stop_translation_timestep ()
 {
   if (end_volta_span_p_)
     {
-      Side_position::add_staff_support (end_volta_span_p_);
-      
-      typeset_grob (end_volta_span_p_ );
+      typeset_grob (end_volta_span_p_);
       end_volta_span_p_ =0;
     }
 }
@@ -183,3 +204,10 @@ Volta_engraver::stop_translation_timestep ()
 /*
   TODO: should attach volta to paper-column if no bar is found.
  */
+
+ENTER_DESCRIPTION(Volta_engraver,
+/* descr */       "Make volta brackets",
+/* creats*/       "VoltaBracket",
+/* acks  */       "bar-line-interface staff-symbol-interface note-column-interface",
+/* reads */       "repeatCommands voltaSpannerDuration stavesFound",
+/* write */       "");