X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=4343c2dc5a9bf75e473b4d31c7b8a454b3910f2e;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=3cc399f84d30f03d2fee4b25d51d617bc06ff317;hpb=28f3294954eff1f263d3b2e3de1c520f4d2fbdfc;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 3cc399f84d..4343c2dc5a 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2001--2012 Han-Wen Nienhuys + Copyright (C) 2001--2015 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 @@ -25,6 +25,8 @@ #include "paper-column.hh" #include "pitch.hh" #include "stencil.hh" +#include "system.hh" +#include "skyline-pair.hh" Stencil parenthesize (Grob *me, Stencil m) @@ -42,146 +44,84 @@ parenthesize (Grob *me, Stencil m) return m; } -/* 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) +MAKE_SCHEME_CALLBACK (Accidental_interface, horizontal_skylines, 1); +SCM +Accidental_interface::horizontal_skylines (SCM smob) { - Stencil *s = unsmob_stencil (Accidental_interface::get_stencil (me)); + Grob *me = unsmob (smob); + if (!me->is_live ()) + return Skyline_pair ().smobbed_copy (); + + Stencil *my_stencil = unsmob (me->get_property ("stencil")); + if (!my_stencil) + return Skyline_pair ().smobbed_copy (); - if (s) - return ly_interval2scm (s->extent (a)); - return ly_interval2scm (Interval ()); + Skyline_pair *sky = + 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, height, 1); SCM Accidental_interface::height (SCM 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); -} + Grob *me = unsmob (smob); + Grob *tie = unsmob (me->get_object ("tie")); -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 (); - - 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)); - } + if (tie + && !to_boolean (me->get_property ("forced")) + && to_boolean (me->get_property ("hide-tied-accidental-after-break"))) + return ly_interval2scm (Interval ()); - return ly_interval2scm (Interval ()); + return Grob::stencil_height (smob); } -vector -Accidental_interface::accurate_boxes (Grob *me, Grob **common) +MAKE_SCHEME_CALLBACK (Accidental_interface, remove_tied, 1); +SCM +Accidental_interface::remove_tied (SCM smob) { - 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); + Grob *me = unsmob (smob); + Grob *tie = unsmob (me->get_object ("tie")); - 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); + 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")); - - 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; - } + Grob *me = unsmob (smob); return get_stencil (me); } @@ -194,15 +134,17 @@ 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; + mol = fm->find_by_name ("noteheads.s1cross"); } + else + mol = fm->find_by_name (ly_scm2string (glyph_name)); - Stencil mol (fm->find_by_name (ly_scm2string (glyph_name))); if (to_boolean (me->get_property ("restore-first"))) { /*