X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-signature-interface.cc;h=e345e9d132308b768584cea3daf40919f5439a00;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=6215e03fef46f3be4d681dbc1aa9189aaf69bde5;hpb=7dd7b4513a68ff88dcc52dc7312f9544f009e59e;p=lilypond.git diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc index 6215e03fef..e345e9d132 100644 --- a/lily/key-signature-interface.cc +++ b/lily/key-signature-interface.cc @@ -1,83 +1,39 @@ /* - key-item.cc -- implement Key_signature_interface + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1996--2005 Han-Wen Nienhuys + Copyright (C) 1996--2014 Han-Wen Nienhuys keyplacement by Mats Bengtsson + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ +#include "accidental-interface.hh" +#include "font-interface.hh" +#include "international.hh" #include "item.hh" +#include "lookup.hh" #include "output-def.hh" -#include "font-interface.hh" #include "staff-symbol-referencer.hh" -#include "lookup.hh" -#include "accidental-interface.hh" +#include "rational.hh" struct Key_signature_interface { DECLARE_SCHEME_CALLBACK (print, (SCM)); - - static bool has_interface (Grob *); + 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. -*/ -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 - space the `natural' signs wider @@ -86,68 +42,83 @@ MAKE_SCHEME_CALLBACK (Key_signature_interface, print, 1); SCM Key_signature_interface::print (SCM smob) { - Item *me = dynamic_cast (unsmob_grob (smob)); + Item *me = dynamic_cast (Grob::unsmob (smob)); Real inter = Staff_symbol_referencer::staff_space (me) / 2.0; - SCM scm_style = me->get_property ("style"); - String style; - if (scm_is_symbol (scm_style)) - { - style = ly_symbol2string (scm_style); - } - else - { - style = ""; - } - - SCM newas = me->get_property ("accidentals"); 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")); /* SCM lists are stacks, so we work from right to left, ending with the cancellation signature. */ - int last_pos = -1000; + Slice pos, overlapping_pos; + 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, 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); - acc.translate_axis (pos * inter, Y_AXIS); - - - /* - The natural sign (unlike flat & sharp) - has vertical edges on both sides. A little padding is - needed to prevent collisions. - */ - Real padding = 0.0; - if (alteration == 0 - && last_pos < pos + 2 - && last_pos > pos - 6) - padding = 0.3; - - mol.add_at_edge (X_AXIS, LEFT, acc, padding, 0); - last_pos = pos; - } + { + SCM proc = ly_lily_module_constant ("key-signature-interface::alteration-positions"); + + pos.set_empty (); + Stencil column; + for (SCM pos_list = scm_call_3 (proc, scm_car (s), c0s, smob); + scm_is_pair (pos_list); pos_list = scm_cdr (pos_list)) + { + int p = scm_to_int (scm_car (pos_list)); + pos.add_point (p); + column.add_stencil (acc.translated (Offset (0, p * inter))); + } + /* + The natural sign (unlike flat & sharp) + has vertical edges on both sides. A little padding is + needed to prevent collisions. + */ + 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" + && !intersection (overlapping_pos, pos).is_empty ()) + padding += 0.3; + + mol.add_at_edge (X_AXIS, LEFT, column, padding); + + pos.widen (4); + overlapping_pos = pos + 2; + last_glyph_name = glyph_name_scm; + } } mol.align_to (X_AXIS, LEFT); @@ -155,6 +126,15 @@ Key_signature_interface::print (SCM smob) return mol.smobbed_copy (); } -ADD_INTERFACE (Key_signature_interface, "key-signature-interface", - "A group of accidentals, to be printed as signature sign.", - "style c0-position accidentals"); +ADD_INTERFACE (Key_signature_interface, + "A group of accidentals, to be printed as signature sign.", + + /* properties */ + "alteration-alist " + "c0-position " + "glyph-name-alist " + "flat-positions " + "sharp-positions " + "padding " + "padding-pairs " + );