source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "change-iterator.hh"
#include "translator-group.hh"
-#include "change-translator.hh"
-#include "debug.hh"
+#include "music.hh"
+#include "warn.hh"
+
-Change_iterator::Change_iterator (Change_translator *change_l)
-{
- change_l_ = change_l;
-}
void
Change_iterator::error (String reason)
{
- String to_type = change_l_->change_to_type_str_;
- String to_id = change_l_->change_to_id_str_;
-
- String warn1 =
- _ ("Can't change ") + to_type
- + _(" to ") + "`" + to_id + "\': " + reason;
- String warn2= "Change_iterator::process_and_next (): " + report_to_l ()->type_str_ + " = `"
- + report_to_l ()->id_str_ + "\': ";
+ String to_type = ly_symbol2string (get_music ()->get_mus_property ("change-to-type"));
+ String to_id = ly_scm2string (get_music ()->get_mus_property ("change-to-id"));
+
+ String warn1 = _f ("can't change `%s' to `%s'", to_type, to_id)
+ + ": " + reason;
+
+ /*
+ GUHG!
+ */
+ String warn2= "Change_iterator::process (): "
+ + get_outlet ()->context_name () + " = `"
+ + get_outlet ()->id_string_ + "': ";
warning (warn2);
- change_l_->warning (warn1);
+ get_music ()->origin ()->warning (warn1);
}
/*
move to construct_children ?
*/
void
-Change_iterator::process_and_next (Moment m)
+Change_iterator::process (Moment m)
{
- Translator_group * current = report_to_l ();
+ Translator_group * current = get_outlet ();
Translator_group * last = 0;
- String to_type = change_l_->change_to_type_str_;
- String to_id = change_l_->change_to_id_str_;
+ SCM to_type = get_music ()->get_mus_property ("change-to-type");
+ String to_id = ly_scm2string (get_music ()->get_mus_property ("change-to-id"));
+
/* find the type of translator that we're changing.
If \translator Staff = bass, then look for Staff = *
*/
- while (current && current->type_str_ != to_type)
+ while (current && !current->is_alias (to_type))
{
last = current;
- current = current->daddy_trans_l_;
+ current = current->daddy_trans_;
+ }
+
+ if (current && current->id_string_ == to_id)
+ {
+ String msg;
+ msg += _ ("Can't switch translators, I'm there already");
}
-
if (current)
if (last)
{
Translator_group * dest =
- report_to_l ()->find_create_translator_l (to_type, to_id);
- current->remove_translator_p (last);
- dest->add (last);
+ get_outlet ()->find_create_translator (to_type, to_id, SCM_EOL);
+ 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");
+ error (_ ("I'm one myself"));
}
else
- error ("None of these in my family.");
- Music_iterator::process_and_next (m);
+ error (_ ("none of these in my family"));
+
+ Simple_music_iterator::process (m);
}
-IMPLEMENT_IS_TYPE_B1 (Change_iterator, Music_iterator);
+
+
+IMPLEMENT_CTOR_CALLBACK (Change_iterator);