#include "rhythmic-head.hh"
#include "misc.hh"
+SCM
+pitch_less (SCM p1, SCM p2)
+{
+ for (int i = 3; i--; p1 = gh_cdr (p1), p2 = gh_cdr (p2))
+ {
+ if (scm_less_p (gh_car (p1), gh_car (p2)))
+ return SCM_BOOL_T;
+ if (gh_car (p1) != gh_car (p2))
+ return SCM_BOOL_F;
+ }
+ return SCM_BOOL_T;
+}
+
+SCM pitch_less_proc;
+
+
void
-Local_key_item::add_pitch (Musical_pitch p, bool cautionary, bool natural)
+init_pitch_funcs ()
{
- for (int i=0; i< accidental_arr_.size(); i++)
- if (!Musical_pitch::compare (p, accidental_arr_[i].pitch_))
- return;
- /* maybe natural (and cautionary) should be modif. nonetheless? */
-
- Local_key_cautionary_tuple t;
- t.pitch_ = p;
- t.cautionary_b_ = cautionary;
- t.natural_b_ = natural;
- accidental_arr_.push (t);
+ pitch_less_proc = gh_new_procedure2_0 ("pitch-less", &pitch_less);
}
-GLUE_SCORE_ELEMENT(Local_key_item,before_line_breaking);
+ADD_SCM_INIT_FUNC(pitch,init_pitch_funcs);
-SCM
-Local_key_item::member_before_line_breaking ()
+
+void
+Local_key_item::add_pitch (Score_element*me, Musical_pitch p, bool cautionary, bool natural)
{
- accidental_arr_.sort (Local_key_cautionary_tuple::compare);
- return SCM_UNDEFINED;
+ SCM acs = me->get_elt_property ("accidentals");
+ SCM pitch = p.to_scm ();
+ SCM opts = SCM_EOL;
+ if (cautionary)
+ opts = gh_cons (ly_symbol2scm ("cautionary"), opts);
+ if (natural)
+ opts = gh_cons (ly_symbol2scm ("natural"), opts);
+
+ pitch = gh_append2 (pitch, opts);
+ acs = scm_merge_x (acs, gh_cons (pitch, SCM_EOL), pitch_less_proc);
+
+ me->set_elt_property ("accidentals", acs);
}
Molecule
-Local_key_item::accidental (int j, bool cautionary, bool natural) const
+Local_key_item::parenthesize (Score_element*me, Molecule m)
{
- Molecule m (lookup_l ()->afm_find (String ("accidentals-") + to_str (j)));
- if (natural)
- {
- Molecule prefix = lookup_l ()->afm_find (String ("accidentals-0"));
- m.add_at_edge(X_AXIS, LEFT, Molecule(prefix), 0);
- }
- if (cautionary)
- {
- Molecule open = lookup_l ()->afm_find (String ("accidentals-("));
- Molecule close = lookup_l ()->afm_find (String ("accidentals-)"));
- m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0);
- m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0);
- }
-
+ Molecule open = me->lookup_l ()->afm_find (String ("accidentals-("));
+ Molecule close = me->lookup_l ()->afm_find (String ("accidentals-)"));
+ m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0);
+ m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0);
+
return m;
}
/*
- UGH. clean me up
+ UGH. clean me, revise placement routine (See Ross & Wanske;
+ accidental placement is more complicated than this.
*/
-GLUE_SCORE_ELEMENT(Local_key_item,brew_molecule);
+MAKE_SCHEME_CALLBACK(Local_key_item,brew_molecule);
SCM
-Local_key_item::member_brew_molecule () const
+Local_key_item::brew_molecule (SCM smob)
{
+ Score_element* me = unsmob_element (smob);
+
Molecule mol;
- Staff_symbol_referencer_interface si (this);
- Real note_distance = si.staff_space ()/2;
+
+ Real note_distance = Staff_symbol_referencer::staff_space (me)/2;
Molecule octave_mol;
bool oct_b = false;
int lastoct = -100;
-
- for (int i = 0; i < accidental_arr_.size(); i++)
+
+ SCM accs = me->get_elt_property ("accidentals");
+ for (SCM s = accs;
+ gh_pair_p (s); s = gh_cdr (s))
{
- Musical_pitch p (accidental_arr_[i].pitch_);
+ Musical_pitch p (gh_car (s));
+
// do one octave
if (p.octave_i_ != lastoct)
{
lastoct = p.octave_i_;
- SCM c0 = get_elt_property ("c0-position");
+ SCM c0 = me->get_elt_property ("c0-position");
Real dy = (gh_number_p (c0) ? gh_scm2int (c0) : 0 + p.notename_i_)
* note_distance;
- Molecule m (accidental (p.accidental_i_,
- accidental_arr_[i].cautionary_b_,
- accidental_arr_[i].natural_b_));
+ Molecule acc (me->lookup_l ()->afm_find (String ("accidentals-")
+ + to_str (p.accidental_i_)));
+
+ if (scm_memq (ly_symbol2scm ("natural"), gh_car (s)) != SCM_BOOL_F)
+ {
+ Molecule prefix = me->lookup_l ()->afm_find (String ("accidentals-0"));
+ acc.add_at_edge(X_AXIS, LEFT, Molecule(prefix), 0);
+ }
+
+ if (scm_memq (ly_symbol2scm ("cautionary"), gh_car (s)) != SCM_BOOL_F)
+ acc = parenthesize (me, acc);
- m.translate_axis (dy, Y_AXIS);
- octave_mol.add_at_edge (X_AXIS, RIGHT, m, 0);
+ acc.translate_axis (dy, Y_AXIS);
+ octave_mol.add_at_edge (X_AXIS, RIGHT, acc, 0);
}
if (oct_b)
octave_mol = Molecule ();
}
- if (accidental_arr_.size())
+ if (gh_pair_p (accs))
{
Drul_array<SCM> pads;
/*
Use a cons?
*/
- pads[RIGHT] = get_elt_property ("right-padding");
- pads[LEFT] = get_elt_property ("left-padding");
+ pads[RIGHT] = me->get_elt_property ("right-padding");
+ pads[LEFT] = me->get_elt_property ("left-padding");
// unused ?
Box b(Interval (0, gh_scm2double (pads[d]) * note_distance),
Interval (0,0));
- Molecule m (lookup_l ()->blank (b));
+ Molecule m (me->lookup_l ()->blank (b));
mol.add_at_edge (X_AXIS, d, m, 0);
} while ( flip (&d)!= LEFT);
}
return mol.create_scheme();
}
-Local_key_item::Local_key_item (SCM s)
- : Item (s)
+bool
+Local_key_item::has_interface (Score_element*m)
{
-
+ return m && m->has_interface (ly_symbol2scm ("accidentals-interface"));
+}
+void
+Local_key_item::set_interface (Score_element*m)
+{
+ m->set_interface (ly_symbol2scm ("accidentals-interface"));
}
projects / lilypond.git / blobdiff