source file of the GNU LilyPond music typesetter
- (c) 1996,1997 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
keyplacement by Mats Bengtsson
*/
+#include "group-interface.hh"
#include "key-item.hh"
-#include "key.hh"
-#include "debug.hh"
#include "molecule.hh"
#include "paper-def.hh"
#include "lookup.hh"
+#include "staff-symbol-referencer.hh"
-#include "key-grav.hh"
-
-const int FLAT_TOP_PITCH=2; /* fes,ges,as and bes typeset in lower octave */
-const int SHARP_TOP_PITCH=4; /* ais and bis typeset in lower octave */
-
-Key_item::Key_item (int c)
+Key_item::Key_item (SCM s)
+ : Item (s)
{
- breakable_b_ =true;
- default_b_ = false;
- set_c_position (c);
+ set_elt_property ("c0-position", gh_int2scm (0));
}
-void
-Key_item::read (Key_engraver const & key_grav_r)
-{
- assert (!key_grav_r.key_.multi_octave_b_);
- const Array<int> &idx_arr =key_grav_r.accidental_idx_arr_;
- for (int i = 0 ; i< idx_arr.size(); i++)
- {
- int note = idx_arr[i];
- int acc = ((Key &) key_grav_r.key_).oct (0).acc (note);
-
- add (note, acc);
- }
-}
-void
-Key_item::set_c_position (int c0)
-{
- int octaves =(abs (c0) / 7) +1 ;
- c_position=(c0 + 7*octaves)%7;
-}
+/*
+ FIXME: too much hardcoding here.
+ */
+const int FLAT_TOP_PITCH=2; /* fes,ges,as and bes typeset in lower octave */
+const int SHARP_TOP_PITCH=4; /* ais and bis typeset in lower octave */
-void
-Key_item::add (int p, int a)
+/*
+ FIXME: key-item should just get a list of (position, acc), and leave
+ the thinking to other parties.
+ */
+int
+Key_item::calculate_position(SCM pair) const
{
- if ((a<0 && p>FLAT_TOP_PITCH) ||
- (a>0 && p>SHARP_TOP_PITCH))
+ int p = gh_scm2int (gh_car (pair));
+ int a = gh_scm2int (gh_cdr (pair));
+
+ if (to_boolean (get_elt_property ("multi-octave")))
{
- p -= 7; /* Typeset below c_position */
+ return p + gh_scm2int (get_elt_property ("c0-position"));
}
- pitch.push (p);
- acc.push (a);
+ else {
+ // 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)))
+ {
+ 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)
-Molecule*
-Key_item::brew_molecule_p() const
+/*
+ TODO
+ - space the `natural' signs wider
+ */
+Molecule
+Key_item::do_brew_molecule () const
{
- Molecule*output = new Molecule;
- Real inter = paper()->internote_f ();
+ Molecule mol;
+
+ Staff_symbol_referencer_interface si (this);
+ Real inter = si.staff_space ()/2.0;
- for (int i =0; i < pitch.size(); i++)
+ SCM newas = get_elt_property ("new-accidentals");
+
+ /*
+ 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))
{
- Atom a =paper()->lookup_l ()->accidental (acc[i]);
- a.translate ((c_position + pitch[i]) * inter, Y_AXIS);
- Molecule m (a);
- output->add_at_edge (X_AXIS, RIGHT, m);
+ 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);
+ mol.add_at_edge (X_AXIS, LEFT, m, 0);
}
- if (pitch.size())
+
+ if (break_status_dir () != RIGHT)
{
- Molecule m (paper()->lookup_l ()->fill (Box (
- Interval (0, paper()->note_width ()),
- Interval (0,0))));
+ SCM old = get_elt_property ("old-accidentals");
+ /*
+ Add half a space between cancellation and key sig.
+
+ As suggested by [Ross], p.148.
+ */
+ Interval x(0, inter);
+ Interval y(0,0);
+
+ mol.add_at_edge (X_AXIS, LEFT, lookup_l()->blank (Box(x,y)),0);
+
+ for (; gh_pair_p (old); old = gh_cdr (old))
+ {
+ SCM found = SCM_EOL;
+
+ /*
+ find correspondences in pitches
+ */
+ for (SCM s = newas; gh_pair_p (s); s = gh_cdr (s))
+ if (gh_caar(s) == gh_caar (old))
+ found = gh_car (s);
+
+ if (found == SCM_EOL || gh_cdr (found) != gh_cdar (old))
+ {
+ Molecule m =lookup_l ()->afm_find ("accidentals-0");
+
+ m.translate_axis (calculate_position(gh_car(old)) * inter, Y_AXIS);
+ mol.add_at_edge (X_AXIS, LEFT, m,0);
+ }
+ }
+
- output->add_at_edge (X_AXIS, RIGHT, m);
}
- return output;
+
+
+ return mol;
}
-IMPLEMENT_IS_TYPE_B1(Key_item,Item);
-void
-Key_item::do_pre_processing()
-{
- if (default_b_)
- {
- transparent_b_ = (break_status_i() != 1);
- set_empty (transparent_b_);
- }
-}
+
+
projects / lilypond.git / blobdiff