X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=06873f070547d7e03020c30ba2bf3b64a437dbc5;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=3bfd1b816d1e91f15f7257979381efde7df3c53d;hpb=91f01637f31c7d904fd8016b49184e935bf1c8ab;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 3bfd1b816d..06873f0705 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -1,9 +1,20 @@ /* - accidental.cc -- implement Accidental_interface + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2001--2015 Han-Wen Nienhuys - (c) 2001--2007 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 . */ #include "accidental-interface.hh" @@ -14,12 +25,14 @@ #include "paper-column.hh" #include "pitch.hh" #include "stencil.hh" +#include "system.hh" +#include "skyline-pair.hh" Stencil parenthesize (Grob *me, Stencil m) { - Font_metric * font - = Font_interface::get_default_font (me); + Font_metric *font + = Font_interface::get_default_font (me); Stencil open = font->find_by_name ("accidentals.leftparen"); Stencil close @@ -31,164 +44,138 @@ parenthesize (Grob *me, Stencil m) return m; } - -/* This callback exists for the sole purpose of allowing us to override - its pure equivalent to accidental-interface::pure-height */ -MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1); +MAKE_SCHEME_CALLBACK (Accidental_interface, horizontal_skylines, 1); SCM -Accidental_interface::height (SCM smob) +Accidental_interface::horizontal_skylines (SCM smob) { - return Grob::stencil_height (smob); -} + Grob *me = Grob::unsmob (smob); + if (!me->is_live ()) + return Skyline_pair ().smobbed_copy (); -MAKE_SCHEME_CALLBACK (Accidental_interface, pure_height, 3); -SCM -Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM) -{ - Item *me = dynamic_cast (unsmob_grob (smob)); - int start = scm_to_int (start_scm); - int rank = me->get_column ()->get_rank (); + Stencil *my_stencil = Stencil::unsmob (me->get_property ("stencil")); + if (!my_stencil) + return Skyline_pair ().smobbed_copy (); - bool visible = to_boolean (me->get_property ("forced")) - || !unsmob_grob (me->get_object ("tie")) - || rank != start + 1; /* we are in the middle of a line */ + Skyline_pair *sky = + Skyline_pair::unsmob + (Stencil::skylines_from_stencil + (my_stencil->smobbed_copy (), 0.0, Y_AXIS)); - return visible ? Grob::stencil_height (smob) : ly_interval2scm (Interval ()); + 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") + { + // 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 (); } -vector -Accidental_interface::accurate_boxes (Grob *me, Grob **common) +MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1); +SCM +Accidental_interface::height (SCM smob) { - Box b; - b[X_AXIS] = me->extent (me, X_AXIS); - b[Y_AXIS] = me->extent (me, Y_AXIS); - - vector boxes; + Grob *me = Grob::unsmob (smob); + Grob *tie = Grob::unsmob (me->get_object ("tie")); - bool parens = to_boolean (me->get_property ("parenthesized")); - if (!me->is_live ()) - return boxes; - - SCM scm_style = me->get_property ("style"); - if (!scm_is_symbol (scm_style) - && !to_boolean (me->get_property ("restore-first")) - && !parens) - { - Rational alteration - = robust_scm2rational (me->get_property ("alteration"), 0); - if (alteration == FLAT_ALTERATION) - { - Box stem = b; - Box bulb = b; - - /* - we could make the stem thinner, but that places the flats - really close. - */ - stem[X_AXIS][RIGHT] *= .5; - - /* - To prevent vertical alignment for 6ths - */ - stem[Y_AXIS] *= 1.1; - bulb[Y_AXIS][UP] *= .35; - - boxes.push_back (bulb); - boxes.push_back (stem); - } - else if (alteration == NATURAL_ALTERATION) - { - Box lstem = b; - Box rstem = b; - Box belly = b; - - lstem[Y_AXIS] *= 1.1; - rstem[Y_AXIS] *= 1.1; - - belly[Y_AXIS] *= 0.75; - lstem[X_AXIS][RIGHT] *= .33; - rstem[X_AXIS][LEFT] = rstem[X_AXIS].linear_combination (1.0 / 3.0); - lstem[Y_AXIS][DOWN] = belly[Y_AXIS][DOWN]; - rstem[Y_AXIS][UP] = belly[Y_AXIS][UP]; - boxes.push_back (belly); - boxes.push_back (lstem); - boxes.push_back (rstem); - } - /* - TODO: add support for, double flat. - */ - } + if (tie + && !to_boolean (me->get_property ("forced")) + && to_boolean (me->get_property ("hide-tied-accidental-after-break"))) + return ly_interval2scm (Interval ()); - if (!boxes.size ()) - boxes.push_back (b); + return Grob::stencil_height (smob); +} - Offset o (me->relative_coordinate (common[X_AXIS], X_AXIS), - me->relative_coordinate (common[Y_AXIS], Y_AXIS)); +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")); - for (vsize i = boxes.size (); i--;) - boxes[i].translate (o); + if (tie + && !to_boolean (me->get_property ("forced")) + && (to_boolean (me->get_property ("hide-tied-accidental-after-break")) + || !tie->original())) + me->suicide (); - return boxes; + return SCM_UNSPECIFIED; } MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1); SCM Accidental_interface::print (SCM smob) { - Grob *me = unsmob_grob (smob); - Grob *tie = unsmob_grob (me->get_object ("tie")); + Grob *me = Grob::unsmob (smob); - if (tie && !tie->original () - && !to_boolean (me->get_property ("forced"))) - { - me->suicide (); - return SCM_EOL; - } - + 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; + if (!scm_is_string (glyph_name)) { me->warning (_f ("Could not find glyph-name for alteration %s", - ly_scm_write_string (alt).c_str ())); - return SCM_EOL; + ly_scm_write_string (alt).c_str ())); + mol = fm->find_by_name ("noteheads.s1cross"); } - - Stencil mol (fm->find_by_name (scm_i_string_chars (glyph_name))); + else + mol = fm->find_by_name (ly_scm2string (glyph_name)); + if (to_boolean (me->get_property ("restore-first"))) { /* - this isn't correct for ancient accidentals, but they don't - use double flats/sharps anyway. - */ + 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")); + me->warning (_ ("natural alteration glyph not found")); else - mol.add_at_edge (X_AXIS, LEFT, acc, 0.1); + mol.add_at_edge (X_AXIS, LEFT, acc, 0.1); } - + if (to_boolean (me->get_property ("parenthesized"))) mol = parenthesize (me, mol); return mol.smobbed_copy (); } - ADD_INTERFACE (Accidental_interface, - "a single accidental", - - /* props */ - "alteration " - "avoid-slur " - "forced " - "parenthesized " - "restore-first " - "glyph-name-alist " - "tie " - ); + "A single accidental.", + + /* properties */ + "alteration " + "avoid-slur " + "forced " + "glyph-name-alist " + "glyph-name " + "hide-tied-accidental-after-break " + "parenthesized " + "restore-first " + "tie " + );