X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-signature-interface.cc;h=621412396f84f3329c7ce20e97f3e6d61e5391eb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=d6513efd84b1b6ad96ea0bb83d3c305c46f23e23;hpb=03ce3667568361ee7433032988a4089c64de2ec7;p=lilypond.git diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc index d6513efd84..621412396f 100644 --- a/lily/key-signature-interface.cc +++ b/lily/key-signature-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2006 Han-Wen Nienhuys + (c) 1996--2008 Han-Wen Nienhuys keyplacement by Mats Bengtsson */ @@ -15,72 +15,14 @@ #include "lookup.hh" #include "output-def.hh" #include "staff-symbol-referencer.hh" +#include "rational.hh" struct Key_signature_interface { DECLARE_SCHEME_CALLBACK (print, (SCM)); - - DECLARE_GROB_INTERFACE(); + DECLARE_GROB_INTERFACE (); }; -/* - 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 */ - -/* - TODO: look this up. I'm not sure where the naturals ought to go. - - COMMENT: Current implementation does not use the NATURAL_TOP_PITCH for anything, - always typesets naturals in the same place as the thing they cancel. -rz -*/ -const int NATURAL_TOP_PITCH = 4; - -/* - FIXME: key-item should just get a list of (position, acc), and leave - the thinking to other parties. - - - TODO: put this in Scheme - - TODO: can we do without c0pos? it's partly musical. -*/ -int -alteration_pos (SCM what, int alter, int c0p) -{ - if (scm_is_pair (what)) - return scm_to_int (scm_car (what)) * 7 + scm_to_int (scm_cdr (what)) + c0p; - - int p = scm_to_int (what); - - // 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 ((alter < 0 && ((p > FLAT_TOP_PITCH) || (p + c0 > 4)) && (p + c0 > 1)) - || (alter > 0 && ((p > SHARP_TOP_PITCH) || (p + c0 > 5)) && (p + c0 > 2)) - || (alter == 0 && ((p > NATURAL_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 && alter > 0 && p == 3) - p -= 7; - if (c0==-3 && alter > 0 && p ==-1) - p += 7; - if (c0==-4 && alter < 0 && p ==-1) - p += 7; - if (c0==-2 && alter < 0 && p ==-3) - p += 7; - - return p + c0; -} /* TODO @@ -101,13 +43,9 @@ Key_signature_interface::print (SCM smob) else style = ""; - SCM newas = me->get_property ("alteration-alist"); Stencil mol; SCM c0s = me->get_property ("c0-position"); - int c0p = 0; - if (scm_is_number (c0s)) - c0p = scm_to_int (c0s); bool is_cancellation = me->internal_has_interface (ly_symbol2scm ("key-cancellation-interface")); @@ -118,23 +56,39 @@ Key_signature_interface::print (SCM smob) */ int last_pos = -1000; + SCM last_glyph_name = SCM_BOOL_F; + SCM padding_pairs = me->get_property ("padding-pairs"); + Font_metric *fm = Font_interface::get_default_font (me); - for (SCM s = newas; scm_is_pair (s); s = scm_cdr (s)) + SCM alist = me->get_property ("glyph-name-alist"); + + for (SCM s = me->get_property ("alteration-alist"); scm_is_pair (s); s = scm_cdr (s)) { - int alteration = scm_to_int (scm_cdar (s)); - string font_char - = Accidental_interface::get_fontcharname (style, - is_cancellation - ? 0 - : alteration); - Stencil acc (fm->find_by_name ("accidentals." + font_char)); + SCM alt = is_cancellation + ? scm_from_int (0) + : scm_cdar (s); + + SCM glyph_name_scm = ly_assoc_get (alt, alist, SCM_BOOL_F); + if (!scm_is_string (glyph_name_scm)) + { + me->warning (_f ("No glyph found for alteration: %s", + ly_scm2rational (alt).to_string ().c_str ())); + continue; + } + + string glyph_name = ly_scm2string (glyph_name_scm); + + Stencil acc (fm->find_by_name (glyph_name)); if (acc.is_empty ()) - me->warning (_f ("accidental `%s' not found", font_char)); + me->warning (_ ("alteration not found")); else { SCM what = scm_caar (s); - int pos = alteration_pos (what, alteration, c0p); + + SCM proc = ly_lily_module_constant ("key-signature-interface::alteration-position"); + + int pos = scm_to_int (scm_call_3 (proc, what, scm_cdar (s), c0s)); acc.translate_axis (pos * inter, Y_AXIS); /* @@ -142,14 +96,21 @@ Key_signature_interface::print (SCM smob) has vertical edges on both sides. A little padding is needed to prevent collisions. */ - Real padding = 0.0; - if (is_cancellation + Real padding = robust_scm2double (me->get_property ("padding"), + 0.0); + SCM handle = scm_assoc (scm_cons (glyph_name_scm, last_glyph_name), + padding_pairs); + if (scm_is_pair (handle)) + padding = robust_scm2double (scm_cdr (handle), 0.0); + else if (glyph_name == "accidentals.natural" && last_pos < pos + 2 && last_pos > pos - 6) - padding = 0.3; + padding += 0.3; - mol.add_at_edge (X_AXIS, LEFT, acc, padding, 0); + mol.add_at_edge (X_AXIS, LEFT, acc, padding); + last_pos = pos; + last_glyph_name = glyph_name_scm; } } @@ -161,7 +122,11 @@ Key_signature_interface::print (SCM smob) ADD_INTERFACE (Key_signature_interface, "A group of accidentals, to be printed as signature sign.", + /* properties */ + "alteration-alist " "c0-position " + "glyph-name-alist " + "padding " + "padding-pairs " "style " - "alteration-alist " );