X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=26909e72a09601325148dca6f495f2dc1e1abe41;hb=38189e6a227753ee6dca31aac448d97071a8551d;hp=31259da703fdb8f111db59c2572e4724cd3b4241;hpb=afc519eae4c31fe515371ec68b077d6532a7e5cf;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 31259da703..26909e72a0 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -2,15 +2,16 @@ accidental.cc -- implement Accidental_interface source file of the GNU LilyPond music typesetter - - (c) 2001--2004 Han-Wen Nienhuys + + (c) 2001--2005 Han-Wen Nienhuys */ + +#include "accidental-interface.hh" #include "font-interface.hh" #include "item.hh" -#include "stencil.hh" -#include "accidental-interface.hh" #include "output-def.hh" #include "pitch.hh" +#include "stencil.hh" /* TODO: insert support for smaller cautionaries, tie-break-reminders. @@ -18,44 +19,40 @@ '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 ("accidentals.leftparen"); Stencil close = Font_interface::get_default_font (me)->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, 0); + m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0, 0); return m; } - -MAKE_SCHEME_CALLBACK (Accidental_interface,after_line_breaking,1); +MAKE_SCHEME_CALLBACK (Accidental_interface, after_line_breaking, 1); SCM Accidental_interface::after_line_breaking (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob_grob (smob); Grob *tie = unsmob_grob (me->get_property ("tie")); if (tie && !tie->original_) - { - me->suicide (); - } + me->suicide (); return SCM_UNSPECIFIED; } Array -Accidental_interface::accurate_boxes (Grob *a, Grob**common) +Accidental_interface::accurate_boxes (Grob *a, Grob **common) { Box b; b[X_AXIS] = a->extent (a, X_AXIS); b[Y_AXIS] = a->extent (a, Y_AXIS); Array boxes; - + bool parens = false; if (to_boolean (a->get_property ("cautionary"))) { @@ -69,42 +66,64 @@ Accidental_interface::accurate_boxes (Grob *a, Grob**common) && !parens && scm_ilength (accs) == 1) { - if (scm_to_int (scm_car (accs)) == FLAT) + switch (scm_to_int (scm_car (accs))) { - Box stem = b; - Box bulb = b; - + case FLAT: + { + Box stem = b; + Box bulb = b; + + /* + we could make the stem thinner, but that places the flats + 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); + } + break; + case 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 (belly); + boxes.push (lstem); + boxes.push (rstem); + } + break; /* - we could make the stem thinner, but that places the flats - really close. + TODO: add support for, double flat. */ - 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); } - - /* - TODO: add support for natural, double flat. - */ } if (!boxes.size ()) boxes.push (b); - Offset o (a->relative_coordinate (common[X_AXIS], X_AXIS), - a->relative_coordinate (common[Y_AXIS], Y_AXIS)); + 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; } @@ -116,16 +135,14 @@ Accidental_interface::accurate_boxes (Grob *a, Grob**common) /* 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); - } - + return to_string (alteration); + if (style == "hufnagel") switch (alteration) { @@ -154,7 +171,7 @@ Accidental_interface::get_fontcharname (String style, int alteration) case 0: return "vaticana0"; case SHARP: return "mensural1"; } - + if (style == "neomensural") style = ""; // currently same as default if (style == "default") @@ -162,7 +179,7 @@ Accidental_interface::get_fontcharname (String style, int alteration) return style + to_string (alteration); } -MAKE_SCHEME_CALLBACK (Accidental_interface,print,1); +MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1); SCM Accidental_interface::print (SCM smob) { @@ -170,7 +187,7 @@ Accidental_interface::print (SCM smob) bool smaller = false; bool parens = false; - bool caut = to_boolean (me->get_property ("cautionary")); + bool caut = to_boolean (me->get_property ("cautionary")); if (caut) { SCM cstyle = me->get_property ("cautionary-style"); @@ -181,16 +198,12 @@ Accidental_interface::print (SCM smob) SCM scm_style = me->get_property ("style"); String style; if (scm_is_symbol (scm_style)) - { - style = ly_symbol2string (scm_style); - } + style = ly_symbol2string (scm_style); else - { - /* - preferably no name for the default style. - */ - style = ""; - } + /* + preferably no name for the default style. + */ + style = ""; Font_metric *fm = 0; if (smaller) @@ -217,26 +230,20 @@ Accidental_interface::print (SCM smob) Stencil acc (fm->find_by_name ("accidentals." + font_char)); if (acc.is_empty ()) - { - me->warning (_f ("accidental `%s' not found", font_char)); - } + me->warning (_f ("accidental `%s' not found", font_char)); else - { - mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1,0); - } + mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1, 0); } if (parens) - mol = parenthesize (me, mol); + mol = parenthesize (me, mol); return mol.smobbed_copy (); } - /* TODO: should move inside-slur into item? - - */ +*/ ADD_INTERFACE (Accidental_interface, "accidental-interface", - "a single accidental", + "a single accidental", "inside-slur cautionary cautionary-style style tie accidentals");