Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / volta-repeat-iterator.cc

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index 0774ca07e8c962d2932377e3af7037a48b9ec4cb..d12660579519601dfb43aff0a1ebd31be75b3478 100644 (file)
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include "music.hh"
 #include "sequential-iterator.hh"
 #include "context.hh"
+#include "lily-imports.hh"
 
 class Volta_repeat_iterator : public Sequential_iterator
 {
@@ -85,8 +86,7 @@ Volta_repeat_iterator::add_repeat_command (SCM what)
   SCM current_reps = SCM_EOL;
   Context *where = get_outlet ()->where_defined (reps, &current_reps);
 
-  if (where
-      && (current_reps == SCM_EOL || scm_is_pair (current_reps)))
+  if (where && ly_cheap_is_list (current_reps))
     {
       current_reps = scm_cons (what, current_reps);
       where->set_property (reps, current_reps);
@@ -129,7 +129,7 @@ Volta_repeat_iterator::next_element (bool side_effect)
           else
             {
 
-              add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
+              add_repeat_command (scm_list_2 (ly_symbol2scm ("volta"), SCM_BOOL_F));
 
               if (done_count_ - 1 < alt_count_)
                 {
@@ -138,7 +138,7 @@ Volta_repeat_iterator::next_element (bool side_effect)
                   if (to_boolean (get_outlet ()->get_property ("timing")))
                     {
                       for (SCM p = alt_restores_; scm_is_pair (p); p = scm_cdr (p))
-                        scm_apply_0 (ly_lily_module_constant ("ly:context-set-property!"),
+                        scm_apply_0 (Lily::ly_context_set_property_x,
                                      scm_car (p));
                     }
                 }
@@ -148,8 +148,8 @@ Volta_repeat_iterator::next_element (bool side_effect)
             repstr = "1.--" + ::to_string (rep_count_ - alt_count_ + done_count_) + ".";
 
           if (done_count_ <= alt_count_)
-            add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
-                                            ly_string2scm (repstr), SCM_UNDEFINED));
+            add_repeat_command (scm_list_2 (ly_symbol2scm ("volta"),
+                                            ly_string2scm (repstr)));
         }
       else
         add_repeat_command (ly_symbol2scm ("end-repeat"));