X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-item.cc;h=bb3ad4a377fd2b8b8c03e3648603146ef80d3388;hb=105fd7580334c8f42838ac62504c5f290f3428c5;hp=34061b63838439f593fe3e024705e07af4281ef1;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git diff --git a/lily/key-item.cc b/lily/key-item.cc index 34061b6383..bb3ad4a377 100644 --- a/lily/key-item.cc +++ b/lily/key-item.cc @@ -3,106 +3,101 @@ source file of the GNU LilyPond music typesetter - (c) 1996, 1997--1999 Han-Wen Nienhuys + (c) 1996--2000 Han-Wen Nienhuys keyplacement by Mats Bengtsson */ +#include "item.hh" #include "key-item.hh" -#include "key.hh" -#include "debug.hh" #include "molecule.hh" #include "paper-def.hh" #include "lookup.hh" -#include "musical-pitch.hh" +#include "staff-symbol-referencer.hh" +/* + 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 */ -Key_item::Key_item () -{ - multi_octave_b_ = false; - set_elt_property (breakable_scm_sym, SCM_BOOL_T); - default_b_ = false; - set_c_position (0); -} - -void -Key_item::set_c_position (int c0) -{ - c0_position = c0; - // Find the c in the range -4 through 2 - int from_bottom_pos = c0 + 4; - from_bottom_pos = from_bottom_pos%7; - from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive. - c_position = from_bottom_pos - 4; -} - - -void -Key_item::add (int p, int a) -{ - pitch_arr_.push (p); - acc_arr_.push (a); -} - -void -Key_item::add_old (int p, int a) -{ - old_pitch_arr_.push (p); - old_acc_arr_.push (a); -} - +/* + FIXME: key-item should just get a list of (position, acc), and leave + the thinking to other parties. + */ int -Key_item::calculate_position(int p, int a) const +Key_item::calculate_position(Score_element *ki, SCM pair) { - if (multi_octave_b_) + int p = gh_scm2int (gh_car (pair)); + int a = gh_scm2int (gh_cdr (pair)); + int c0p = gh_scm2int (ki->get_elt_property ("c0-position")); + if (to_boolean (ki->get_elt_property ("multi-octave"))) { - return p + c0_position; + return p + c0p; } else { - if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+c_position>4)) && (p+c_position>1)) + // 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+c_position>5)) && (p+c_position>2))) + (a>0 && ((p>SHARP_TOP_PITCH) || (p+c0>5)) && (p+c0>2))) { p -= 7; /* Typeset below c_position */ } - return p + 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; } } /* TODO - space the `natural' signs wider - - dehair this */ -Molecule* -Key_item::do_brew_molecule_p() const +MAKE_SCHEME_CALLBACK(Key_item,brew_molecule); +SCM +Key_item::brew_molecule (SCM smob) { - Molecule*output = new Molecule; - Real inter = staff_line_leading_f ()/2.0; + Score_element*me =unsmob_element (smob); + + + Real inter = Staff_symbol_referencer::staff_space (me)/2.0; - int j; - if ((break_status_dir () == LEFT || break_status_dir () == CENTER) - || old_pitch_arr_.size ()) + SCM newas = me->get_elt_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)) { - for (int i =0; i < old_pitch_arr_.size(); i++) - { - for (j =0; (j < pitch_arr_.size()) - && (old_pitch_arr_[i] != pitch_arr_[j]); j++) - ; - - if (j == pitch_arr_.size() - || (old_pitch_arr_[i] == pitch_arr_[j] - && old_acc_arr_[i] != acc_arr_[j])) - { - Molecule m =lookup_l ()->accidental (0,false); - m.translate_axis (calculate_position(old_pitch_arr_[i], old_acc_arr_[i]) * inter, Y_AXIS); - output->add_at_edge (X_AXIS, RIGHT, m,0); - } - } + int a = gh_scm2int (gh_cdar (s)); + Molecule m = me->lookup_l ()->afm_find ("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); + } + Item *it = dynamic_cast (me) ; + if (it->break_status_dir () != RIGHT) + { + SCM old = me->get_elt_property ("old-accidentals"); /* Add half a space between cancellation and key sig. @@ -111,37 +106,44 @@ Key_item::do_brew_molecule_p() const Interval x(0, inter); Interval y(0,0); - output->add_at_edge (X_AXIS, RIGHT, lookup_l()->fill (Box(x,y)),0); - } - - for (int i =0; i < pitch_arr_.size(); i++) - { - Molecule m =lookup_l ()->accidental (acc_arr_[i],false); - m.translate_axis (calculate_position(pitch_arr_[i], acc_arr_[i]) * inter, Y_AXIS); - output->add_at_edge (X_AXIS, RIGHT, m, 0); - } - if (pitch_arr_.size()) - { - Molecule m (lookup_l ()->fill (Box ( - Interval (0, paper_l ()->note_width ()), - Interval (0,0)))); + mol.add_at_edge (X_AXIS, LEFT, me->lookup_l()->blank (Box(x,y)),0); - output->add_at_edge (X_AXIS, RIGHT, m,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 =me->lookup_l ()->afm_find ("accidentals-0"); + + m.translate_axis (calculate_position (me, gh_car (old)) * inter, Y_AXIS); + mol.add_at_edge (X_AXIS, LEFT, m,0); + } + } } - return output; + + return mol.create_scheme(); } -void -Key_item::do_pre_processing() + + +bool +Key_item::has_interface (Score_element*m) { - if (default_b_) - { - bool transparent = (break_status_dir() != RIGHT); - set_empty (transparent); + return m && m->has_interface (ly_symbol2scm ("key-signature-interface")); +} - if (transparent) - set_elt_property (transparent_scm_sym, SCM_BOOL_T); - } +void +Key_item::set_interface (Score_element*m) +{ + m->set_interface (ly_symbol2scm ("key-signature-interface")); }