X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-item.cc;h=2740a77a041440b88caa9da63d3893be274d9c84;hb=e7d84e6728ecfdf74d8f214486a29c2aca199819;hp=0552e50e8f225f33106962ed0d04749f128bbe3d;hpb=8a28f0429e9ce4ce7258156d62261b939edd72d1;p=lilypond.git diff --git a/lily/key-item.cc b/lily/key-item.cc index 0552e50e8f..2740a77a04 100644 --- a/lily/key-item.cc +++ b/lily/key-item.cc @@ -3,18 +3,16 @@ 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 "group-interface.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" const int FLAT_TOP_PITCH=2; /* fes,ges,as and bes typeset in lower octave */ @@ -22,107 +20,97 @@ 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_BOOL_T); - set_c_position (0); + set_elt_property ("c0-position", gh_int2scm (0)); } -int -Key_item::get_c_position () const -{ - // Find the c in the range -4 through 2 - int from_bottom_pos = c0_position_ + 4; - from_bottom_pos = from_bottom_pos%7; - from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive. - return from_bottom_pos - 4; -} - - -void -Key_item::set_c_position (int c0) -{ - c0_position_ = c0; -} - - void Key_item::add (int p, int a) { - pitch_arr_.push (p); - acc_arr_.push (a); + SCM pair = gh_cons (gh_int2scm (p),gh_int2scm (a)); + Group_interface (this, "new-accidentals").add_thing (pair); } void Key_item::add_old (int p, int a) { - old_pitch_arr_.push (p); - old_acc_arr_.push (a); + SCM pair = gh_cons (gh_int2scm (p),gh_int2scm (a)); + Group_interface (this, "old-accidentals").add_thing (pair); } int -Key_item::calculate_position(int p, int a) const +Key_item::calculate_position(SCM pair) const { - if (multi_octave_b_) + int p = gh_scm2int (gh_car (pair)); + int a = gh_scm2int (gh_cdr (pair)); + + if (to_boolean (get_elt_property ("multi-octave"))) { - return p + c0_position_; + return p + gh_scm2int (get_elt_property ("c0-position")); } else { - if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+get_c_position ()>4)) && (p+get_c_position ()>1)) + // 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+get_c_position ()>5)) && (p+get_c_position ()>2))) + (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 (get_c_position ()==2 && a>0 && p==3) + /* 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 (get_c_position ()==-3 && a>0 && p==-1) + if (c0==-3 && a>0 && p==-1) p += 7; - if (get_c_position ()==-4 && a<0 && p==-1) + if (c0==-4 && a<0 && p==-1) p += 7; - if (get_c_position ()==-2 && a<0 && p==-3) + if (c0==-2 && a<0 && p==-3) p += 7; - return p + get_c_position (); + + return p + c0; } } /* TODO - space the `natural' signs wider - - dehair this + */ -Molecule* -Key_item::do_brew_molecule_p() const + +Molecule +Key_item::do_brew_molecule() const { - Molecule*output = new Molecule; + Molecule mol; Staff_symbol_referencer_interface si (this); Real inter = si.staff_space ()/2.0; - int j; - if ((break_status_dir () == LEFT || break_status_dir () == CENTER) - || old_pitch_arr_.size ()) - { - 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 ()->afm_find ("accidentals-0"); - - 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); - } - } + 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)) + { + 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 (break_status_dir () != RIGHT) + { + SCM old = get_elt_property ("old-accidentals"); /* Add half a space between cancellation and key sig. @@ -131,17 +119,33 @@ 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); + 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); + } + } + + } - for (int i =0; i < pitch_arr_.size(); i++) - { - Molecule m = lookup_l ()->afm_find ("accidentals-" + to_str (acc_arr_[i])); - m.translate_axis (calculate_position(pitch_arr_[i], acc_arr_[i]) * inter, Y_AXIS); - output->add_at_edge (X_AXIS, RIGHT, m, 0); - } - return output; + return mol; }