X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=bee99c641d1f966cbe5c62531634d9e594c1decd;hb=b69dbbc66da069134b9e1e4047cbf74d5a9ac50b;hp=44c26da035f059763ccc3ccb519c6eb669af01aa;hpb=b1a2da9808d72008166aec4c7af9f923ca38064b;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 44c26da035..bee99c641d 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -1,70 +1,239 @@ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2001--2011 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" #include "font-interface.hh" +#include "international.hh" #include "item.hh" -#include "molecule.hh" +#include "output-def.hh" +#include "paper-column.hh" +#include "pitch.hh" +#include "stencil.hh" -class Accidental_interface +Stencil +parenthesize (Grob *me, Stencil m) { -public: - DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM)); - static bool has_interface (Grob*); -}; + 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"); -Molecule -parenthesize (Grob*me, Molecule 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); + 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,brew_molecule,1); +/* 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) +{ + Stencil *s = unsmob_stencil (Accidental_interface::get_stencil (me)); + + if (s) + return ly_interval2scm (s->extent (a)); + return ly_interval2scm (Interval ()); +} + +MAKE_SCHEME_CALLBACK (Accidental_interface, height, 1); SCM -Accidental_interface::brew_molecule (SCM smob) +Accidental_interface::height (SCM smob) { - Grob *me = unsmob_grob (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)); + int start = scm_to_int (start_scm); + int rank = me->get_column ()->get_rank (); - SCM scm_style = me->get_grob_property ("style"); - - String style; - if (gh_symbol_p (scm_style)) + 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")))) { - style = ly_scm2string (scm_symbol_to_string (scm_style)); + Stencil *s = unsmob_stencil (get_stencil (me)); + if (s) + return ly_interval2scm (s->extent (Y_AXIS)); } - else + + 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); + } /* - preferably no name for the default style. - */ - style = ""; + TODO: add support for, double flat. + */ } - - Molecule mol; - for (SCM s = me->get_grob_property ("accidentals"); - gh_pair_p (s); s= gh_cdr (s)) + 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")); + + if (tie && + (to_boolean (me->get_property ("hide-tied-accidental-after-break")) + || (!tie->original () && !to_boolean (me->get_property ("forced"))))) { - SCM entry = gh_car (s); - - - Molecule acc (Font_interface::get_default_font (me)-> - find_by_name (String ("accidentals-") + - style + - to_str (gh_scm2int(entry)))); - - mol.add_at_edge (X_AXIS, RIGHT, acc, 0.0); + me->suicide (); + return SCM_EOL; } - if (to_boolean (me->get_grob_property ("parenthesize"))) - mol = parenthesize (me, mol); - - return mol.smobbed_copy(); + 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_scm_write_string (alt).c_str ())); + return SCM_EOL; + } + + 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. + */ + 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 (to_boolean (me->get_property ("parenthesized"))) + mol = parenthesize (me, mol); -ADD_INTERFACE(Accidental_interface, "accidental-interface", - "a single accidental", - "accidentals parenthesize"); + return mol.smobbed_copy (); +} + + +ADD_INTERFACE (Accidental_interface, + "A single accidental.", + + /* properties */ + "alteration " + "avoid-slur " + "forced " + "glyph-name-alist " + "hide-tied-accidental-after-break " + "parenthesized " + "restore-first " + "tie " + );