keyplacement by Mats Bengtsson
*/
-#include "group-interface.hh"
+#include "item.hh"
#include "key-item.hh"
#include "molecule.hh"
#include "paper-def.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
#include "staff-symbol-referencer.hh"
-
-Key_item::Key_item (SCM s)
- : Item (s)
-{
- set_elt_property ("c0-position", gh_int2scm (0));
-}
-
+#include "lookup.hh"
/*
FIXME: too much hardcoding here.
the thinking to other parties.
*/
int
-Key_item::calculate_position(SCM pair) const
+Key_item::calculate_position(Grob *ki, SCM pair)
{
- SCM note = gh_car (pair);
- if (gh_pair_p (note))
- {
- int o = gh_scm2int (gh_car (note));
- int p = gh_scm2int (gh_cdr (note));
- return p + o*7 + gh_scm2int (get_elt_property ("c0-position"));
- }
- int p = gh_scm2int (note);
+ int p = gh_scm2int (gh_car (pair));
int a = gh_scm2int (gh_cdr (pair));
-
- // Find the c in the range -4 through 2
- int from_bottom_pos = gh_scm2int (get_elt_property ("c0-position")) + 4;
- from_bottom_pos = from_bottom_pos%7;
- from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive.
- int c0 = from_bottom_pos - 4;
-
-
- if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+c0>4)) && (p+c0>1))
- ||
- (a>0 && ((p>SHARP_TOP_PITCH) || (p+c0>5)) && (p+c0>2)))
+ int c0p = gh_scm2int (ki->get_grob_property ("c0-position"));
+ if (to_boolean (ki->get_grob_property ("multi-octave")))
{
- p -= 7; /* Typeset below c_position */
+ return p + c0p;
}
- /* Provide for the four cases in which there's a glitch
- it's a hack, but probably not worth
- the effort of finding a nicer solution.
- --dl. */
- if (c0==2 && a>0 && p==3)
- p -= 7;
- if (c0==-3 && a>0 && p==-1)
- p += 7;
- if (c0==-4 && a<0 && p==-1)
- p += 7;
- if (c0==-2 && a<0 && p==-3)
- p += 7;
-
- return p + c0;
+ else {
+ // Find the c in the range -4 through 2
+ int from_bottom_pos = c0p + 4;
+ from_bottom_pos = from_bottom_pos%7;
+ from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive.
+ int c0 = from_bottom_pos - 4;
+
+
+ if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+c0>4)) && (p+c0>1))
+ ||
+ (a>0 && ((p>SHARP_TOP_PITCH) || (p+c0>5)) && (p+c0>2)))
+ {
+ p -= 7; /* Typeset below c_position */
+ }
+ /* Provide for the four cases in which there's a glitch
+ it's a hack, but probably not worth
+ the effort of finding a nicer solution.
+ --dl. */
+ if (c0==2 && a>0 && p==3)
+ p -= 7;
+ if (c0==-3 && a>0 && p==-1)
+ p += 7;
+ if (c0==-4 && a<0 && p==-1)
+ p += 7;
+ if (c0==-2 && a<0 && p==-3)
+ p += 7;
+
+ return p + c0;
+ }
}
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACKS(Key_item)
-
/*
TODO
- space the `natural' signs wider
*/
-Molecule
-Key_item::do_brew_molecule () const
+MAKE_SCHEME_CALLBACK(Key_item,brew_molecule,1);
+SCM
+Key_item::brew_molecule (SCM smob)
{
- Molecule mol;
+ Grob*me =unsmob_element (smob);
- Staff_symbol_referencer_interface si (this);
- Real inter = si.staff_space ()/2.0;
-
- SCM newas = get_elt_property ("new-accidentals");
+ Real inter = Staff_symbol_referencer::staff_space (me)/2.0;
+
+ SCM newas = me->get_grob_property ("new-accidentals");
+ Molecule mol;
/*
SCM lists are stacks, so we work from right to left, ending with
the cancellation signature.
for (SCM s = newas; gh_pair_p (s); s = gh_cdr (s))
{
int a = gh_scm2int (gh_cdar (s));
- Molecule m = lookup_l ()->afm_find ("accidentals-" + to_str (a));
- m.translate_axis (calculate_position(gh_car (s)) * inter, Y_AXIS);
+ Molecule m = Font_interface::get_default_font (me)->find_by_name ("accidentals-" + to_str (a));
+ m.translate_axis (calculate_position(me, gh_car (s)) * inter, Y_AXIS);
mol.add_at_edge (X_AXIS, LEFT, m, 0);
}
-
- if (break_status_dir () != RIGHT)
+
+ Item *it = dynamic_cast<Item*> (me) ;
+ if (it->break_status_dir () != RIGHT)
{
- SCM old = get_elt_property ("old-accidentals");
+ SCM old = me->get_grob_property ("old-accidentals");
/*
Add half a space between cancellation and key sig.
Interval x(0, inter);
Interval y(0,0);
- mol.add_at_edge (X_AXIS, LEFT, lookup_l()->blank (Box(x,y)),0);
+ mol.add_at_edge (X_AXIS, LEFT, Lookup::blank (Box(x,y)),0);
for (; gh_pair_p (old); old = gh_cdr (old))
{
if (found == SCM_EOL || gh_cdr (found) != gh_cdar (old))
{
- Molecule m =lookup_l ()->afm_find ("accidentals-0");
+ Molecule m =Font_interface::get_default_font (me)->find_by_name ("accidentals-0");
- m.translate_axis (calculate_position(gh_car(old)) * inter, Y_AXIS);
+ m.translate_axis (calculate_position (me, gh_car (old)) * inter, Y_AXIS);
mol.add_at_edge (X_AXIS, LEFT, m,0);
}
}
-
-
}
-
- return mol;
+ return mol.smobbed_copy();
}
+
+bool
+Key_item::has_interface (Grob*m)
+{
+ return m && m->has_interface (ly_symbol2scm ("key-signature-interface"));
+}
+
+void
+Key_item::set_interface (Grob*m)
+{
+ m->set_interface (ly_symbol2scm ("key-signature-interface"));
+}