release: 1.3.17

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

diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc
index 3be9fb02e2a607aae720d5f430b80115fd74a814..cdea34d4b270029e74273e509b0813225f772674 100644 (file)
--- a/lily/repeat-engraver.cc
+++ b/lily/repeat-engraver.cc
@@ -12,10 +12,10 @@
 #include "musical-request.hh"
 #include "multi-measure-rest.hh"
 #include "command-request.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
 #include "engraver-group-engraver.hh"
 #include "repeated-music.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
 #include "volta-spanner.hh"
 #include "note-column.hh"
 #include "paper-def.hh"
@@ -56,7 +56,7 @@ Repeat_engraver::queue_events ()
   Moment walk_mom = now_mom () + repeated_music_l_->repeat_body_p_->length_mom ();
 
   SCM novolta = get_property ("noVoltaBraces",0);
-  bool create_volta = gh_boolean_p (novolta) && !gh_scm2bool (novolta);
+  bool create_volta = !to_boolean (novolta);
 
   Cons_list<Bar_create_event> becel;
   becel.append (new Bar_create_event (now_mom (), "|:"));
@@ -104,15 +104,15 @@ Repeat_engraver::queue_events ()
              volta_number ++;
               SCM l (get_property ("voltaSpannerDuration", 0));
               if (SMOB_IS_TYPE_B (Moment, l))
-              {
-                 Moment vSD_mom = *SMOB_TO_TYPE (Moment,l);
-                if ( vSD_mom < i->car_->length_mom() ) // terminate volta early ?
-                {
-                        vSD_mom += walk_mom;
-                   c->last_b_ = true;
-                   becel.append (new Bar_create_event (vSD_mom, "stop"));
-                }
-              }
+               {
+                 Moment vSD_mom = *SMOB_TO_TYPE (Moment,l);
+                 if ( vSD_mom < i->car_->length_mom() ) // terminate volta early ?
+                   {
+                     vSD_mom += walk_mom;
+                     c->last_b_ = true;
+                     becel.append (new Bar_create_event (vSD_mom, "stop"));
+                   }
+               }
            }
          walk_mom += i->car_->length_mom();