/*
- local-key-item.cc -- implement Local_key_item, Local_acc
+ local-key-item.cc -- implement Local_key_item, Musical_pitch
source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-
#include "local-key-item.hh"
#include "molecule.hh"
-#include "scalar.hh"
+#include "staff-symbol-referencer.hh"
#include "lookup.hh"
#include "paper-def.hh"
#include "musical-request.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
#include "misc.hh"
-
-
-Local_key_item::Local_key_item(int i)
+SCM
+pitch_less (SCM p1, SCM p2)
{
- c0_position = i;
+ 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;
}
-void
-Local_key_item::add_support(Item*head_l)
-{
- support_items_.push(head_l);
- add_dependency(head_l);
-}
+SCM pitch_less_proc;
+
void
-Local_key_item::add(Melodic_req*m_l)
+init_pitch_funcs ()
{
- add(m_l->octave_i_, m_l->notename_i_, m_l->accidental_i_);
+ pitch_less_proc = gh_new_procedure2_0 ("pitch-less", &pitch_less);
}
+ADD_SCM_INIT_FUNC(pitch,init_pitch_funcs);
+
+
void
-Local_key_item::add (int o, int p , int a)
+Local_key_item::add_pitch (Score_element*me, Musical_pitch p, bool cautionary, bool natural)
{
- Local_acc l;
- l.octave_i_ = o;
- l.name_i_ = p;
- l.accidental_i_ = a;
- for (int i=0; i< accs.size(); i++)
- if (!Local_acc::compare(l, accs[i]))
- return;
-
- accs.push(l);
+ 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);
}
-void
-Local_key_item::do_pre_processing()
+Molecule
+Local_key_item::parenthesize (Score_element*me, Molecule m)
{
- accs.sort(Local_acc::compare);
+ 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;
}
-Molecule*
-Local_key_item::brew_molecule_p()const
+/*
+ UGH. clean me, revise placement routine (See Ross & Wanske;
+ accidental placement is more complicated than this.
+ */
+
+MAKE_SCHEME_CALLBACK(Local_key_item,brew_molecule);
+SCM
+Local_key_item::brew_molecule (SCM smob)
{
- Molecule* output = new Molecule;
- Molecule*octmol = 0;
- int lastoct = -100;
- for (int i = 0; i < accs.size(); i++) {
- // do one octave
- if (accs[i].octave_i_ != lastoct) {
- if (octmol){
- Real dy =lastoct*7*paper()->internote_f();
- octmol->translate( dy, Y_AXIS);
- output->add(*octmol);
- delete octmol;
+ Score_element* me = unsmob_element (smob);
+
+ Molecule mol;
+
+ Real note_distance = Staff_symbol_referencer::staff_space (me)/2;
+ Molecule octave_mol;
+ bool oct_b = false;
+ int lastoct = -100;
+
+ SCM accs = me->get_elt_property ("accidentals");
+ for (SCM s = accs;
+ gh_pair_p (s); s = gh_cdr (s))
+ {
+ Musical_pitch p (gh_car (s));
+
+ // do one octave
+ if (p.octave_i_ != lastoct)
+ {
+ if (oct_b)
+ {
+ Real dy =lastoct*7* note_distance;
+ octave_mol.translate_axis (dy, Y_AXIS);
+ mol.add_molecule (octave_mol);
+ octave_mol = Molecule ();
}
- octmol= new Molecule;
+ oct_b = true;
}
- lastoct = accs[i].octave_i_;
- Symbol s =paper()->lookup_l()->accidental(accs[i].accidental_i_);
- Atom a(s);
- Real dy = (accs[i].name_i_ + c0_position) * paper()->internote_f();
- a.translate(dy, Y_AXIS);
+
+ lastoct = p.octave_i_;
+
+ SCM c0 = me->get_elt_property ("c0-position");
+ Real dy = (gh_number_p (c0) ? gh_scm2int (c0) : 0 + p.notename_i_)
+ * note_distance;
+
+ 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);
- octmol->add_right(a);
+ acc.translate_axis (dy, Y_AXIS);
+ octave_mol.add_at_edge (X_AXIS, RIGHT, acc, 0);
}
- if (octmol){
- Real dy =lastoct*7*paper()->internote_f();
- octmol->translate( dy, Y_AXIS);
- output->add(*octmol);
- delete octmol;
+ if (oct_b)
+ {
+ Real dy =lastoct*7*note_distance;
+ octave_mol.translate_axis (dy, Y_AXIS);
+ mol.add_molecule (octave_mol);
+ octave_mol = Molecule ();
+ }
+
+ if (gh_pair_p (accs))
+ {
+ Drul_array<SCM> pads;
+
+ /*
+ Use a cons?
+ */
+ pads[RIGHT] = me->get_elt_property ("right-padding");
+ pads[LEFT] = me->get_elt_property ("left-padding");
+
+
+ // unused ?
+ Direction d = LEFT;
+ do {
+ if (!gh_number_p (pads[d]))
+ continue;
+
+ Box b(Interval (0, gh_scm2double (pads[d]) * note_distance),
+ Interval (0,0));
+ Molecule m (me->lookup_l ()->blank (b));
+ mol.add_at_edge (X_AXIS, d, m, 0);
+ } while ( flip (&d)!= LEFT);
}
- Interval head_width=itemlist_width(support_items_);
- output->translate(-output->extent().x().right + head_width.left , X_AXIS);
-
- return output;
+ return mol.create_scheme();
}
-int
-Local_acc::compare(Local_acc&a, Local_acc&b)
+bool
+Local_key_item::has_interface (Score_element*m)
{
- if (a.octave_i_ - b.octave_i_)
- return a.octave_i_ - b.octave_i_;
- if (a.name_i_ - b.name_i_)
- return a.name_i_ - b.name_i_;
-
- return a.accidental_i_ - b.accidental_i_;
-};
-
-IMPLEMENT_IS_TYPE_B1(Local_key_item,Item);
-
+ return m && m->has_interface (ly_symbol2scm ("accidentals-interface"));
+}
void
-Local_key_item::do_substitute_dependency(Score_elem*o,Score_elem*n)
+Local_key_item::set_interface (Score_element*m)
{
- Item* o_l = o->item();
- Item* n_l = n?n->item():0;
-
- support_items_.substitute(o_l, n_l);
+ m->set_interface (ly_symbol2scm ("accidentals-interface"));
}
projects / lilypond.git / blobdiff