patch::: 1.5.17.jcn4

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

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index a4d1af151282273bea020564651c8af3ba4e5c9b..cc163f9bc93779288ca17bd990a5c27c8a7ed327 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -22,8 +22,7 @@
 class Volta_engraver : public Engraver
 {
 public:
-  Volta_engraver();
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS(Volta_engraver);
 protected:
 
   virtual void acknowledge_grob (Grob_info);
@@ -39,8 +38,6 @@ protected:
   SCM start_str_;
 };
 
-ADD_THIS_TRANSLATOR(Volta_engraver);
-
 Volta_engraver::Volta_engraver ()
 {
   volta_span_p_ = 0;
@@ -57,17 +54,18 @@ Volta_engraver::process_music ()
   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,7 +82,7 @@ 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)
     {
@@ -101,11 +99,11 @@ Volta_engraver::process_music ()
 
   if (gh_string_p (start_str_) && volta_span_p_)
     {
-      warning (_ ("Already have a volta spanner. Stopping that one prematurely."));
+      warning (_ ("Already have a volta spanner.  Stopping that one prematurely."));
       
       if (end_volta_span_p_)
        {
-         warning (_("Also have a stopped spanner. Giving up."));
+         warning (_ ("Also have a stopped spanner.  Giving up."));
          return ;
        }
 
@@ -134,21 +132,19 @@ 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);
        }
     }
 }
@@ -158,7 +154,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 +169,9 @@ Volta_engraver::stop_translation_timestep ()
 {
   if (end_volta_span_p_)
     {
-      Side_position::add_staff_support (end_volta_span_p_);
+      Side_position_interface::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 +179,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 note-column-interface",
+/* reads */       "repeatCommands voltaSpannerDuration",
+/* write */       "");