X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fnote-head.cc;h=dfe20fbf5262266d1420b7e7b14ae9c92ef5bdad;hb=664070d837cc4855091455892cb942cdcedeef0c;hp=16c58ebaea15aa1137b235a6ea3dc07e50862290;hpb=d765f3af45be51f15da55cf570a4b172200e1035;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 16c58ebaea..dfe20fbf52 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,22 +3,23 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include #include +#include "staff-symbol.hh" #include "misc.hh" #include "dots.hh" #include "note-head.hh" #include "warn.hh" #include "font-interface.hh" -#include "molecule.hh" -#include "musical-request.hh" +#include "stencil.hh" +#include "event.hh" #include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" #include "lookup.hh" -#include "paper-def.hh" +#include "output-def.hh" /* Note_head contains the code for printing note heads. @@ -57,88 +58,95 @@ */ -Molecule +/* + TODO: ledger lines are also a property of the staff. Maybe move them + to there? + */ +Stencil Note_head::brew_ledger_lines (Grob *me, int pos, int interspaces, Interval x_extent, - bool take_space) + Real left_shorten, + bool take_space) { + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); Real inter_f = Staff_symbol_referencer::staff_space (me)/2; - int lines_i = abs (pos) < interspaces - ? 0 - : (abs (pos) - interspaces) / 2; - Molecule molecule = Molecule(); - - if (lines_i) + int line_count = ((abs (pos) < interspaces) + ? 0 + : (abs (pos) - interspaces) / 2); + Stencil stencil; + if (line_count) { Real ledgerlinethickness = - (me->get_paper ()->get_var ("ledgerlinethickness")); + Staff_symbol::get_ledger_line_thickness (staff); Real blotdiameter = ledgerlinethickness; - // (me->get_paper ()->get_var ("blotdiameter")); Interval y_extent = Interval (-0.5*(ledgerlinethickness), +0.5*(ledgerlinethickness)); - Box ledger_line (x_extent, y_extent); + Stencil proto_ledger_line = + Lookup::round_filled_box (Box (x_extent, y_extent), blotdiameter); - Molecule proto_ledger_line = - Lookup::roundfilledbox (ledger_line, blotdiameter); - - if (!take_space) - proto_ledger_line.set_empty (true); + x_extent[LEFT] += left_shorten; + Stencil proto_first_line = + Lookup::round_filled_box (Box (x_extent, y_extent), blotdiameter); + if (!take_space) + { + proto_ledger_line.set_empty (true); + proto_first_line.set_empty (true); + } + Direction dir = (Direction)sign (pos); Real offs = (Staff_symbol_referencer::on_staffline (me, pos)) ? 0.0 : -dir * inter_f; - for (int i = 0; i < lines_i; i++) + + for (int i = 0; i < line_count; i++) { - Molecule ledger_line (proto_ledger_line); + Stencil ledger_line ((i == 0) + ? proto_first_line + : proto_ledger_line + ); ledger_line.translate_axis (-dir * inter_f * i * 2 + offs, Y_AXIS); - molecule.add_molecule (ledger_line); + stencil.add_stencil (ledger_line); } } - return molecule; + return stencil; } -Molecule -internal_brew_molecule (Grob *me, bool ledger_take_space) +Stencil +internal_print (Grob *me, bool with_ledgers) { - SCM style = me->get_grob_property ("style"); - if (!gh_symbol_p (style)) + SCM style = me->get_property ("style"); + if (!ly_c_symbol_p (style)) { - return Molecule(); + return Stencil (); } - /* - ugh: use gh_call () / scm_apply (). - - UGH: use grob-property. - */ - SCM log = gh_int2scm (Note_head::get_balltype (me)); - SCM exp = scm_list_n (ly_symbol2scm ("find-notehead-symbol"), log, - ly_quote_scm (style), - SCM_UNDEFINED); - SCM scm_font_char = scm_primitive_eval (exp); + SCM log = scm_int2num (Note_head::get_balltype (me)); + SCM proc = me->get_property ("glyph-name-procedure"); + SCM scm_font_char = scm_call_2 (proc, log, style); String font_char = "noteheads-" + ly_scm2string (scm_font_char); Font_metric * fm = Font_interface::get_default_font (me); - Molecule out = fm->find_by_name (font_char); - if (out.empty_b()) + Stencil out = fm->find_by_name (font_char); + if (out.is_empty ()) { me->warning (_f ("note head `%s' not found", font_char.to_str0 ())); } int interspaces = Staff_symbol_referencer::line_count (me)-1; - int pos = (int)rint (Staff_symbol_referencer::get_position (me)); - if (abs (pos) - interspaces > 1) + int pos = Staff_symbol_referencer::get_rounded_position (me); + if (with_ledgers && interspaces >= 0 + && abs (pos) - interspaces > 1) { - Interval hd = out.extent (X_AXIS); - Real left_ledger_protusion = hd.length ()/4; - Real right_ledger_protusion = left_ledger_protusion; + Interval ledger_size = out.extent (X_AXIS); + ledger_size.widen ( ledger_size.length ()/4); - if (unsmob_grob(me->get_grob_property ("accidental-grob"))) + Real left_shorten =0.0; + if (Grob * g = unsmob_grob (me->get_property ("accidental-grob"))) { /* make a little room for accidentals. @@ -146,31 +154,41 @@ internal_brew_molecule (Grob *me, bool ledger_take_space) TODO: this will look silly if a chord has ledger lines, and only the bottom note has an accidental. */ - - left_ledger_protusion *= 0.66; - right_ledger_protusion *= 0.9; + + Grob *common = g->common_refpoint (me, X_AXIS); + Real d = + linear_combination (Drul_array (me->extent (common, X_AXIS)[LEFT], + g->extent (common, X_AXIS)[RIGHT]), + + 0.5); + + left_shorten = (-ledger_size[LEFT] + d) >? 0 ; + + /* + TODO: shorten 2 ledger lines for the case natural + + downstem. + */ } - Interval l_extents = Interval (hd[LEFT] - left_ledger_protusion, - hd[RIGHT] + right_ledger_protusion); - out.add_molecule (Note_head::brew_ledger_lines (me, pos, interspaces, - l_extents, - ledger_take_space)); + out.add_stencil (Note_head::brew_ledger_lines (me, pos, interspaces, + ledger_size, + left_shorten, + false)); } return out; } -MAKE_SCHEME_CALLBACK (Note_head,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Note_head,print,1); SCM -Note_head::brew_molecule (SCM smob) +Note_head::print (SCM smob) { Grob *me = unsmob_grob (smob); /* ledgers don't take space. See top of file. */ - return internal_brew_molecule (me, false).smobbed_copy (); + return internal_print (me, true).smobbed_copy (); } /* @@ -182,48 +200,80 @@ Note_head::brew_molecule (SCM smob) Interval Note_head::head_extent (Grob *me, Axis a) { - Molecule * mol = me->get_molecule(); - return mol ? mol ->extent (a) : Interval(0,0); + SCM brewer = me->get_property ("print-function"); + if (brewer == Note_head::print_proc) + { + Stencil mol = internal_print (me, false); + + if (!mol.is_empty ()) + return mol.extent (a); + } + else + { + Stencil * mol = me->get_stencil (); + if (mol) + return mol->extent (a) ; + } + + return Interval (0,0); } +/* + This is necessary to prevent a cyclic dependency: the appearance of + the ledgers depends on positioning, so the Grob::get_stencil () can + not be used for determining the note head extent. + + */ +MAKE_SCHEME_CALLBACK (Note_head,extent,2); +SCM +Note_head::extent (SCM smob, SCM axis) +{ + Grob *me = unsmob_grob (smob); + return ly_interval2scm (head_extent (me, (Axis) ly_scm2int (axis))); +} -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_molecule,1); - +MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1); SCM -Note_head::brew_ez_molecule (SCM smob) +Note_head::brew_ez_stencil (SCM smob) { Grob *me = unsmob_grob (smob); int l = Note_head::get_balltype (me); int b = (l >= 2); - SCM cause = me->get_grob_property ("cause"); - SCM spitch = unsmob_music (cause)->get_mus_property ("pitch"); + SCM cause = me->get_property ("cause"); + SCM spitch = unsmob_music (cause)->get_property ("pitch"); Pitch* pit = unsmob_pitch (spitch); - char s[2] = "a"; - s[0] = (pit->notename_ + 2)%7 + 'a'; - s[0] = toupper (s[0]); - - SCM charstr = scm_makfrom0str (s); + SCM idx = scm_int2num (pit->get_notename ()); + SCM names = me->get_property ("note-names"); + SCM charstr = SCM_EOL; + if (ly_c_vector_p (names)) + charstr = scm_vector_ref (names, idx); + else + { + char s[2] = "a"; + s[0] = (pit->get_notename () + 2)%7 + 'a'; + s[0] = toupper (s[0]); + charstr = scm_makfrom0str (s); + } SCM at = scm_list_n (ly_symbol2scm ("ez-ball"), charstr, - gh_int2scm (b), - gh_int2scm (1-b), + scm_int2num (b), + scm_int2num (1-b), SCM_UNDEFINED); Box bx (Interval (0, 1.0), Interval (-0.5, 0.5)); - Molecule m (bx, at); + Stencil m (bx, at); - int pos = (int)rint (Staff_symbol_referencer::get_position (me)); + int pos = Staff_symbol_referencer::get_rounded_position (me); int interspaces = Staff_symbol_referencer::line_count (me)-1; if (abs (pos) - interspaces > 1) { Interval hd = m.extent (X_AXIS); - Real hw = hd.length ()/4; - Interval extent = Interval (hd[LEFT] - hw, hd[RIGHT] + hw); - m.add_molecule (brew_ledger_lines (me, pos, interspaces, extent, false)); + hd.widen ( hd.length ()/4); + m.add_stencil (brew_ledger_lines (me, pos, interspaces, hd, 0, false)); } return m.smobbed_copy (); @@ -233,31 +283,58 @@ Note_head::brew_ez_molecule (SCM smob) Real Note_head::stem_attachment_coordinate (Grob *me, Axis a) { - SCM v = me->get_grob_property ("stem-attachment-function"); - - if (!gh_procedure_p (v)) - return 0.0; + SCM brewer = me->get_property ("print-function"); + Font_metric * fm = Font_interface::get_default_font (me); + + if (brewer == Note_head::print_proc) + { + SCM style = me->get_property ("style"); + if (!ly_c_symbol_p (style)) + { + return 0.0; + } + + SCM log = scm_int2num (Note_head::get_balltype (me)); + SCM proc = me->get_property ("glyph-name-procedure"); + SCM scm_font_char = scm_call_2 (proc, log, style); + String font_char = "noteheads-" + ly_scm2string (scm_font_char); - SCM st = me->get_grob_property ("style"); - SCM log = gh_int2scm (get_balltype (me)); - SCM result = gh_apply (v, scm_list_n (st, log, SCM_UNDEFINED)); + int k = fm->name_to_index (font_char) ; - if (!gh_pair_p (result)) + if (k >= 0) + { + Box b = fm->get_indexed_char (k); + Offset wxwy = fm->get_indexed_wxwy (k); + Interval v = b[a]; + if (!v.is_empty ()) + return 2 * (wxwy[a] - v.center ()) / v.length (); + } + } + + /* + Fallback + */ + SCM v = me->get_property ("stem-attachment-function"); + if (!ly_c_procedure_p (v)) + return 0.0; + + SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a)); + if (!ly_c_pair_p (result)) return 0.0; result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result); - return gh_number_p (result) ? gh_scm2double (result) : 0.0; + return robust_scm2double (result,0); } int Note_head::get_balltype (Grob*me) { - SCM s = me->get_grob_property ("duration-log"); - return gh_number_p (s) ? gh_scm2int (s) get_property ("duration-log"); + return ly_c_number_p (s) ? ly_scm2int (s)