X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=62f5235b1c4693eb6b4f0fdb8bfd45703e4bdb38;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=7f3a97b4f77153882a5639396f091af9f7fcc498;hpb=edf17353d89f4f6bd831466262402bb9151a26ca;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 7f3a97b4f7..62f5235b1c 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--2014 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,13 @@ #include "paper-column.hh" #include "pitch.hh" #include "stencil.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 @@ -36,7 +48,7 @@ parenthesize (Grob *me, Stencil m) static SCM get_extent (Grob *me, Axis a) { - Stencil *s = unsmob_stencil (Accidental_interface::get_stencil (me)); + Stencil *s = Stencil::unsmob (Accidental_interface::get_stencil (me)); if (s) return ly_interval2scm (s->extent (a)); @@ -47,124 +59,94 @@ MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1); SCM Accidental_interface::height (SCM smob) { - return get_extent (unsmob_grob (smob), Y_AXIS); + return get_extent (Grob::unsmob (smob), Y_AXIS); } MAKE_SCHEME_CALLBACK (Accidental_interface, width, 1); SCM Accidental_interface::width (SCM smob) { - return get_extent (unsmob_grob (smob), X_AXIS); + return get_extent (Grob::unsmob (smob), X_AXIS); +} + +MAKE_SCHEME_CALLBACK (Accidental_interface, horizontal_skylines, 1); +SCM +Accidental_interface::horizontal_skylines (SCM smob) +{ + Grob *me = Grob::unsmob (smob); + if (!me->is_live ()) + return Skyline_pair ().smobbed_copy (); + + /* + * Using the print function may trigger a suicide + * before line breaking. It is therefore `unpure' (c). + * We use the more basic get_stencil. + */ + Stencil *my_stencil = Stencil::unsmob (get_stencil (me)); + 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") + { + // 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, pure_height, 3); SCM Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM) { - Item *me = dynamic_cast (unsmob_grob (smob)); + Item *me = dynamic_cast (Grob::unsmob (smob)); int start = scm_to_int (start_scm); int rank = me->get_column ()->get_rank (); if (to_boolean (me->get_property ("forced")) - || !unsmob_grob (me->get_object ("tie")) - || rank == start + 1) /* we are at the start of a line */ + || !Grob::unsmob (me->get_object ("tie")) + || (rank == start + 1 && /* we are at the start of a line */ + !to_boolean (me->get_property ("hide-tied-accidental-after-break")))) { - Stencil *s = unsmob_stencil (get_stencil (me)); + Stencil *s = Stencil::unsmob (get_stencil (me)); if (s) - return ly_interval2scm (s->extent (Y_AXIS)); + return ly_interval2scm (s->extent (Y_AXIS)); } return ly_interval2scm (Interval ()); } -vector -Accidental_interface::accurate_boxes (Grob *me, Grob **common) -{ - Box b; - b[X_AXIS] = me->extent (me, X_AXIS); - b[Y_AXIS] = me->extent (me, Y_AXIS); - - vector boxes; - - bool parens = to_boolean (me->get_property ("parenthesized")); - if (!me->is_live ()) - return boxes; - - if (!to_boolean (me->get_property ("restore-first")) - && !parens) - { - 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.mirroredflat") - { - Box stem = b; - Box bulb = b; - - /* - we could make the stem thinner, but that places the flats - really close. - */ - Direction bulb_dir = - glyph_name=="accidentals.mirroredflat" ? LEFT : RIGHT; - stem[X_AXIS][bulb_dir] = stem[X_AXIS].center (); - - /* - 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 (glyph_name == "accidentals.natural") - { - 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 (!boxes.size ()) - boxes.push_back (b); - - Offset o (me->relative_coordinate (common[X_AXIS], X_AXIS), - me->relative_coordinate (common[Y_AXIS], Y_AXIS)); - - for (vsize i = boxes.size (); i--;) - boxes[i].translate (o); - - return boxes; -} - 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); + Grob *tie = Grob::unsmob (me->get_object ("tie")); - if (tie && !tie->original () - && !to_boolean (me->get_property ("forced"))) + if (tie + && (to_boolean (me->get_property ("hide-tied-accidental-after-break")) + || (!tie->original () && !to_boolean (me->get_property ("forced"))))) { me->suicide (); return SCM_EOL; @@ -181,45 +163,48 @@ Accidental_interface::get_stencil (Grob *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 (ly_scm2string (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.", - - /* properties */ - "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 " + );