X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fledger-line-spanner.cc;h=14074a44a9acca86cac9ea6bd3fae4e182ef9307;hb=42c8f04fe971525561dde0ee757ffebe3e6c0703;hp=672d68ad826a6ee0e5ff65057dd237691133ef01;hpb=b34c63f0e1afe6b1312c4c167b1cad312acd1b00;p=lilypond.git diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc index 672d68ad82..14074a44a9 100644 --- a/lily/ledger-line-spanner.cc +++ b/lily/ledger-line-spanner.cc @@ -9,7 +9,6 @@ #include -#include "item.hh" #include "note-head.hh" #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" @@ -22,32 +21,31 @@ struct Ledger_line_spanner { DECLARE_SCHEME_CALLBACK (print, (SCM )); static Stencil brew_ledger_lines (Grob *me, - int pos, - int interspaces, - Interval x_extent, - Real left_shorten); + int pos, + int interspaces, + Real, Real, + Interval x_extent, + Real left_shorten); static bool has_interface (Grob*); }; Stencil -Ledger_line_spanner::brew_ledger_lines (Grob *me, - int pos, - int interspaces, - Interval x_extent, - Real left_shorten) +Ledger_line_spanner::brew_ledger_lines (Grob *staff, + int pos, + int interspaces, + Real halfspace, + Real ledgerlinethickness, + Interval x_extent, + Real left_shorten) { - Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); - Real inter_f = Staff_symbol_referencer::staff_space (me)/2; int line_count = ((abs (pos) < interspaces) ? 0 : (abs (pos) - interspaces) / 2); Stencil stencil; if (line_count) { - Real ledgerlinethickness = - Staff_symbol::get_ledger_line_thickness (staff); Real blotdiameter = ledgerlinethickness; Interval y_extent = Interval (-0.5*(ledgerlinethickness), @@ -60,19 +58,19 @@ Ledger_line_spanner::brew_ledger_lines (Grob *me, Lookup::round_filled_box (Box (x_extent, y_extent), blotdiameter); Direction dir = (Direction)sign (pos); - Real offs = (Staff_symbol_referencer::on_staffline (me, pos)) + Real offs = (Staff_symbol_referencer::on_staffline (staff, pos)) ? 0.0 - : -dir * inter_f; + : -dir * halfspace; - offs += pos * inter_f; + offs += pos * halfspace; for (int i = 0; i < line_count; i++) { Stencil ledger_line ((i == 0) ? proto_first_line : proto_ledger_line ); - ledger_line.translate_axis (-dir * inter_f * i * 2 + offs, Y_AXIS); + ledger_line.translate_axis (-dir * halfspace * i * 2 + offs, Y_AXIS); stencil.add_stencil (ledger_line); } } @@ -108,26 +106,43 @@ Ledger_line_spanner::print (SCM smob) Spanner *me = dynamic_cast (unsmob_grob (smob)); Link_array heads (Pointer_group_interface__extract_grobs (me, (Grob*)0, "note-heads")); + if (heads.is_empty ()) + return SCM_EOL; + + // find size of note heads. + Grob * staff = Staff_symbol_referencer::get_staff_symbol (me); + if (!staff) + return SCM_EOL; + + Stencil ledgers; Stencil default_ledger; Grob * common[NO_AXES]; + for (int i = X_AXIS; i < NO_AXES; i++) - common[Axis (i)] = common_refpoint_of_array (heads, me, Axis(i)); + { + Axis a = Axis (i); + common[a] = common_refpoint_of_array (heads, me, a); + for (int i = heads.size (); i--; ) + if (Grob * g = unsmob_grob (me->get_property ("accidental-grob"))) + common[a] = common[a]->common_refpoint (g, a); + } - int interspaces = Staff_symbol_referencer::line_count (me)-1; + int interspaces = Staff_symbol::line_count (staff)-1; Ledger_requests reqs; - Real length_fraction = 0.25 * 2; + Real length_fraction = 0.25; for (int i = heads.size (); i--; ) { Item *h = dynamic_cast (heads[i]); int pos = Staff_symbol_referencer::get_rounded_position (h); - if (abs (pos) > interspaces + 1) + if (pos + && abs (pos) > interspaces) { Interval head_extent = h->extent (common[X_AXIS], X_AXIS); - Interval ledger_extent = Interval (head_extent.linear_combination (-1 - length_fraction), - head_extent.linear_combination (1 + length_fraction)); + Interval ledger_extent = head_extent; + ledger_extent.widen (length_fraction * head_extent.length ()); Direction vdir = Direction (sign (pos)); int rank = Paper_column::get_rank (h->get_column ()); @@ -139,7 +154,8 @@ Ledger_line_spanner::print (SCM smob) } } - Real gap = robust_scm2double (me->get_property ("gap"), 0.15); + // determine maximum size for non-colliding ledger. + Real gap = robust_scm2double (me->get_property ("gap"), 0.1); Ledger_requests::iterator last (reqs.end ()); for (Ledger_requests::iterator i (reqs.begin ()); i != reqs.end (); last = i++) @@ -152,8 +168,8 @@ Ledger_line_spanner::print (SCM smob) Direction d = DOWN; do { - if (abs (last->second[d].position_) > interspaces + 1 - && abs (i->second[d].position_) > interspaces + 1) + if (abs (last->second[d].position_) > interspaces + && abs (i->second[d].position_) > interspaces) { Real center = (last->second[d].head_extent_[RIGHT] @@ -164,10 +180,12 @@ Ledger_line_spanner::print (SCM smob) { Ledger_request &lr = ((which == LEFT) ? *last : *i).second[d]; + // due tilt of quarter note-heads + bool both = + (abs (last->second[d].position_) > interspaces + 1 + && abs (i->second[d].position_) > interspaces + 1); - // due tilt of quarter note-heads - Real excentricity = 0; //.1; - Real limit = (center + which * gap/2 + excentricity); + Real limit = (center + (both? which * gap/2 : 0)); lr.ledger_extent_.elem_ref (-which) = which * (which * lr.ledger_extent_[-which] >? which * limit); } @@ -177,22 +195,51 @@ Ledger_line_spanner::print (SCM smob) while (flip (&d) != DOWN); } - for (Ledger_requests::const_iterator i (reqs.begin ()); - i != reqs.end (); i++) + // create ledgers for note heads + Real ledgerlinethickness = + Staff_symbol::get_ledger_line_thickness (staff); + Real halfspace = Staff_symbol::staff_space (staff)/2; + for (int i = heads.size (); i--; ) { - Direction d = DOWN; - do + Item *h = dynamic_cast (heads[i]); + + int pos = Staff_symbol_referencer::get_rounded_position (h); + if (abs (pos) > interspaces + 1) { - Ledger_request lr = (*i).second[d]; - ledgers.add_stencil (brew_ledger_lines (me, - lr.position_, - interspaces, - lr.ledger_extent_, - 0.0)); + Interval head_size = h->extent (common[X_AXIS], X_AXIS); + Interval ledger_size = head_size; + ledger_size.widen (ledger_size.length ()* length_fraction); + + Interval max_size = reqs[Paper_column::get_rank (h->get_column ())][Direction (sign(pos))].ledger_extent_; + + ledger_size.intersect (max_size); + Real left_shorten = 0.0; + if (Grob * g = unsmob_grob (h->get_property ("accidental-grob"))) + { + Interval accidental_size = g->extent (common[X_AXIS], X_AXIS); + Real d = + linear_combination (Drul_array (accidental_size[RIGHT], + head_size[LEFT]), + 0.0); + + left_shorten = (-ledger_size[LEFT] + d) >? 0 ; + + /* + TODO: shorten 2 ledger lines for the case natural + + downstem. + */ + + } + + ledgers.add_stencil (brew_ledger_lines (staff, pos, interspaces, + halfspace, + ledgerlinethickness, + ledger_size, + left_shorten)); } - while (flip (&d) != DOWN); } + ledgers.translate_axis (-me->relative_coordinate (common[X_AXIS], X_AXIS), X_AXIS); @@ -201,5 +248,15 @@ Ledger_line_spanner::print (SCM smob) ADD_INTERFACE (Ledger_line_spanner, "ledger-line-interface", - "This spanner draws the ledger lines of a staff on note heads. ", - "note-heads thickness gap length minimum-length") + "This spanner draws the ledger lines of a staff, for note heads that stick out. ", + "note-heads thickness gap length minimum-length"); + + +struct Ledgered_interface { + static bool has_interface (Grob*); +}; + +ADD_INTERFACE (Ledgered_interface, + "ledgered-interface", + "Objects that need ledger lines.", + "no-ledgers");