X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=571c33cbea497e5c8db3cf9eaa305c5b154dc952;hb=1015a0bda2cecf5a2a3940031b6e601653634fda;hp=9d1ad1a34ef1a6c740fcf6d9b2d09f28f1a74d4b;hpb=3471866d047b2e22f6d42eedb936d5eddcb5a06a;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 9d1ad1a34e..571c33cbea 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -1,68 +1,80 @@ -#include "font-interface.hh" -#include "item.hh" -#include "molecule.hh" -#include "accidental-interface.hh" - /* - TODO: insert support for smaller cautionaries, tie-break-reminders. - Either here or in new-accidental-engraver. + accidental.cc -- implement Accidental_interface - 'accidentals should go, for a single 'accidental property -- see - accidental-placement.cc + source file of the GNU LilyPond music typesetter + (c) 2001--2007 Han-Wen Nienhuys */ +#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" -Molecule -parenthesize (Grob*me, Molecule m) +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); +/* 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::after_line_breaking (SCM smob) +Accidental_interface::height (SCM smob) { - Grob *me = unsmob_grob (smob); - Grob *tie = unsmob_grob (me->get_grob_property ("tie")); + return Grob::stencil_height (smob); +} - if (tie && !tie->original_) - { - me->suicide (); - } - return SCM_UNSPECIFIED; +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 (); + + 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 */ + + return visible ? Grob::stencil_height (smob) : ly_interval2scm (Interval ()); } -Array -Accidental_interface::accurate_boxes (Grob *a,Grob**common) +vector +Accidental_interface::accurate_boxes (Grob *me, Grob **common) { Box b; - b[X_AXIS] = a->extent (a, X_AXIS); - b[Y_AXIS] = a->extent (a, Y_AXIS); + b[X_AXIS] = me->extent (me, X_AXIS); + b[Y_AXIS] = me->extent (me, Y_AXIS); - Array boxes; - - bool parens = false; - if (to_boolean (a->get_grob_property ("cautionary"))) - { - SCM cstyle = a->get_grob_property ("cautionary-style"); - parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses")); + vector boxes; - } + bool parens = to_boolean (me->get_property ("parenthesized")); + if (!me->is_live ()) + return boxes; - SCM accs = a->get_grob_property ("accidentals"); - SCM scm_style = a->get_grob_property ("style"); - if (!gh_symbol_p (scm_style) - && !parens - && scm_ilength (accs) == 1) + if (!to_boolean (me->get_property ("restore-first")) + && !parens) { - if (gh_scm2int (gh_car (accs)) == -1) + Rational alteration + = robust_scm2rational (me->get_property ("alteration"), 0); + if (alteration == FLAT_ALTERATION) { Box stem = b; Box bulb = b; @@ -72,95 +84,109 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common) 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 (bulb); - boxes.push (stem); + 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 natural, double flat. - */ + TODO: add support for, double flat. + */ } - if (!boxes.size()) - boxes.push (b); + 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); - Offset o (a->relative_coordinate (common[X_AXIS], X_AXIS), - a->relative_coordinate (common[Y_AXIS], Y_AXIS)); - for(int i = boxes.size(); i--;) - { - boxes[i].translate(o); - } - return boxes; } -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) + Grob *tie = unsmob_grob (me->get_object ("tie")); + + if (tie && !tie->original () + && !to_boolean (me->get_property ("forced"))) { - SCM cstyle = me->get_grob_property ("cautionary-style"); - parens = gh_equal_p (cstyle, ly_symbol2scm ("parentheses")); - smaller = gh_equal_p (cstyle, ly_symbol2scm ("smaller")); + me->suicide (); + return SCM_EOL; } - 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 = ""; - } - + Font_metric *fm = Font_interface::get_default_font (me); - Font_metric *fm = 0; - if (smaller) + 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)) { - SCM ac = Font_interface::font_alist_chain (me); - ac = gh_cons (gh_cons (gh_cons - (ly_symbol2scm ("font-relative-size"), - scm_int2num (-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 ())); + return SCM_EOL; } - else - fm = Font_interface::get_default_font (me); - - Molecule mol; - for (SCM s = me->get_grob_property ("accidentals"); - gh_pair_p (s); s= gh_cdr (s)) + + Stencil mol (fm->find_by_name (scm_i_string_chars (glyph_name))); + if (to_boolean (me->get_property ("restore-first"))) { - SCM entry = gh_car (s); - - - Molecule acc (fm->find_by_name (String ("accidentals-") + - style + - to_string (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 (to_boolean (me->get_property ("parenthesized"))) + mol = parenthesize (me, mol); - if (parens) - 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", + + /* props */ + "alteration " + "avoid-slur " + "forced " + "parenthesized " + "restore-first " + "glyph-name-alist " + "tie " + );