source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "part-combine-music.hh"
#include "translator-group.hh"
#include "musical-request.hh"
#include "music-sequence.hh"
+#include "lily-guile.hh"
#include "warn.hh"
Part_combine_music_iterator::Part_combine_music_iterator ()
delete first_iter_p_;
}
-Moment
-Part_combine_music_iterator::next_moment () const
+Part_combine_music_iterator::Part_combine_music_iterator (Part_combine_music_iterator const &src)
+ : Music_iterator (src)
{
- Moment first_next = infinity_mom;
- if (first_iter_p_->ok ())
- first_next = first_iter_p_->next_moment ();
- Moment second_next = infinity_mom;
- if (second_iter_p_->ok ())
- second_next = second_iter_p_->next_moment ();
- if (first_next == infinity_mom && second_next == infinity_mom)
- return 0;
- return first_next <? second_next;
-}
+ second_iter_p_ = src.second_iter_p_ ? src.second_iter_p_->clone () : 0;
+ first_iter_p_ = src.first_iter_p_ ? src.first_iter_p_->clone () : 0;
-bool
-Part_combine_music_iterator::ok () const
-{
- //hmm
- return first_iter_p_->ok () || second_iter_p_->ok ();
-}
-
-SCM
-Part_combine_music_iterator::get_music ()
-{
- return SCM_EOL;
+ first_until_ = src.first_until_;
+ second_until_ = src.second_until_;
+ state_ = src.state_;
+ suffix_ = src.suffix_;
}
-bool
-Part_combine_music_iterator::next ()
+Moment
+Part_combine_music_iterator::pending_moment () const
{
- bool b = false;
+ Moment p;
+ p.set_infinite (1);
if (first_iter_p_->ok ())
- b = first_iter_p_->next ();
+ p = p <? first_iter_p_->pending_moment ();
+
if (second_iter_p_->ok ())
- b = second_iter_p_->next () || b;
- return b;
+ p = p <? second_iter_p_->pending_moment ();
+ return p;
}
-void
-Part_combine_music_iterator::do_print () const
+bool
+Part_combine_music_iterator::ok () const
{
- first_iter_p_->print ();
- second_iter_p_->print ();
+ return first_iter_p_->ok () || second_iter_p_->ok ();
}
void
Part_combine_music_iterator::construct_children ()
{
- Part_combine_music const * m = dynamic_cast<Part_combine_music const*> (music_l_);
+ Part_combine_music const * m = dynamic_cast<Part_combine_music const*> (music_l ());
first_iter_p_ = get_iterator_p (m->first_l ());
second_iter_p_ = get_iterator_p (m->second_l ());
If \translator Staff = bass, then look for Staff = *
*/
- while (current && current->type_str_ != to_type)
+ while (current && current->type_str_ != to_type)
{
last = current;
current = current->daddy_trans_l_;
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
{
error (_f ("none of these in my family: `%s'", to_id.ch_C ()));
}
-void
-Part_combine_music_iterator::do_process (Moment m)
-{
- Part_combine_music const * p = dynamic_cast<Part_combine_music const* > (music_l_);
-
- Moment now = next_moment ();
- Array<Musical_pitch> first_pitches;
- Array<Duration> first_durations;
- if (first_iter_p_->ok ())
+// SCM*, moet / kan dat niet met set_x ofzo?
+static void
+get_music_info (Moment m, Music_iterator* iter, SCM *pitches, SCM *durations)
+{
+ if (iter->ok ())
{
- Music_iterator* i = first_iter_p_->clone ();
-
- /* Urg, silly first_b_ stuff */
- if (now)
- i->next ();
-
- SCM s = i->get_music ();
- if (gh_pair_p (s))
+ for (SCM i = iter->get_music (m); gh_pair_p (i); i = ly_cdr (i))
{
- if (Music_sequence* m = dynamic_cast<Music_sequence *> (unsmob_music (SCM_CAR (SCM_CAR (s)))))
+ Music *m = unsmob_music (ly_car (i));
+ 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))
{
- for (SCM s = m->music_list (); gh_pair_p (s); s = gh_cdr (s))
- {
- Music *u = unsmob_music (gh_car (s));
- if (Melodic_req *r = dynamic_cast<Melodic_req *> (u))
- first_pitches.push (r->pitch_);
- if (Rhythmic_req *r = dynamic_cast<Rhythmic_req *> (u))
- first_durations.push (r->duration_);
- }
+ 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);
}
}
}
+}
- Array<Musical_pitch> second_pitches;
- Array<Duration> second_durations;
- if (second_iter_p_->ok ())
- {
- Music_iterator* i = second_iter_p_->clone ();
+int
+Part_combine_music_iterator::get_state (Moment)
+{
+ int state = UNKNOWN;
+ Part_combine_music const *p = dynamic_cast<Part_combine_music const* > (music_l ());
- /* Urg, silly second_b_ stuff */
- if (now)
- i->next ();
+ String w = ly_scm2string (p->get_mus_property ("what"));
+
+
+ Translator_group *first_translator = first_iter_p_->report_to_l ()->find_create_translator_l (w, "one" + suffix_);
- SCM s = i->get_music ();
- if (gh_pair_p (s))
+ SCM s = first_translator->get_property ("changeMoment");
+ if (!gh_pair_p (s))
+ return state;
+
+ Moment change_mom = *unsmob_moment (ly_car (s));
+ Moment diff_mom = *unsmob_moment (ly_cdr (s));
+
+ Moment now = pending_moment ();
+
+ if (!now.main_part_.mod_rat (change_mom.main_part_))
+ {
+ SCM interval = SCM_BOOL_F;
+ if (first_until_ < now)
+ first_until_ = now;
+ if (second_until_ < now)
+ second_until_ = now;
+
+ Moment first_mom = first_until_;
+ Moment second_mom = second_until_;
+ Moment diff_until = diff_mom + now;
+
+ bool first = true;
+ Music_iterator *first_iter = first_iter_p_->clone ();
+ Music_iterator *second_iter = second_iter_p_->clone ();
+
+ Moment last_pending (-1);
+ Moment pending = now;
+ while (now < diff_until
+ && (first_iter->ok () || second_iter->ok ())
+
+ // urg, this is a hack, haven't caught this case yet
+ && (pending != last_pending))
{
- if (Music_sequence* m = dynamic_cast<Music_sequence *> (unsmob_music (SCM_CAR (SCM_CAR (s)))))
+ if (!second_iter->ok ())
+ pending = first_iter->pending_moment ();
+ else if (!first_iter->ok ())
+ pending = second_iter->pending_moment ();
+ else
+ pending = first_iter->pending_moment () <? second_iter->pending_moment ();
+ last_pending = pending;
+
+ SCM first_pitches = SCM_EOL;
+ SCM first_durations = SCM_EOL;
+ get_music_info (pending, first_iter,
+ &first_pitches, &first_durations);
+
+ SCM second_pitches = SCM_EOL;
+ SCM second_durations = SCM_EOL;
+ get_music_info (pending, second_iter,
+ &second_pitches, &second_durations);
+
+ if (first_pitches != SCM_EOL && second_pitches != SCM_EOL)
+ {
+ scm_sort_list_x (first_pitches,
+ scm_primitive_eval (ly_symbol2scm ("Pitch::less_p")));
+ scm_sort_list_x (second_pitches,
+ 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_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_symbol2scm ("Duration::less_p")));
+ second_mom += unsmob_duration (ly_car (second_durations))->length_mom ();
+ }
+
+ if (first_pitches != SCM_EOL && second_pitches == SCM_EOL
+ && ! (second_until_ > now))
+ {
+ state |= UNRELATED;
+ state &= ~UNISILENCE;
+ if (! (state & ~ (UNRELATED | SOLO1 | UNISILENCE)))
+ state |= SOLO1;
+ }
+ else
+ state &= ~SOLO1;
+
+ if (first_pitches == SCM_EOL && second_pitches != SCM_EOL
+ && ! (first_until_ > now))
+ {
+ state |= UNRELATED;
+ state &= ~UNISILENCE;
+ if (! (state & ~ (UNRELATED | SOLO2 | UNISILENCE)))
+ state |= SOLO2;
+ }
+ else
+ state &= ~SOLO2;
+
+ if (gh_equal_p (first_durations, second_durations))
+ {
+ state &= ~UNISILENCE;
+ if (! (state & ~ (UNIRHYTHM | UNISON)))
+ state |= UNIRHYTHM;
+ }
+ else
+ state &= ~ (UNIRHYTHM | UNISILENCE);
+
+ if (first_pitches != SCM_EOL
+ && gh_equal_p (first_pitches, second_pitches))
+ {
+ state &= ~UNISILENCE;
+ if (! (state & ~ (UNIRHYTHM | UNISON)))
+ state |= UNISON;
+ }
+ else
+ state &= ~ (UNISON);
+
+ if (first_pitches == SCM_EOL && second_pitches == SCM_EOL)
{
- for (SCM s = m->music_list (); gh_pair_p (s); s = gh_cdr (s))
+ if (! (state & ~ (UNIRHYTHM | UNISILENCE)))
+ state |= UNISILENCE;
+ }
+ else if (!state)
+ state |= UNRELATED;
+ else
+ state &= ~ (UNISILENCE);
+
+ if (gh_number_p (interval))
+ {
+ SCM s = first_translator->get_property ("splitInterval");
+ int i = gh_scm2int (interval);
+ if (gh_pair_p (s)
+ && gh_number_p (ly_car (s))
+ && gh_number_p (ly_cdr (s))
+ && i >= gh_scm2int (ly_car (s))
+ && i <= gh_scm2int (ly_cdr (s)))
{
- Music *u = unsmob_music (gh_car (s));
- if (Melodic_req *r = dynamic_cast<Melodic_req *> (u))
- second_pitches.push (r->pitch_);
- if (Rhythmic_req *r = dynamic_cast<Rhythmic_req *> (u))
- second_durations.push (r->duration_);
+ if (! (state & ~ (SPLIT_INTERVAL | UNIRHYTHM | UNISON)))
+ state |= SPLIT_INTERVAL;
}
+ else
+ state &= ~ (SPLIT_INTERVAL);
}
+
+ if (first && first_pitches != SCM_EOL)
+ first_until_ = first_mom;
+ if (first && second_pitches != SCM_EOL)
+ second_until_ = second_mom;
+ first = false;
+
+ if (first_iter->ok ())
+ first_iter->skip (pending);
+ if (second_iter->ok ())
+ second_iter->skip (pending);
+ now = pending;
}
+ delete first_iter;
+ delete second_iter;
}
-
- SCM interval = SCM_BOOL_F;
- if (first_pitches.size () && second_pitches.size ())
- {
- first_pitches.sort (Musical_pitch::compare);
- second_pitches.sort (Musical_pitch::compare);
- interval = gh_int2scm (first_pitches.top ().steps ()
- - second_pitches[0].steps ());
- }
- if (first_durations.size ())
- {
- first_durations.sort (Duration::compare);
- Moment new_until = now + first_durations.top ().length_mom ();
- if (new_until > first_until_)
- first_until_ = new_until;
- }
+ return state;
+}
- if (second_durations.size ())
- {
- second_durations.sort (Duration::compare);
- Moment new_until = now + second_durations.top ().length_mom ();
- if (new_until > second_until_)
- second_until_ = new_until;
- }
+static Span_req* abort_req = NULL;
-#if 1 /* DEBUG */
- printf ("now: %s\n", now.str ().ch_C ());
- printf ("first: ");
- for (int i = 0; i < first_pitches.size (); i++)
- {
- printf ("%s, ", first_pitches[i].str ().ch_C ());
- }
- printf ("\nsecond: ");
- for (int i = 0; i < second_pitches.size (); i++)
- {
- printf ("%s, ", second_pitches[i].str ().ch_C ());
- }
- printf ("\n");
-#endif
+void
+Part_combine_music_iterator::process (Moment m)
+{
- Translator_group * fir = first_iter_p_->report_to_l ();
- Translator_group * sir = second_iter_p_->report_to_l ();
+ /*
+ TODO:
+ - Use three named contexts (be it Thread or Voice): one, two, solo.
+ Let user pre-set (pushproperty) stem direction, remove
+ dynamic-engraver, and such.
- bool solo_b = (first_pitches.empty () != second_pitches.empty ())
- && !(first_until_ > now && second_until_ > now);
+ **** Tried this, but won't work:
- bool unirhythm_b = !solo_b && !compare (&first_durations, &second_durations);
- bool unison_b = unirhythm_b && !first_pitches.empty ()
- &&!compare (&first_pitches, &second_pitches);
- bool unisilence_b = unirhythm_b && first_pitches.empty ();
+ Consider thread switching: threads "one", "two" and "both".
+ User can't pre-set the (most important) stem direction at
+ thread level!
+ */
+
+ if (suffix_.empty_b ())
+ suffix_ = first_iter_p_->report_to_l ()->daddy_trans_l_->id_str_.cut_str (3, INT_MAX);
- Translator_group * fd = fir->find_create_translator_l (p->what_str_, "one");
- Translator_group * sd = sir->find_create_translator_l (p->what_str_, "two");
+ int state = get_state (m);
+ if (state)
+ state_ = state;
+ else
+ state = state_;
+
+ Part_combine_music const *p = dynamic_cast<Part_combine_music const* > (music_l ());
- bool split_interval_b = false;
- if (gh_number_p (interval))
- {
- SCM s = fd->get_property (ly_symbol2scm ("splitInterval"));
- int i = gh_scm2int (interval);
- if (gh_pair_p (s)
- && gh_number_p (gh_car (s))
- && gh_number_p (gh_cdr (s))
- && i >= gh_scm2int (gh_car (s))
- && i <= gh_scm2int (gh_cdr (s)))
- split_interval_b = true;
- }
- bool combined_b = first_iter_p_->report_to_l ()->daddy_trans_l_
+ bool previously_combined_b = first_iter_p_->report_to_l ()->daddy_trans_l_
== second_iter_p_->report_to_l ()->daddy_trans_l_;
- String to_id = combined_b ? "one" : "two";
- if ((!unirhythm_b && combined_b)
- || (split_interval_b && combined_b)
- || (solo_b && combined_b)
- /*|| (unisilence_b && combined_b) */
- || ((unirhythm_b || unison_b || unisilence_b)
- && !combined_b && !split_interval_b && !solo_b))
- {
- combined_b = !combined_b;
- to_id = combined_b ? "one" : "two";
- change_to (second_iter_p_, p->what_str_, to_id);
- }
+ bool combine_b = previously_combined_b;
- if (!combined_b)
- sir = second_iter_p_->report_to_l ();
+ if (! (state & UNIRHYTHM)
+ || (state & SPLIT_INTERVAL)
+ || (state & (SOLO1 | SOLO2)))
+ combine_b = false;
+ else if (state & (UNIRHYTHM | UNISILENCE))
+ combine_b = true;
- SCM b = unirhythm_b ? SCM_BOOL_T : SCM_BOOL_F;
- fd->set_property ("unirhythm", b);
- sd->set_property ("unirhythm", b);
-
- b = split_interval_b ? SCM_BOOL_T : SCM_BOOL_F;
- fd->set_property ("split-interval", b);
- sd->set_property ("split-interval", b);
-
- b = unisilence_b ? SCM_BOOL_T : SCM_BOOL_F;
- fd->set_property ("unisilence", b);
- sd->set_property ("unisilence", b);
-
- b = unison_b ? SCM_BOOL_T : SCM_BOOL_F;
- fd->set_property ("unison", b);
- sd->set_property ("unison", b);
+ /*
+ When combining, abort all running spanners
+ */
- b = solo_b ? SCM_BOOL_T : SCM_BOOL_F;
- if (first_pitches.size ())
+ if (!abort_req)
{
- fd->set_property ("solo", b);
- sd->set_property ("solo", SCM_BOOL_F);
+ abort_req = new Span_req;
+ abort_req->set_mus_property ("span-type", ly_str02scm ("abort"));
}
-
- if (second_pitches.size ())
+
+ if (combine_b && combine_b != previously_combined_b)
{
- fd->set_property ("solo", SCM_BOOL_F);
- sd->set_property ("solo", b);
- }
+ if (second_iter_p_ && second_iter_p_->ok ())
+ second_iter_p_->try_music (abort_req);
+ }
+ String w = ly_scm2string (p->get_mus_property ("what"));
+ if (combine_b != previously_combined_b)
+ change_to (second_iter_p_, w, (combine_b ? "one" : "two")
+ + suffix_);
+
+ Translator_group *first_translator = first_iter_p_->report_to_l ()->find_create_translator_l (w, "one" + suffix_);
+ Translator_group *second_translator = second_iter_p_->report_to_l ()->find_create_translator_l (w, "two" + suffix_);
+
+
+ /* Hmm */
+ first_translator->set_property ("combineParts", SCM_BOOL_T);
+ second_translator ->set_property ("combineParts", SCM_BOOL_T);
+
+
+ /* hmm */
+ SCM b = (state & UNIRHYTHM) ? SCM_BOOL_T : SCM_BOOL_F;
+ first_translator->set_property ("unirhythm", b);
+ second_translator->set_property ("unirhythm", b);
+
+ b = (state & SPLIT_INTERVAL) ? SCM_BOOL_T : SCM_BOOL_F;
+ first_translator->set_property ("split-interval", b);
+ second_translator->set_property ("split-interval", b);
+
+ b = (state & UNISILENCE) ? SCM_BOOL_T : SCM_BOOL_F;
+ first_translator->set_property ("unisilence", b);
+ second_translator->set_property ("unisilence", b);
+
+ // difference in definition...
+ //b = ((state & UNISON) ? SCM_BOOL_T : SCM_BOOL_F;
+ b = ((state & UNISON) && (state & UNIRHYTHM)) ? SCM_BOOL_T : SCM_BOOL_F;
+ first_translator->set_property ("unison", b);
+ second_translator->set_property ("unison", b);
+
+ SCM b1 = (state & SOLO1) ? SCM_BOOL_T : SCM_BOOL_F;
+ SCM b2 = (state & SOLO2) ? SCM_BOOL_T : SCM_BOOL_F;
+ first_translator->set_property ("solo", b1);
+ second_translator->set_property ("solo", b2);
- /*
- Hmm, shouldn't we check per iterator if next_moment < m?
- */
if (first_iter_p_->ok ())
first_iter_p_->process (m);
if (second_iter_p_->ok ())
second_iter_p_->process (m);
-
- Music_iterator::do_process (m);
}
Music_iterator*
return second_iter_p_->try_music (m);
}
+
+SCM
+Part_combine_music_iterator::get_music (Moment m)const
+{
+ SCM s = SCM_EOL;
+ if (first_iter_p_)
+ s = gh_append2 (s,first_iter_p_->get_music (m));
+ if (second_iter_p_)
+ s = gh_append2 (second_iter_p_->get_music (m),s);
+ return s;
+}
+
+IMPLEMENT_CTOR_CALLBACK (Part_combine_music_iterator);
projects / lilypond.git / blobdiff