X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=46d7d53f8bbb750e035280e92d6d3c74b9d41a67;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=3792933d873599d6c734dabc1d1fccdb6f8dbfa8;hpb=7cb049f7f3705e414c2a49c7cf14f43a51914c48;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 3792933d87..06873f0705 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -1,115 +1,181 @@ -#include "font-interface.hh" -#include "item.hh" -#include "molecule.hh" - /* - TODO: insert support for smaller cautionaries, tie-break-reminders. - Either here or in new-accidental-engraver. + This file is part of LilyPond, the GNU music typesetter. - 'accidentals should go, for a single 'accidental property -- see - accidental-placement.cc + Copyright (C) 2001--2015 Han-Wen Nienhuys + 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 . */ -class Accidental_interface -{ -public: - DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM)); - DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); - static bool has_interface (Grob*); -}; - -Molecule -parenthesize (Grob*me, Molecule m) + +#include "accidental-interface.hh" +#include "font-interface.hh" +#include "international.hh" +#include "item.hh" +#include "output-def.hh" +#include "paper-column.hh" +#include "pitch.hh" +#include "stencil.hh" +#include "system.hh" +#include "skyline-pair.hh" + +Stencil +parenthesize (Grob *me, Stencil m) { - Molecule open = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-leftparen")); - Molecule close = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-rightparen")); - m.add_at_edge (X_AXIS, LEFT, Molecule (open), 0); - m.add_at_edge (X_AXIS, RIGHT, Molecule (close), 0); + Font_metric *font + = Font_interface::get_default_font (me); + Stencil open + = font->find_by_name ("accidentals.leftparen"); + Stencil close + = font->find_by_name ("accidentals.rightparen"); + + m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0); + m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0); return m; } - -MAKE_SCHEME_CALLBACK (Accidental_interface,after_line_breaking,1); +MAKE_SCHEME_CALLBACK (Accidental_interface, horizontal_skylines, 1); SCM -Accidental_interface::after_line_breaking (SCM smob) +Accidental_interface::horizontal_skylines (SCM smob) { - Grob *me = unsmob_grob (smob); - Grob *tie = unsmob_grob (me->get_grob_property ("tie")); - - if (tie && !tie->original_l_) + Grob *me = Grob::unsmob (smob); + if (!me->is_live ()) + return Skyline_pair ().smobbed_copy (); + + Stencil *my_stencil = Stencil::unsmob (me->get_property ("stencil")); + if (!my_stencil) + return Skyline_pair ().smobbed_copy (); + + Skyline_pair *sky = + Skyline_pair::unsmob + (Stencil::skylines_from_stencil + (my_stencil->smobbed_copy (), 0.0, Y_AXIS)); + + SCM alist = me->get_property ("glyph-name-alist"); + SCM alt = me->get_property ("alteration"); + string glyph_name = robust_scm2string (ly_assoc_get (alt, alist, SCM_BOOL_F), + ""); + if (glyph_name == "accidentals.flat" + || glyph_name == "accidentals.flatflat") { - me->suicide (); + // a bit more padding for the right of the stem + // we raise the stem horizontally to a bit less than the average + // horizontal "height" of the entire glyph. This will bring flats + // closer to doubleflats, which looks better (MS opinion). + // this should work for all fonts where the flat is not + // completely bizarre + Real left = my_stencil->extent (X_AXIS)[LEFT]; + Real right = my_stencil->extent (X_AXIS)[RIGHT] * 0.375; + Real down = my_stencil->extent (Y_AXIS)[DOWN]; + Real up = my_stencil->extent (Y_AXIS)[UP]; + vector boxes; + boxes.push_back (Box (Interval (left, right), Interval (down, up))); + Skyline merge_with_me (boxes, Y_AXIS, RIGHT); + (*sky)[RIGHT].merge (merge_with_me); } + return sky->smobbed_copy (); +} + +MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1); +SCM +Accidental_interface::height (SCM smob) +{ + Grob *me = Grob::unsmob (smob); + Grob *tie = Grob::unsmob (me->get_object ("tie")); + + if (tie + && !to_boolean (me->get_property ("forced")) + && to_boolean (me->get_property ("hide-tied-accidental-after-break"))) + return ly_interval2scm (Interval ()); + + return Grob::stencil_height (smob); +} + +MAKE_SCHEME_CALLBACK (Accidental_interface, remove_tied, 1); +SCM +Accidental_interface::remove_tied (SCM smob) +{ + Grob *me = Grob::unsmob (smob); + Grob *tie = Grob::unsmob (me->get_object ("tie")); + + if (tie + && !to_boolean (me->get_property ("forced")) + && (to_boolean (me->get_property ("hide-tied-accidental-after-break")) + || !tie->original())) + me->suicide (); + return SCM_UNSPECIFIED; } - -MAKE_SCHEME_CALLBACK (Accidental_interface,brew_molecule,1); + +MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1); SCM -Accidental_interface::brew_molecule (SCM smob) +Accidental_interface::print (SCM smob) { - Grob *me = unsmob_grob (smob); - bool smaller = false; - bool parens = false; - - bool caut = to_boolean (me->get_grob_property ("cautionary")); - if (caut) - { - SCM cstyle = me->get_grob_property ("cautionary-style"); - parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses")); - smaller = gh_equal_p (cstyle, ly_symbol2scm ("smaller")); - } - - SCM scm_style = me->get_grob_property ("style"); - String style; - if (gh_symbol_p (scm_style)) - { - style = ly_scm2string (scm_symbol_to_string (scm_style)); - } - else - { - /* - preferably no name for the default style. - */ - style = ""; - } + Grob *me = Grob::unsmob (smob); + + return get_stencil (me); +} + +SCM +Accidental_interface::get_stencil (Grob *me) +{ + Font_metric *fm = Font_interface::get_default_font (me); + SCM alist = me->get_property ("glyph-name-alist"); + SCM alt = me->get_property ("alteration"); + SCM glyph_name = ly_assoc_get (alt, alist, SCM_BOOL_F); + Stencil mol; - Font_metric *fm = 0; - if (smaller) + if (!scm_is_string (glyph_name)) { - SCM ac = Font_interface::font_alist_chain (me); - ac = gh_cons (gh_cons (gh_cons - (ly_symbol2scm ("font-relative-size"), - gh_int2scm (-1)), SCM_EOL), - ac); - fm = Font_interface::get_font (me, ac); + me->warning (_f ("Could not find glyph-name for alteration %s", + ly_scm_write_string (alt).c_str ())); + mol = fm->find_by_name ("noteheads.s1cross"); } else - fm = Font_interface::get_default_font (me); + mol = fm->find_by_name (ly_scm2string (glyph_name)); - Molecule mol; - for (SCM s = me->get_grob_property ("accidentals"); - gh_pair_p (s); s= gh_cdr (s)) + if (to_boolean (me->get_property ("restore-first"))) { - SCM entry = gh_car (s); - - - Molecule acc (fm->find_by_name (String ("accidentals-") + - style + - to_str (gh_scm2int(entry)))); - - mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1); + /* + this isn't correct for ancient accidentals, but they don't + use double flats/sharps anyway. + */ + Stencil acc (fm->find_by_name ("accidentals.natural")); + + if (acc.is_empty ()) + me->warning (_ ("natural alteration glyph not found")); + else + mol.add_at_edge (X_AXIS, LEFT, acc, 0.1); } - if (parens) - mol = parenthesize (me, mol); + if (to_boolean (me->get_property ("parenthesized"))) + mol = parenthesize (me, mol); - return mol.smobbed_copy(); + return mol.smobbed_copy (); } - - -ADD_INTERFACE (Accidental_interface, "accidental-interface", - "a single accidental", - "cautionary-style style tie accidentals"); +ADD_INTERFACE (Accidental_interface, + "A single accidental.", + + /* properties */ + "alteration " + "avoid-slur " + "forced " + "glyph-name-alist " + "glyph-name " + "hide-tied-accidental-after-break " + "parenthesized " + "restore-first " + "tie " + );