X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=6b9718f61c9ef923c6aaf4aed9bc194a47fcd775;hb=cf5b2dd83e1f12e53181e9b43c62aa2e70137622;hp=755ce60e1054cd3063cd9d67b4e6c05103d908b2;hpb=e7020dbb36a9e9c10bda48e5197213e8a3bacef6;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 755ce60e10..6b9718f61c 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -1,15 +1,18 @@ /* accidental.cc -- implement Accidental_interface - (c) 2001--2004 Han-Wen Nienhuys - - */ + source file of the GNU LilyPond music typesetter + + (c) 2001--2006 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 "paper-def.hh" +#include "output-def.hh" #include "pitch.hh" +#include "stencil.hh" /* TODO: insert support for smaller cautionaries, tie-break-reminders. @@ -17,95 +20,120 @@ '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")); - m.add_at_edge (X_AXIS, LEFT, Stencil (open), 0,0); - m.add_at_edge (X_AXIS, RIGHT, Stencil (close), 0,0); + 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); return m; } - -MAKE_SCHEME_CALLBACK (Accidental_interface,after_line_breaking,1); +/* + Hmm. Need separate callback, or perhaps #'live bool property. + */ +MAKE_SCHEME_CALLBACK (Accidental_interface, after_line_breaking, 1); SCM Accidental_interface::after_line_breaking (SCM smob) { - Grob *me = unsmob_grob (smob); - Grob *tie = unsmob_grob (me->get_property ("tie")); + Grob *me = unsmob_grob (smob); + Grob *tie = unsmob_grob (me->get_object ("tie")); - if (tie && !tie->original_) + if (tie && !tie->original () + && !to_boolean (me->get_property ("forced"))) { me->suicide (); } + return SCM_UNSPECIFIED; } -Array -Accidental_interface::accurate_boxes (Grob *a,Grob**common) +vector +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; - + vector 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")); - + parens = ly_is_equal (cstyle, ly_symbol2scm ("parentheses")); } SCM accs = a->get_property ("accidentals"); SCM scm_style = a->get_property ("style"); - if (!ly_c_symbol_p (scm_style) + if (!scm_is_symbol (scm_style) && !parens && scm_ilength (accs) == 1) { - if (ly_scm2int (ly_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_back (bulb); + boxes.push_back (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_back (belly); + boxes.push_back (lstem); + boxes.push_back (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); + boxes.push_back (b); + + Offset o (a->relative_coordinate (common[X_AXIS], X_AXIS), + a->relative_coordinate (common[Y_AXIS], Y_AXIS)); + for (vsize i = boxes.size (); i--;) + boxes[i].translate (o); - 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; } @@ -117,16 +145,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) +*/ +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) { @@ -155,15 +181,15 @@ Accidental_interface::get_fontcharname (String style, int alteration) case 0: return "vaticana0"; case SHARP: return "mensural1"; } - - if (style == "neo_mensural") + + if (style == "neomensural") style = ""; // currently same as default if (style == "default") style = ""; 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) { @@ -171,67 +197,67 @@ 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"); - parens = ly_c_equal_p (cstyle, ly_symbol2scm ("parentheses")); - smaller = ly_c_equal_p (cstyle, ly_symbol2scm ("smaller")); + parens = ly_is_equal (cstyle, ly_symbol2scm ("parentheses")); + smaller = ly_is_equal (cstyle, ly_symbol2scm ("smaller")); } SCM scm_style = me->get_property ("style"); - String style; - if (ly_c_symbol_p (scm_style)) - { - style = ly_symbol2string (scm_style); - } + string style; + if (scm_is_symbol (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) { - SCM ac = Font_interface::text_font_alist_chain (me); - ac = scm_cons (scm_cons (scm_cons - (ly_symbol2scm ("font-size"), - scm_int2num (-2)), SCM_EOL), - ac); - fm = select_font (me->get_paper (), ac); + SCM ac = Font_interface::music_font_alist_chain (me); + /* + TODO: should calc font-size by adding -2 to current font-size + */ + ac = scm_cons (scm_list_1 (scm_cons + (ly_symbol2scm ("font-size"), + scm_from_int (-2))), + ac); + fm = select_font (me->layout (), 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)) + scm_is_pair (s); s = scm_cdr (s)) { - int alteration = ly_scm2int (ly_car (s)); - String font_char = get_fontcharname (style, alteration); - Stencil acc (fm->find_by_name ("accidentals-" + font_char)); + int alteration = scm_to_int (scm_car (s)); + string font_char = get_fontcharname (style, alteration); + 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 (); } - - -ADD_INTERFACE (Accidental_interface, "accidental-interface", - "a single accidental", - "cautionary cautionary-style style tie accidentals"); +ADD_INTERFACE (Accidental_interface, + "a single accidental", + "accidentals " + "avoid-slur " + "cautionary " + "cautionary-style " + "forced " + "style " + "tie " + );