X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=1c2418500d750319a1ca67a76f21503c867f7bd5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6b7c85ada750ad84cc6ecd0d9d2e9ced4d81c0b7;hpb=278b8a09987a041907f1393127b61056a2a69572;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 6b7c85ada7..1c2418500d 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001--2006 Han-Wen Nienhuys + (c) 2001--2008 Han-Wen Nienhuys */ #include "accidental-interface.hh" @@ -11,6 +11,7 @@ #include "international.hh" #include "item.hh" #include "output-def.hh" +#include "paper-column.hh" #include "pitch.hh" #include "stencil.hh" @@ -24,29 +25,56 @@ 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 */ { - 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 +87,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 +108,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 +121,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,20 +161,35 @@ SCM Accidental_interface::print (SCM smob) { Grob *me = unsmob_grob (smob); + Grob *tie = unsmob_grob (me->get_object ("tie")); + if (tie && !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 glyph_name = ly_assoc_get (me->get_property ("alteration"), - alist, SCM_BOOL_F); + 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 ("Could not find glyph-name for alteration"); + 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 (scm_i_string_chars (glyph_name))); + Stencil mol (fm->find_by_name (ly_scm2string (glyph_name))); if (to_boolean (me->get_property ("restore-first"))) { /* @@ -151,7 +201,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"))) @@ -162,9 +212,9 @@ Accidental_interface::print (SCM smob) ADD_INTERFACE (Accidental_interface, - "a single accidental", + "A single accidental.", - /* props */ + /* properties */ "alteration " "avoid-slur " "forced "