/*
- 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--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "dimen.hh"
#include "local-key-item.hh"
#include "molecule.hh"
#include "scalar.hh"
#include "note-head.hh"
#include "misc.hh"
-
-
-Local_key_item::Local_key_item (int i)
+Local_key_item::Local_key_item ()
{
- c0_position = i;
+ c0_position_i_ = 0;
}
void
}
void
-Local_key_item::add (Melodic_req*m_l)
+Local_key_item::add (Musical_pitch p)
{
- 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]))
+ if (!Musical_pitch::compare (p, accs[i]))
return;
- accs.push (l);
+ accs.push (p);
}
void
Local_key_item::do_pre_processing()
{
- accs.sort (Local_acc::compare);
+ accs.sort (Musical_pitch::compare);
}
Molecule*
{
Real dy =lastoct*7*paper()->internote_f ();
octave_mol_p->translate_axis (dy, Y_AXIS);
- output->add (*octave_mol_p);
+ output->add_molecule (*octave_mol_p);
delete octave_mol_p;
}
octave_mol_p= new Molecule;
}
lastoct = accs[i].octave_i_;
- Real dy = (accs[i].name_i_ + c0_position) * paper()->internote_f ();
- Atom a (paper()->lookup_l ()->accidental (accs[i].accidental_i_));
+ Real dy = (accs[i].notename_i_ + c0_position_i_) * paper()->internote_f ();
+ Atom a (lookup_l ()->accidental (accs[i].accidental_i_));
a.translate_axis (dy, Y_AXIS);
Molecule m(a);
{
Real dy =lastoct*7*paper()->internote_f ();
octave_mol_p->translate_axis (dy, Y_AXIS);
- output->add (*octave_mol_p);
+ output->add_molecule (*octave_mol_p);
delete octave_mol_p;
}
if (accs.size())
{
Box b(Interval (0, paper()->internote_f ()), Interval (0,0));
- Molecule m (paper()->lookup_l ()->fill (b));
+ Molecule m (lookup_l ()->fill (b));
output->add_at_edge (X_AXIS, RIGHT, m);
}
Interval x_int;
for (int i=0; i < support_items_.size(); i++)
{
- Axis_group_element *common =
+ Graphical_axis_group *common =
common_group (support_items_[i], X_AXIS);
Real x = support_items_[i]->relative_coordinate (common, X_AXIS)
return output;
}
-int
-Local_acc::compare (Local_acc&a, Local_acc&b)
-{
- 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);
void
-Local_key_item::do_substitute_dependency (Score_elem*o,Score_elem*n)
+Local_key_item::do_substitute_dependency (Score_element*o,Score_element*n)
{
- Item* o_l = o->item();
- Item* n_l = n?n->item():0;
+ Item* o_l = o->access_Item ();
+ Item* n_l = n?n->access_Item ():0;
support_items_.substitute (o_l, n_l);
}