source file of the GNU LilyPond music typesetter
- (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2001 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_;
}
+Part_combine_music_iterator::Part_combine_music_iterator (Part_combine_music_iterator const &src)
+ : Music_iterator (src)
+{
+ 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;
+
+ first_until_ = src.first_until_;
+ second_until_ = src.second_until_;
+ state_ = src.state_;
+ suffix_ = src.suffix_;
+}
+
Moment
Part_combine_music_iterator::pending_moment () const
{
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_;
}
+// SCM*, moet / kan dat niet met set_x ofzo?
static void
-get_music_info (Moment m, Music_iterator* iter, Array<Musical_pitch> *pitches, Array<Duration> *durations)
+get_music_info (Moment m, Music_iterator* iter, SCM *pitches, SCM *durations)
{
if (iter->ok ())
{
- for (SCM i = iter->get_music (m); gh_pair_p (i); i = gh_cdr (i))
+ for (SCM i = iter->get_music (m); gh_pair_p (i); i = ly_cdr (i))
{
- Music *m = unsmob_music (gh_car (i));
+ Music *m = unsmob_music (ly_car (i));
if (Melodic_req *r = dynamic_cast<Melodic_req *> (m))
- pitches->push (r->pitch_);
+ *pitches = gh_cons (r->get_mus_property ("pitch"), *pitches);
if (Rhythmic_req *r = dynamic_cast<Rhythmic_req *> (m))
- durations->push (r->duration_);
+ *durations = gh_cons (r->get_mus_property ("duration"), *durations);
}
}
}
Part_combine_music_iterator::get_state (Moment)
{
int state = UNKNOWN;
- Part_combine_music const *p = dynamic_cast<Part_combine_music const* > (music_l_);
- Translator_group *first_translator = first_iter_p_->report_to_l ()->find_create_translator_l (p->what_str_, "one");
+ Part_combine_music const *p = dynamic_cast<Part_combine_music const* > (music_l ());
- SCM s = first_translator->get_property (ly_symbol2scm ("changeMoment"));
- Moment change_mom = *unsmob_moment (gh_car (s));
- Moment diff_mom = *unsmob_moment (gh_cdr (s));
+ 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 = 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.mod_rat (change_mom))
+ if (!now.main_part_.mod_rat (change_mom.main_part_))
{
SCM interval = SCM_BOOL_F;
- Moment first_mom = first_until_ - now;
- Moment second_mom = second_until_ - now;
+ 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 ();
- while ((first_mom <? second_mom) < diff_mom
- && (first_iter->ok () || second_iter->ok ()))
+
+ 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))
{
- Moment m;
if (!second_iter->ok ())
- m = first_iter->pending_moment ();
+ pending = first_iter->pending_moment ();
else if (!first_iter->ok ())
- m = second_iter->pending_moment ();
+ pending = second_iter->pending_moment ();
else
- m = first_iter->pending_moment () <? second_iter->pending_moment ();
+ pending = first_iter->pending_moment () <? second_iter->pending_moment ();
+ last_pending = pending;
- Array<Musical_pitch> first_pitches;
- Array<Duration> first_durations;
- get_music_info (m, first_iter, &first_pitches, &first_durations);
+ SCM first_pitches = SCM_EOL;
+ SCM first_durations = SCM_EOL;
+ get_music_info (pending, first_iter,
+ &first_pitches, &first_durations);
- Array<Musical_pitch> second_pitches;
- Array<Duration> second_durations;
- get_music_info (m, second_iter, &second_pitches, &second_durations);
+ SCM second_pitches = SCM_EOL;
+ SCM second_durations = SCM_EOL;
+ get_music_info (pending, second_iter,
+ &second_pitches, &second_durations);
- 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 ())
+ if (first_pitches != SCM_EOL && second_pitches != SCM_EOL)
{
- first_durations.sort (Duration::compare);
- first_mom += first_durations.top ().length_mom ();
- if (first)
- first_until_ = first_mom + now;
- }
+ scm_sort_list_x (first_pitches,
+ scm_primitive_eval (ly_str02scm ("Pitch::less_p")));
+ scm_sort_list_x (second_pitches,
+ scm_primitive_eval (ly_str02scm ("Pitch::less_p")));
- if (second_durations.size ())
- {
- second_durations.sort (Duration::compare);
- second_mom += second_durations.top ().length_mom ();
- if (first)
- second_until_ = second_mom + now;
+ interval = gh_int2scm (unsmob_pitch (ly_car (first_pitches))->steps ()
+ - unsmob_pitch (ly_car (scm_last_pair (second_pitches)))->steps ());
}
- first = false;
-
-#if 0 /* DEBUG */
- printf ("now: %s\n", now.str ().ch_C ());
- printf ("first: ");
- for (int i = 0; i < first_pitches.size (); i++)
+
+ if (first_durations != SCM_EOL)
{
- printf ("%s, ", first_pitches[i].str ().ch_C ());
+ scm_sort_list_x (first_durations,
+ scm_primitive_eval (ly_str02scm ("Duration::less_p")));
+ first_mom += unsmob_duration (ly_car (first_durations))->length_mom ();
}
- printf ("\nsecond: ");
- for (int i = 0; i < second_pitches.size (); i++)
+
+ if (second_durations != SCM_EOL)
{
- printf ("%s, ", second_pitches[i].str ().ch_C ());
+ scm_sort_list_x (second_durations,
+ scm_primitive_eval (ly_str02scm ("Duration::less_p")));
+ second_mom += unsmob_duration (ly_car (second_durations))->length_mom ();
}
- printf ("\n");
-#endif
-
- if (!first_pitches.empty () && second_pitches.empty ()
- && !(second_until_ > now))
+
+ if (first_pitches != SCM_EOL && second_pitches == SCM_EOL
+ && ! (second_until_ > now))
{
state |= UNRELATED;
state &= ~UNISILENCE;
- if (!(state & ~(UNRELATED | SOLO1 | UNISILENCE)))
+ if (! (state & ~ (UNRELATED | SOLO1 | UNISILENCE)))
state |= SOLO1;
}
else
state &= ~SOLO1;
- if (first_pitches.empty () && !second_pitches.empty ()
- && !(first_until_ > now))
+ if (first_pitches == SCM_EOL && second_pitches != SCM_EOL
+ && ! (first_until_ > now))
{
state |= UNRELATED;
state &= ~UNISILENCE;
- if (!(state & ~(UNRELATED | SOLO2 | UNISILENCE)))
+ if (! (state & ~ (UNRELATED | SOLO2 | UNISILENCE)))
state |= SOLO2;
}
else
state &= ~SOLO2;
- if (!compare (&first_durations, &second_durations))
+ if (gh_equal_p (first_durations, second_durations))
{
state &= ~UNISILENCE;
- if (!(state & ~(UNIRHYTHM | UNISON)))
+ if (! (state & ~ (UNIRHYTHM | UNISON)))
state |= UNIRHYTHM;
}
else
- state &= ~(UNIRHYTHM | UNISILENCE);
+ state &= ~ (UNIRHYTHM | UNISILENCE);
- if (!first_pitches.empty ()
- &&!compare (&first_pitches, &second_pitches))
+ if (first_pitches != SCM_EOL
+ && gh_equal_p (first_pitches, second_pitches))
{
state &= ~UNISILENCE;
- if (!(state & ~(UNIRHYTHM | UNISON)))
+ if (! (state & ~ (UNIRHYTHM | UNISON)))
state |= UNISON;
}
else
- state &= ~(UNISON);
+ state &= ~ (UNISON);
- if (first_pitches.empty () && second_pitches.empty ())
+ if (first_pitches == SCM_EOL && second_pitches == SCM_EOL)
{
- if (!(state & ~(UNIRHYTHM | UNISILENCE)))
+ if (! (state & ~ (UNIRHYTHM | UNISILENCE)))
state |= UNISILENCE;
}
+ else if (!state)
+ state |= UNRELATED;
else
- state &= ~(UNISILENCE);
+ state &= ~ (UNISILENCE);
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 (gh_car (s))
- && gh_number_p (gh_cdr (s))
- && i >= gh_scm2int (gh_car (s))
- && i <= gh_scm2int (gh_cdr (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)))
{
- if (!(state & ~(SPLIT_INTERVAL | UNIRHYTHM | UNISON)))
+ if (! (state & ~ (SPLIT_INTERVAL | UNIRHYTHM | UNISON)))
state |= SPLIT_INTERVAL;
}
else
- state &= ~(SPLIT_INTERVAL);
+ state &= ~ (SPLIT_INTERVAL);
}
-#if 0
- Moment next = (first_mom <? second_mom) + now;
- if (first_iter->ok ())
- first_iter->skip (next);
- if (second_iter->ok ())
- second_iter->skip (next);
-#else
+ 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 (first_mom + now);
+ first_iter->skip (pending);
if (second_iter->ok ())
- second_iter->skip (second_mom + now);
-#endif
+ second_iter->skip (pending);
+ now = pending;
}
delete first_iter;
delete second_iter;
return state;
}
+static Span_req* abort_req = NULL;
+
void
Part_combine_music_iterator::process (Moment m)
{
- Use three named contexts (be it Thread or Voice): one, two, solo.
Let user pre-set (pushproperty) stem direction, remove
dynamic-engraver, and such.
+
+ **** Tried this, but won't work:
+
+ 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);
+
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_);
+ Part_combine_music const *p = dynamic_cast<Part_combine_music const* > (music_l ());
- bool 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 ((!(state & UNIRHYTHM) && combined_b)
- || ((state & SPLIT_INTERVAL) && combined_b)
- || ((state & (SOLO1 | SOLO2)) && combined_b)
- || (((state & (UNIRHYTHM | UNISILENCE))
- && !combined_b && !(state & SPLIT_INTERVAL)
- && !(state & (SOLO1 | SOLO2)))))
- {
- combined_b = !combined_b;
- to_id = combined_b ? "one" : "two";
- change_to (second_iter_p_, p->what_str_, to_id);
- }
+ bool previously_combined_b = first_iter_p_->report_to_l ()->daddy_trans_l_
+ == second_iter_p_->report_to_l ()->daddy_trans_l_;
+ bool combine_b = previously_combined_b;
- Translator_group *first_translator = first_iter_p_->report_to_l ()->find_create_translator_l (p->what_str_, "one");
- Translator_group *second_translator = second_iter_p_->report_to_l ()->find_create_translator_l (p->what_str_, "two");
+ if (! (state & UNIRHYTHM)
+ || (state & SPLIT_INTERVAL)
+ || (state & (SOLO1 | SOLO2)))
+ combine_b = false;
+ else if (state & (UNIRHYTHM | UNISILENCE))
+ combine_b = true;
/*
- hmm
+ When combining, abort all running spanners
*/
+
+ if (!abort_req)
+ {
+ abort_req = new Span_req;
+ abort_req->set_mus_property ("span-type", ly_str02scm ("abort"));
+ }
+
+ if (combine_b && combine_b != previously_combined_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);
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 & SOLO1) ? SCM_BOOL_T : SCM_BOOL_F;
+ 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);
s = gh_append2 (second_iter_p_->get_music (m),s);
return s;
}
+
+IMPLEMENT_CTOR_CALLBACK (Part_combine_music_iterator);