source file of the GNU LilyPond music typesetter
- (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "repeated-music.hh"
#include "music-list.hh"
#include "pitch.hh"
-#include "debug.hh"
+#include "warn.hh"
+#include "music-sequence.hh"
+#include "scm-option.hh"
Music *
Repeated_music::body ()const
{
- return unsmob_music (get_mus_property ("body"));
+ return unsmob_music (get_mus_property ("element"));
}
-Music_sequence*
+SCM
Repeated_music::alternatives ()const
{
- return dynamic_cast<Music_sequence*> (unsmob_music (get_mus_property ("alternatives")));
+ return get_mus_property ("elements");
}
-Repeated_music::Repeated_music(SCM l)
- : Music (l)
-{
- set_mus_property ("type", ly_symbol2scm ("repeated-music"));
-}
+
Pitch
Repeated_music::to_relative_octave (Pitch p)
{
- if (body ())
- p = body ()->to_relative_octave (p);
-
- Pitch last = p ;
- if (alternatives ())
- for (SCM s = alternatives ()->music_list (); gh_pair_p (s); s = gh_cdr (s))
- unsmob_music (gh_car (s))->to_relative_octave (p);
-
+ if (lily_1_8_relative)
+ {
+ if (body ())
+ p = body ()->to_relative_octave (p);
- return last;
-}
+ Pitch last = p ;
+ if (alternatives ())
+ {
+ lily_1_8_compatibility_used = true;
-void
-Repeated_music::transpose (Pitch p)
-{
- if (body ())
- body ()->transpose (p);
+ for (SCM s = alternatives (); gh_pair_p (s); s = ly_cdr (s))
+ unsmob_music (ly_car (s))->to_relative_octave (p);
+ }
- if (alternatives ())
- alternatives ()->transpose (p);
+ return last;
+ }
+ else
+ {
+ return Music::to_relative_octave (p);
+ }
}
-void
-Repeated_music::compress (Moment p)
-{
- if (body ())
- body ()->compress (p);
-
- if (alternatives ())
- alternatives ()->compress (p);
-}
Moment
-Repeated_music::alternatives_length_mom (bool fold) const
+Repeated_music::alternatives_get_length (bool fold) const
{
- if (!alternatives () )
+ if (!alternatives ())
return 0;
- if (fold)
- return alternatives ()->maximum_length ();
+ if (fold)
+ return Music_sequence::maximum_length (alternatives ());
Moment m =0;
int done =0;
- SCM p = alternatives ()->music_list ();
+ SCM p = alternatives ();
while (gh_pair_p (p) && done < repeat_count ())
{
- m = m + unsmob_music (gh_car (p))->length_mom ();
+ m = m + unsmob_music (ly_car (p))->get_length ();
done ++;
- if (repeat_count () - done < alternatives ()->length_i ())
- p = gh_cdr (p);
+ if (repeat_count () - done < scm_ilength (alternatives ()))
+ p = ly_cdr (p);
}
return m;
}
of volta repeats, where the alternatives are iterated just as they
were entered. */
Moment
-Repeated_music::alternatives_volta_length_mom () const
+Repeated_music::alternatives_volta_get_length () const
{
if (!alternatives ())
return 0;
Moment m;
- SCM p = alternatives ()->music_list ();
+ SCM p = alternatives ();
while (gh_pair_p (p))
{
- m = m + unsmob_music (gh_car (p))->length_mom ();
- p = gh_cdr (p);
+ m = m + unsmob_music (ly_car (p))->get_length ();
+ p = ly_cdr (p);
}
return m;
}
+
+/*
+ Length of the body in THIS. Disregards REPEAT-COUNT.
+ */
Moment
-Repeated_music::body_length_mom () const
+Repeated_music::body_get_length () const
{
Moment m = 0;
if (body ())
{
- m = body ()->length_mom ();
+ m = body ()->get_length ();
}
return m;
}
}
-MAKE_SCHEME_CALLBACK(Repeated_music,unfolded_music_length, 1);
-MAKE_SCHEME_CALLBACK(Repeated_music,folded_music_length, 1);
-MAKE_SCHEME_CALLBACK(Repeated_music,volta_music_length, 1);
+MAKE_SCHEME_CALLBACK (Repeated_music,unfolded_music_length, 1);
+MAKE_SCHEME_CALLBACK (Repeated_music,folded_music_length, 1);
+MAKE_SCHEME_CALLBACK (Repeated_music,volta_music_length, 1);
SCM
Repeated_music::unfolded_music_length (SCM m)
{
Repeated_music* r = dynamic_cast<Repeated_music*> (unsmob_music (m));
- Moment l = Moment (r->repeat_count ()) * r->body_length_mom () + r->alternatives_length_mom (false);
+ Moment l = Moment (r->repeat_count ()) * r->body_get_length () + r->alternatives_get_length (false);
return l.smobbed_copy ();
}
{
Repeated_music* r = dynamic_cast<Repeated_music*> (unsmob_music (m));
- Moment l = r->body_length_mom () + r->alternatives_length_mom (true);
+ Moment l = r->body_get_length () + r->alternatives_get_length (true);
return l.smobbed_copy ();
}
Repeated_music::volta_music_length (SCM m)
{
Repeated_music* r = dynamic_cast<Repeated_music*> (unsmob_music (m));
- Moment l = r->body_length_mom () + r->alternatives_volta_length_mom ();
+ Moment l = r->body_get_length () + r->alternatives_volta_get_length ();
return l.smobbed_copy ();
}
+
+ADD_MUSIC (Repeated_music);
+
+Repeated_music::Repeated_music ()
+ : Music ()
+{
+}
+
+
+MAKE_SCHEME_CALLBACK (Repeated_music,minimum_start, 1);
+MAKE_SCHEME_CALLBACK (Repeated_music,first_start, 1);
+
+SCM
+Repeated_music::minimum_start (SCM m)
+{
+ Music * me = unsmob_music (m);
+ Music * body = unsmob_music (me->get_mus_property ("element"));
+
+ if (body)
+ return body->start_mom ().smobbed_copy();
+ else
+ {
+ return Music_sequence::minimum_start (me->get_mus_property ("elements")).smobbed_copy();
+ }
+}
+
+SCM
+Repeated_music::first_start (SCM m)
+{
+ Music * me = unsmob_music (m);
+ Music * body = unsmob_music (me->get_mus_property ("element"));
+
+ Moment rv = (body) ? body->start_mom () :
+ Music_sequence::first_start (me->get_mus_property ("elements"));
+
+ return rv.smobbed_copy ();
+}
projects / lilypond.git / blobdiff