/*
- 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 "misc.hh"
-
-Local_key_item::Local_key_item (int i)
-{
- c0_position = i;
-}
-
void
-Local_key_item::add_support (Item*head_l)
+Local_key_item::add_pitch (Musical_pitch p, bool cautionary, bool natural)
{
- support_items_.push (head_l);
- add_dependency (head_l);
+ 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);
}
-void
-Local_key_item::add (Melodic_req*m_l)
-{
- add (m_l->octave_i_, m_l->notename_i_, m_l->accidental_i_);
-}
-void
-Local_key_item::add (int o, int p , int a)
-{
- 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);
-}
void
Local_key_item::do_pre_processing()
{
- accs.sort (Local_acc::compare);
+ accidental_arr_.sort (Local_key_cautionary_tuple::compare);
}
-Molecule*
-Local_key_item::brew_molecule_p() const
+Molecule
+Local_key_item::accidental (int j, bool cautionary, bool natural) const
{
- Molecule* output = new Molecule;
- Molecule*octmol = 0;
- int lastoct = -100;
- for (int i = 0; i < accs.size(); i++)
+ Molecule m (lookup_l ()->afm_find (String ("accidentals-") + to_str (j)));
+ if (natural)
{
- // 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;
- }
- octmol= new Molecule;
- }
- 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);
-
- octmol->add_right (a);
+ Molecule prefix = lookup_l ()->afm_find (String ("accidentals-0"));
+ m.add_at_edge(X_AXIS, LEFT, Molecule(prefix), 0);
}
-
- if (octmol)
+ if (cautionary)
{
- Real dy =lastoct*7*paper()->internote_f ();
- octmol->translate (dy, Y_AXIS);
- output->add (*octmol);
- delete octmol;
+ 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);
}
-
- Interval head_width=itemlist_width (support_items_);
- output->translate (-output->extent().x ().right + head_width.left , X_AXIS);
- return output;
+ return m;
}
-int
-Local_acc::compare (Local_acc&a, Local_acc&b)
+/*
+ UGH. clean me up
+ */
+Molecule
+Local_key_item::do_brew_molecule() const
{
- 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_;
+ Molecule mol;
+ Staff_symbol_referencer_interface si (this);
+ Real note_distance = si.staff_space ()/2;
+ Molecule octave_mol;
+ bool oct_b = false;
+ int lastoct = -100;
- return a.accidental_i_ - b.accidental_i_;
-};
-
-IMPLEMENT_IS_TYPE_B1(Local_key_item,Item);
+ for (int i = 0; i < accidental_arr_.size(); i++)
+ {
+ Musical_pitch p (accidental_arr_[i].pitch_);
+ // 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 ();
+ }
+ oct_b = true;
+ }
+
+ lastoct = p.octave_i_;
+
+ SCM c0 = 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_));
+
+ m.translate_axis (dy, Y_AXIS);
+ octave_mol.add_at_edge (X_AXIS, RIGHT, m, 0);
+ }
-void
-Local_key_item::do_substitute_dependency (Score_elem*o,Score_elem*n)
-{
- Item* o_l = o->item();
- Item* n_l = n?n->item():0;
+ 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 (accidental_arr_.size())
+ {
+ Drul_array<SCM> pads;
+
+ /*
+ Use a cons?
+ */
+ pads[RIGHT] = get_elt_property ("right-padding");
+ pads[LEFT] = get_elt_property ("left-padding");
+
+ 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 (lookup_l ()->fill (b));
+ mol.add_at_edge (X_AXIS, d, m, 0);
+ } while ( flip (&d)!= LEFT);
+ }
- support_items_.substitute (o_l, n_l);
+ return mol;
}
+
projects / lilypond.git / blobdiff