X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=0557883267e56497f28304e3b66813576d185eff;hb=0e0aa554eb6f3cd6004904746c54f8f95d6ccebf;hp=6522a843cd54fd8f83e5a17d10fc3e821c8e79f9;hpb=f418c40c03fcee08a35e5b1dae8d0d3b9e996b64;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 6522a843cd..0557883267 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -3,15 +3,16 @@ source file of the GNU LilyPond music typesetter - (c) 2001--2005 Han-Wen Nienhuys + (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 "output-def.hh" #include "pitch.hh" +#include "stencil.hh" /* TODO: insert support for smaller cautionaries, tie-break-reminders. @@ -23,8 +24,12 @@ Stencil 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"); + 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); @@ -32,34 +37,39 @@ parenthesize (Grob *me, Stencil m) return m; } +/* + 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 *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 +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"); @@ -87,8 +97,8 @@ Accidental_interface::accurate_boxes (Grob *a, Grob **common) stem[Y_AXIS] *= 1.1; bulb[Y_AXIS][UP] *= .35; - boxes.push (bulb); - boxes.push (stem); + boxes.push_back (bulb); + boxes.push_back (stem); } break; case NATURAL: @@ -101,13 +111,13 @@ Accidental_interface::accurate_boxes (Grob *a, Grob **common) rstem[Y_AXIS] *= 1.1; belly[Y_AXIS] *= 0.75; - lstem[X_AXIS][RIGHT] *= .5; - rstem[X_AXIS][LEFT] = lstem[X_AXIS][RIGHT]; + 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); + boxes.push_back (belly); + boxes.push_back (lstem); + boxes.push_back (rstem); } break; /* @@ -115,149 +125,142 @@ Accidental_interface::accurate_boxes (Grob *a, Grob **common) */ } } - + 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); - } + for (vsize i = boxes.size (); i--;) + boxes[i].translate (o); return boxes; } +/* + * 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. + */ /* - * 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. - */ + 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); - /* - todo: this sort of stuff in Scheme. --hwn. - */ - String - Accidental_interface::get_fontcharname (String style, int alteration) + if (style == "hufnagel") + switch (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); + case FLAT: return "hufnagel-1"; + case 0: return "vaticana0"; + case SHARP: return "mensural1"; } - - MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1); - SCM - Accidental_interface::print (SCM smob) + 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) { - Grob *me = unsmob_grob (smob); - bool smaller = false; - bool parens = false; + case FLAT: return "mensural-1"; + case 0: return "vaticana0"; + case SHARP: return "mensural1"; + } - 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")); - } + if (style == "neomensural") + style = ""; // currently same as default + if (style == "default") + style = ""; + return style + to_string (alteration); +} - SCM scm_style = me->get_property ("style"); - String style; - if (scm_is_symbol (scm_style)) - { - style = ly_symbol2string (scm_style); - } - else - { - /* - preferably no name for the default style. - */ - style = ""; - } +MAKE_SCHEME_CALLBACK (Accidental_interface, print, 1); +SCM +Accidental_interface::print (SCM smob) +{ + Grob *me = unsmob_grob (smob); + bool smaller = false; + bool parens = false; - Font_metric *fm = 0; - if (smaller) - { - 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_int2num (-2))), - ac); - fm = select_font (me->get_layout (), ac); - } - else - fm = Font_interface::get_default_font (me); + bool caut = to_boolean (me->get_property ("cautionary")); + if (caut) + { + SCM cstyle = me->get_property ("cautionary-style"); + parens = ly_is_equal (cstyle, ly_symbol2scm ("parentheses")); + smaller = ly_is_equal (cstyle, ly_symbol2scm ("smaller")); + } - Stencil mol; - for (SCM s = me->get_property ("accidentals"); - scm_is_pair (s); s = scm_cdr (s)) - { - 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)); - } - else - { - mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1, 0); - } - } + SCM scm_style = me->get_property ("style"); + string style; + if (scm_is_symbol (scm_style)) + style = ly_symbol2string (scm_style); + else + /* + preferably no name for the default style. + */ + style = ""; + + Font_metric *fm = 0; + if (smaller) + { + 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); - if (parens) - mol = parenthesize (me, mol); + Stencil mol; + for (SCM s = me->get_property ("accidentals"); + scm_is_pair (s); s = scm_cdr (s)) + { + 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)); + else + mol.add_at_edge (X_AXIS, RIGHT, acc, 0.1, 0); + } - return mol.smobbed_copy (); - } + if (parens) + mol = parenthesize (me, mol); -/* - TODO: should move inside-slur into item? + return mol.smobbed_copy (); +} +/* + TODO: should move avoid-slur into item? */ ADD_INTERFACE (Accidental_interface, "accidental-interface", "a single accidental", - "inside-slur cautionary cautionary-style style tie accidentals"); + "accidentals " + "avoid-slur " + "cautionary " + "cautionary-style " + "forced " + "style " + "tie " + );