X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=77129b6f9dc43dfe30e2d7cfd2b98d76cdba492d;hb=bdd8f85f175a105f83d082a24f838b35c935709b;hp=46d7d53f8bbb750e035280e92d6d3c74b9d41a67;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 46d7d53f8b..77129b6f9d 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--2012 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" @@ -18,60 +29,64 @@ 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 = font->find_by_name ("accidentals.rightparen"); - m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0, 0); - m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0, 0); + m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0); + m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0); return m; } -/* - Hmm. Need separate callback, or perhaps #'live bool property. - */ -MAKE_SCHEME_CALLBACK (Accidental_interface, after_line_breaking, 1); -SCM -Accidental_interface::after_line_breaking (SCM smob) +/* If this gets called before line breaking, we will return a non-trivial + extent even if we belong to a tie and won't actually get printed. */ +static SCM +get_extent (Grob *me, Axis a) { - Grob *me = unsmob_grob (smob); - Grob *tie = unsmob_grob (me->get_object ("tie")); + Stencil *s = unsmob_stencil (Accidental_interface::get_stencil (me)); - if (tie && !tie->original () - && !to_boolean (me->get_property ("forced"))) - { - me->suicide (); - } - - return SCM_UNSPECIFIED; + if (s) + return ly_interval2scm (s->extent (a)); + return ly_interval2scm (Interval ()); } -/* 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); SCM Accidental_interface::height (SCM smob) { - return Grob::stencil_height (smob); + return get_extent (unsmob_grob (smob), Y_AXIS); +} + +MAKE_SCHEME_CALLBACK (Accidental_interface, width, 1); +SCM +Accidental_interface::width (SCM smob) +{ + return get_extent (unsmob_grob (smob), X_AXIS); } 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 (unsmob_grob (smob)); int start = scm_to_int (start_scm); int rank = me->get_column ()->get_rank (); - 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 */ + if (to_boolean (me->get_property ("forced")) + || !unsmob_grob (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)); + if (s) + return ly_interval2scm (s->extent (Y_AXIS)); + } - return visible ? Grob::stencil_height (smob) : ly_interval2scm (Interval ()); + return ly_interval2scm (Interval ()); } vector @@ -84,53 +99,60 @@ Accidental_interface::accurate_boxes (Grob *me, Grob **common) vector boxes; 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")) + if (!to_boolean (me->get_property ("restore-first")) && !parens) { - Rational alteration = ly_scm2rational (me->get_property ("alteration")); - 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); - } + 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. + TODO: add support for, double flat. */ } @@ -138,7 +160,7 @@ Accidental_interface::accurate_boxes (Grob *me, Grob **common) boxes.push_back (b); Offset o (me->relative_coordinate (common[X_AXIS], X_AXIS), - me->relative_coordinate (common[Y_AXIS], Y_AXIS)); + me->relative_coordinate (common[Y_AXIS], Y_AXIS)); for (vsize i = boxes.size (); i--;) boxes[i].translate (o); @@ -151,51 +173,66 @@ SCM Accidental_interface::print (SCM smob) { Grob *me = unsmob_grob (smob); + Grob *tie = unsmob_grob (me->get_object ("tie")); + + 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; + } + 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); - + if (!scm_is_string (glyph_name)) { me->warning (_f ("Could not find glyph-name for alteration %s", - ly_scm2rational (alt).to_string ().c_str ())); + ly_scm_write_string (alt).c_str ())); return SCM_EOL; } - - Stencil mol (fm->find_by_name (scm_i_string_chars (glyph_name))); + + Stencil 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, 0); + 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 " + "hide-tied-accidental-after-break " + "parenthesized " + "restore-first " + "tie " + );