* scm/output-gnome.scm (FIXME-glyph-string): New function. Cannot

[lilypond.git] / lily / music-sequence.cc

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 1dc61a38661b8159477266e8affc3b8831cd568e..c15ebaf2dbb29a36ddd931bd0db956f09e99f4e7 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -3,18 +3,23 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
 #include "music-list.hh"
 #include "warn.hh"
 #include "pitch.hh"
+#include "input.hh"
 
+Music_sequence::Music_sequence ()
+  : Music ()
+{
+}
 
 SCM
-Music_sequence::music_list ()const
+Music_sequence::music_list () const
 {
-  return get_mus_property ("elements");
+  return get_property ("elements");
 }
 
 /*
@@ -23,27 +28,16 @@ Music_sequence::music_list ()const
 void
 Music_sequence::append_music (Music *m)
 {
-  set_mus_property ("elements",
-                   gh_append2 (music_list (), gh_cons (m->self_scm (), SCM_EOL)));
+  set_property ("elements",
+               ly_append2 (music_list (), scm_cons (m->self_scm (), SCM_EOL)));
   scm_gc_unprotect_object (m->self_scm ());
 }
 
-Music_sequence::Music_sequence ( )
-  : Music ()
-{
-}
-
-void
-Music_sequence::transpose (Pitch rq)
-{
-  transpose_list (music_list (), rq);
-}
-
 void
-Music_sequence::transpose_list (SCM l,  Pitch rq)
+transpose_music_list (SCM lst, Pitch rq)
 {
-  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
-    unsmob_music (ly_car (s))->transpose (rq);    
+  for (SCM s = lst; scm_is_pair (s);  s = scm_cdr (s))
+    unsmob_music (scm_car (s))->transpose (rq);    
 }
 
 Moment
@@ -52,9 +46,9 @@ Music_sequence::cumulative_length (SCM l)
   Moment cumulative;
   Moment last_len; 
 
-  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
     {
-      Moment l = unsmob_music (ly_car (s))->length_mom ();
+      Moment l = unsmob_music (scm_car (s))->get_length ();
       if (last_len.grace_part_ && l.main_part_)
        {
          last_len.grace_part_ = Rational (0);
@@ -69,67 +63,46 @@ Music_sequence::cumulative_length (SCM l)
   return  cumulative;
 }
 
-Pitch
-Music_sequence::to_relative_octave (Pitch p)
-{
-  return do_relative_octave (p, false);
-}
-
-
 Moment
 Music_sequence::maximum_length (SCM l)
 {
   Moment dur = 0;
-  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
     {
-      Music * m = unsmob_music (ly_car (s));
-      Moment l = m->length_mom ();
+      Music * m = unsmob_music (scm_car (s));
+      Moment l = m->get_length ();
       dur = dur >? l;
     }
 
   return dur;
 }
 
-
 Pitch
-Music_sequence::do_relative_octave (Pitch p, bool ret_first)
+music_list_to_relative (SCM l,Pitch p, bool ret_first)
 {
-  Pitch retval;
-  int count=0;
+  Pitch first = p;
+  int count = 0;
 
   Pitch last = p;
-  for (SCM s = music_list (); gh_pair_p (s);  s = ly_cdr (s))
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
     {
-      Music *m = unsmob_music (ly_car (s));
-      if (!m)
-       {
-         programming_error ("Music_sequence should only contain music!");
-       }
-      else
+      if (Music *m = unsmob_music (scm_car (s)))
        {
          last = m->to_relative_octave (last);
          if (!count ++)
-           retval = last;
+           first = last;
        }
     }
 
-  if (!ret_first)
-    retval = last;
-  
-  return retval;
+  return  (ret_first)?  first : last;
 }
 
-void
-Music_sequence::compress (Moment m)
-{
-  compress_list (music_list (), m);
-}
 
 void
-Music_sequence::compress_list (SCM l, Moment m)
+compress_music_list (SCM l, Moment m)
 {
-  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
-    unsmob_music (ly_car (s))->compress (m);
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
+    unsmob_music (scm_car (s))->compress (m);
 }
 
 ADD_MUSIC (Music_sequence);
@@ -139,9 +112,9 @@ Music_sequence::minimum_start (SCM l)
 {
   Moment m;
   
-  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
     {
-      m = m <? unsmob_music (ly_car (s))->start_mom ();
+      m = m <? unsmob_music (scm_car (s))->start_mom ();
     }
   return m;
 }
@@ -151,10 +124,10 @@ Music_sequence::first_start (SCM l)
 {
   Moment m;
   
-  for (SCM s = l; gh_pair_p (s);  s = ly_cdr (s))
+  for (SCM s = l; scm_is_pair (s);  s = scm_cdr (s))
     {
-      Music * mus = unsmob_music (ly_car (s));
-      Moment l = mus->length_mom ();
+      Music * mus = unsmob_music (scm_car (s));
+      Moment l = mus->get_length ();
       Moment s = mus->start_mom ();
       if (l.to_bool () || s.to_bool ())
        return s;