X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=46db4f4f2f0bf51af1694c30dfc0fe3827d014e2;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=79260eed7b45ef3a0390bddcac4039203410cf5b;hpb=e53b6ddc057f5419b4bc6219f0cf6132a487a305;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 79260eed7b..46db4f4f2f 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -2,74 +2,78 @@ accidental.cc -- implement Accidental_interface source file of the GNU LilyPond music typesetter - - (c) 2001--2004 Han-Wen Nienhuys + + (c) 2001--2007 Han-Wen Nienhuys */ + +#include "accidental-interface.hh" #include "font-interface.hh" +#include "international.hh" #include "item.hh" -#include "stencil.hh" -#include "accidental-interface.hh" #include "output-def.hh" +#include "paper-column.hh" #include "pitch.hh" +#include "stencil.hh" -/* - TODO: insert support for smaller cautionaries, tie-break-reminders. - Either here or in new-accidental-engraver. - - 'accidentals should go, for a single 'accidental property -- see - accidental-placement.cc - -*/ Stencil -parenthesize (Grob*me, Stencil m) +parenthesize (Grob *me, Stencil m) { - Stencil open = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-leftparen")); - Stencil close = Font_interface::get_default_font (me)->find_by_name (String ("accidentals-rightparen")); + 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,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; } -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_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_property ("cautionary"))) - { - SCM cstyle = a->get_property ("cautionary-style"); - parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses")); - } + vector boxes; - SCM accs = a->get_property ("accidentals"); - SCM scm_style = a->get_property ("style"); - if (!ly_c_symbol_p (scm_style) - && !parens - && scm_ilength (accs) == 1) + bool parens = to_boolean (me->get_property ("parenthesized")); + + SCM scm_style = me->get_property ("style"); + if (!scm_is_symbol (scm_style) + && !to_boolean (me->get_property ("restore-first")) + && !parens) { - if (scm_to_int (ly_car (accs)) == FLAT) + Rational alteration = ly_scm2rational (me->get_property ("alteration")); + if (alteration == FLAT_ALTERATION) { Box stem = b; Box bulb = b; @@ -82,158 +86,106 @@ Accidental_interface::accurate_boxes (Grob *a,Grob**common) /* To prevent vertical alignment for 6ths - */ - stem[Y_AXIS] *= 1.1; + */ + 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); + boxes.push_back (b); - 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; -} + Offset o (me->relative_coordinate (common[X_AXIS], X_AXIS), + me->relative_coordinate (common[Y_AXIS], Y_AXIS)); -/* - * Some styles do not provide all flavours of accidentals, e.g. there - * is currently no sharp accidental in vaticana style. In these cases - * this function falls back to one of the other styles. - */ + for (vsize i = boxes.size (); i--;) + boxes[i].translate (o); -/* - todo: this sort of stuff in Scheme. --hwn. - */ -String -Accidental_interface::get_fontcharname (String style, int alteration) -{ - if (alteration == DOUBLE_FLAT - || alteration == DOUBLE_SHARP) - { - return to_string (alteration); - } - - if (style == "hufnagel") - switch (alteration) - { - case FLAT: return "hufnagel-1"; - case 0: return "vaticana0"; - case SHARP: return "mensural1"; - } - if (style == "medicaea") - switch (alteration) - { - case FLAT: return "medicaea-1"; - case 0: return "vaticana0"; - case SHARP: return "mensural1"; - } - if (style == "vaticana") - switch (alteration) - { - case FLAT: return "vaticana-1"; - case 0: return "vaticana0"; - case SHARP: return "mensural1"; - } - if (style == "mensural") - switch (alteration) - { - case FLAT: return "mensural-1"; - case 0: return "vaticana0"; - case SHARP: return "mensural1"; - } - - if (style == "neomensural") - style = ""; // currently same as default - if (style == "default") - style = ""; - return style + to_string (alteration); + return boxes; } -MAKE_SCHEME_CALLBACK (Accidental_interface,print,1); +MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1); SCM Accidental_interface::print (SCM smob) { Grob *me = unsmob_grob (smob); - bool smaller = false; - bool parens = false; + Grob *tie = unsmob_grob (me->get_object ("tie")); - bool caut = to_boolean (me->get_property ("cautionary")); - if (caut) + if (tie && !tie->original () + && !to_boolean (me->get_property ("forced"))) { - SCM cstyle = me->get_property ("cautionary-style"); - parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses")); - smaller = ly_c_equal_p (cstyle, ly_symbol2scm ("smaller")); + me->suicide (); + return SCM_EOL; } + + Font_metric *fm = Font_interface::get_default_font (me); - SCM scm_style = me->get_property ("style"); - String style; - if (ly_c_symbol_p (scm_style)) + 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)) { - style = ly_symbol2string (scm_style); + me->warning (_f ("Could not find glyph-name for alteration %s", + ly_scm2rational (alt).to_string ().c_str ())); + return SCM_EOL; } - else + + Stencil mol (fm->find_by_name (scm_i_string_chars (glyph_name))); + if (to_boolean (me->get_property ("restore-first"))) { /* - preferably no name for the default style. - */ - style = ""; - } - - Font_metric *fm = 0; - if (smaller) - { - SCM ac = Font_interface::music_font_alist_chain (me); - ac = scm_cons (scm_list_1 (scm_cons - (ly_symbol2scm ("font-size"), - scm_int2num (-2))), - ac); - fm = select_font (me->get_paper (), ac); - } - else - fm = Font_interface::get_default_font (me); - - Stencil mol; - for (SCM s = me->get_property ("accidentals"); - ly_c_pair_p (s); s = ly_cdr (s)) - { - int alteration = scm_to_int (ly_car (s)); - String font_char = get_fontcharname (style, alteration); - Stencil acc (fm->find_by_name ("accidentals-" + font_char)); + 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 (_f ("accidental `%s' not found", font_char)); - } + me->warning (_ ("natural alteration glyph not found")); else - { - mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1,0); - } + mol.add_at_edge (X_AXIS, LEFT, acc, 0.1); } - - if (parens) - mol = parenthesize (me, mol); + + if (to_boolean (me->get_property ("parenthesized"))) + mol = parenthesize (me, mol); return mol.smobbed_copy (); } - -/* - TODO: should move inside-slur into item? - */ -ADD_INTERFACE (Accidental_interface, "accidental-interface", - "a single accidental", - "inside-slur cautionary cautionary-style style tie accidentals"); +ADD_INTERFACE (Accidental_interface, + "a single accidental", + + /* props */ + "alteration " + "avoid-slur " + "forced " + "parenthesized " + "restore-first " + "glyph-name-alist " + "tie " + );