release: 1.5.3

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

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index f21f8aebbad05f320f81f4a8f437a3f5b6d69ddc..1227a9315bc25bbdbd0880f7b7e05dd59d891306 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -22,8 +22,8 @@
 class Volta_engraver : public Engraver
 {
 public:
-  Volta_engraver();
-  VIRTUAL_COPY_CONS(Translator);
+  Volta_engraver ();
+  VIRTUAL_COPY_CONS (Translator);
 protected:
 
   virtual void acknowledge_grob (Grob_info);
@@ -39,7 +39,7 @@ protected:
   SCM start_str_;
 };
 
-ADD_THIS_TRANSLATOR(Volta_engraver);
+ADD_THIS_TRANSLATOR (Volta_engraver);
 
 Volta_engraver::Volta_engraver ()
 {
@@ -59,7 +59,8 @@ Volta_engraver::process_music ()
     {
       SCM c = gh_car (cs);
 
-      if (gh_pair_p (c) && gh_car (c) == ly_symbol2scm ("volta"))
+      if (gh_pair_p (c) && gh_car (c) == ly_symbol2scm ("volta")
+         && gh_pair_p (gh_cdr (c)))
        {
          if (gh_cadr (c) ==  SCM_BOOL_F)
            end = true;
@@ -84,7 +85,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)
     {
@@ -148,7 +149,7 @@ Volta_engraver::acknowledge_grob (Grob_info i)
          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 +159,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 +174,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;
     }
 }