X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=bee99c641d1f966cbe5c62531634d9e594c1decd;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=a54a87efbc3c31e6cf07f1af9902038122439d10;hpb=cd5f9e878b1b29ae9ab5c83f74b0924ce205e120;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index a54a87efbc..bee99c641d 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--2011 Han-Wen Nienhuys - (c) 2001--2006 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" @@ -11,6 +22,7 @@ #include "international.hh" #include "item.hh" #include "output-def.hh" +#include "paper-column.hh" #include "pitch.hh" #include "stencil.hh" @@ -24,29 +36,57 @@ parenthesize (Grob *me, Stencil m) 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); +/* 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::after_line_breaking (SCM smob) +Accidental_interface::height (SCM smob) { - Grob *me = unsmob_grob (smob); - Grob *tie = unsmob_grob (me->get_object ("tie")); + return get_extent (unsmob_grob (smob), Y_AXIS); +} - if (tie && !tie->original () - && !to_boolean (me->get_property ("forced"))) +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 (); + + 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")))) { - me->suicide (); + Stencil *s = unsmob_stencil (get_stencil (me)); + if (s) + return ly_interval2scm (s->extent (Y_AXIS)); } - - return SCM_UNSPECIFIED; + + return ly_interval2scm (Interval ()); } vector @@ -59,14 +99,19 @@ 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) + 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; @@ -75,7 +120,9 @@ Accidental_interface::accurate_boxes (Grob *me, Grob **common) we could make the stem thinner, but that places the flats really close. */ - stem[X_AXIS][RIGHT] *= .5; + Direction bulb_dir = + glyph_name == "accidentals.mirroredflat" ? LEFT : RIGHT; + stem[X_AXIS][bulb_dir] = stem[X_AXIS].center (); /* To prevent vertical alignment for 6ths @@ -86,7 +133,7 @@ Accidental_interface::accurate_boxes (Grob *me, Grob **common) boxes.push_back (bulb); boxes.push_back (stem); } - else if (alteration == NATURAL_ALTERATION) + else if (glyph_name == "accidentals.natural") { Box lstem = b; Box rstem = b; @@ -126,7 +173,22 @@ 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"); @@ -136,11 +198,11 @@ Accidental_interface::print (SCM smob) 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"))) { /* @@ -152,7 +214,7 @@ Accidental_interface::print (SCM smob) if (acc.is_empty ()) 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"))) @@ -163,14 +225,15 @@ Accidental_interface::print (SCM smob) ADD_INTERFACE (Accidental_interface, - "a single accidental", + "A single accidental.", - /* props */ + /* properties */ "alteration " "avoid-slur " "forced " + "glyph-name-alist " + "hide-tied-accidental-after-break " "parenthesized " "restore-first " - "glyph-name-alist " "tie " );