Refactor fret diagrams for simpler calls

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

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index 1828dfdbca9b49d062752118c554abfc9cd7737d..321814b8a8373893cc5c844b80b47fbc0158a457 100644 (file)
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -4,7 +4,7 @@
   source file of the GNU LilyPond music typesetter
 
 
-  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music.hh"
@@ -66,7 +66,7 @@ Volta_repeat_iterator::add_repeat_command (SCM what)
   Context *where = get_outlet ()->where_defined (reps, &current_reps);
 
   if (where
-      && current_reps == SCM_EOL || scm_is_pair (current_reps))
+       && (current_reps == SCM_EOL || scm_is_pair (current_reps)))
     {
       current_reps = scm_cons (what, current_reps);
       where->set_property (reps, current_reps);
@@ -98,7 +98,7 @@ Volta_repeat_iterator::next_element (bool side_effect)
 
          if (done_count_ <= alt_count_)
            add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
-                                           scm_makfrom0str (repstr.c_str ()), SCM_UNDEFINED));
+                                           ly_string2scm (repstr), SCM_UNDEFINED));
        }
       else
        add_repeat_command (ly_symbol2scm ("end-repeat"));