source file of the GNU LilyPond music typesetter
- (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "music.hh"
#include "auto-change-iterator.hh"
#include "translator-group.hh"
-#include "musical-request.hh"
+#include "event.hh"
Auto_change_iterator::change_to (Music_iterator *it, String to_type,
String to_id)
{
- Translator_group * current = it->report_to_l ();
+ Translator_group * current = it->report_to ();
Translator_group * last = 0;
/*
If \translator Staff = bass, then look for Staff = *
*/
- while (current && current->type_str_ != to_type)
+ while (current && current->type_string_ != to_type)
{
last = current;
- current = current->daddy_trans_l_;
+ current = current->daddy_trans_;
}
- if (current && current->id_str_ == to_id)
+ if (current && current->id_string_ == to_id)
{
String msg;
msg += _ ("Can't switch translators, I'm there already");
if (last)
{
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);
+ it->report_to ()->find_create_translator (to_type, to_id);
+ current->remove_translator (last);
+ dest->add_used_group_translator (last);
}
else
{
We could change the current translator's id, but that would make
errors hard to catch
- last->translator_id_str_ = change_l ()->change_to_id_str_;
+ last->translator_id_string_ = get_change ()->change_to_id_string_;
*/
// error (_ ("I'm one myself"));
}
Array<Pitch>
Auto_change_iterator::pending_pitch (Moment m) const
{
- Music_iterator * iter = child_iter_p_ ->clone ();
+ Music_iterator * iter = child_iter_ ->clone ();
Array<Pitch> ps;
while (1)
{
- SCM muses = iter->get_music (m);
- for (SCM s = muses; gh_pair_p (s); s=gh_cdr (s))
- if (Note_req* nr = dynamic_cast<Note_req*> (unsmob_music (gh_car (s))))
- {
- ps.push (*unsmob_pitch (nr->get_mus_property ("pitch")));
- }
-
+ SCM muses = iter->get_pending_events (m);
+ for (SCM s = muses; gh_pair_p (s); s=ly_cdr (s))
+ {
+ Music * m = unsmob_music (ly_car (s));
+ if (m && m->is_mus_type ("note-event"))
+ {
+ ps.push (*unsmob_pitch (m->get_mus_property ("pitch")));
+ }
+ }
+
if (ps.size ())
break;
m = iter->pending_moment ();
}
- delete iter;
+ scm_gc_unprotect_object (iter->self_scm());
+
return ps;
}
{
Pitch p = ps[0];
Direction s = Direction (sign (p.steps ()));
- if (s != where_dir_)
+ /*
+ Don't change for central C.
+
+ TODO: make this tunable somehow. Sometimes, you'd want to
+ switch for C.C. as well.
+
+ */
+ if (s && s != where_dir_)
{
where_dir_ = s;
String to_id = (s >= 0) ? "up" : "down";
- String wh = ly_scm2string (music_l_->get_mus_property ("what"));
- change_to (child_iter_p_, wh, to_id);
+ String wh = ly_scm2string (get_music ()->get_mus_property ("what"));
+ change_to (child_iter_, wh, to_id);
}
}
}