* Documentation/windows/zlily-profile.sh:

[lilypond.git] / lily / part-combine-music-iterator.cc

diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc
index bd18cb347bffefece896bd24ddcf5a47cdbc4428..3e0fccef6e5e559ac7d274ba85ff1ee8931c3938 100644 (file)
--- a/lily/part-combine-music-iterator.cc
+++ b/lily/part-combine-music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "part-combine-music.hh"
@@ -103,7 +103,7 @@ Part_combine_music_iterator::change_to (Music_iterator *it, String to_type,
        Translator_group * dest = 
          it->report_to_l ()->find_create_translator_l (to_type, to_id);
        current->remove_translator_p (last);
-       dest->add_group_translator (last);
+       dest->add_used_group_translator (last);
       }
     else
       {
@@ -132,7 +132,14 @@ get_music_info (Moment m, Music_iterator* iter, SCM *pitches, SCM *durations)
          if (Melodic_req *r = dynamic_cast<Melodic_req *> (m))
            *pitches = gh_cons (r->get_mus_property ("pitch"), *pitches);
          if (Rhythmic_req *r = dynamic_cast<Rhythmic_req *> (m))
-           *durations = gh_cons (r->get_mus_property ("duration"), *durations);
+           {
+             SCM d = r->get_mus_property ("duration");
+             if (d == SCM_EOL)
+               r->origin ()->warning ("Rhythmic_req has no duration\n");
+               else
+                 // *durations = gh_cons (r->get_mus_property ("duration"), *durations);
+                 *durations = gh_cons (d, *durations);
+           }
        }
     }
 }
@@ -148,7 +155,7 @@ Part_combine_music_iterator::get_state (Moment)
   
   Translator_group *first_translator = first_iter_p_->report_to_l ()->find_create_translator_l (w, "one" + suffix_);
 
-  SCM s = first_translator->get_property (ly_symbol2scm ("changeMoment"));
+  SCM s = first_translator->get_property ("changeMoment");
   if (!gh_pair_p (s))
     return state;
 
@@ -202,25 +209,25 @@ Part_combine_music_iterator::get_state (Moment)
          if (first_pitches != SCM_EOL && second_pitches != SCM_EOL)
            {
              scm_sort_list_x (first_pitches,
-                              scm_primitive_eval (ly_str02scm ("Pitch::less_p")));
+                              scm_primitive_eval (ly_symbol2scm ("Pitch::less_p")));
              scm_sort_list_x (second_pitches,
-                              scm_primitive_eval (ly_str02scm ("Pitch::less_p")));
+                              scm_primitive_eval (ly_symbol2scm ("Pitch::less_p")));
 
              interval = gh_int2scm (unsmob_pitch (ly_car (first_pitches))->steps ()
                                     - unsmob_pitch (ly_car (scm_last_pair (second_pitches)))->steps ());
            }
-         
+
          if (first_durations != SCM_EOL)
            {
              scm_sort_list_x (first_durations,
-                              scm_primitive_eval (ly_str02scm ("Duration::less_p")));
+                              scm_primitive_eval (ly_symbol2scm ("Duration::less_p")));
              first_mom += unsmob_duration (ly_car (first_durations))->length_mom ();
            }
          
          if (second_durations != SCM_EOL)
            {
              scm_sort_list_x (second_durations,
-                              scm_primitive_eval (ly_str02scm ("Duration::less_p")));
+                              scm_primitive_eval (ly_symbol2scm ("Duration::less_p")));
              second_mom += unsmob_duration (ly_car (second_durations))->length_mom ();
            }
          
@@ -277,7 +284,7 @@ Part_combine_music_iterator::get_state (Moment)
 
          if (gh_number_p (interval))
            {
-             SCM s = first_translator->get_property (ly_symbol2scm ("splitInterval"));
+             SCM s = first_translator->get_property ("splitInterval");
              int i = gh_scm2int (interval);
              if (gh_pair_p (s)
                  && gh_number_p (ly_car (s))