X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=abfbe0ef0dc25848c265af1ce4f0c350f4b7098f;hb=8c83a31308b5b44c696614db2b72a0a845cc116c;hp=d1629dfb243fbe26d88323a052a9b9aeffd1ce3d;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index d1629dfb24..abfbe0ef0d 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -54,77 +54,196 @@ Staff_symbol::print (SCM smob) { SCM width_scm = me->get_property ("width"); if (d == RIGHT && scm_is_number (width_scm)) - { - /* - don't multiply by Staff_symbol_referencer::staff_space (me), - since that would make aligning staff symbols of different sizes to - one right margin hell. - */ - span_points[RIGHT] = scm_to_double (width_scm); - } + { + /* + don't multiply by Staff_symbol_referencer::staff_space (me), + since that would make aligning staff symbols of different sizes to + one right margin hell. + */ + span_points[RIGHT] = scm_to_double (width_scm); + } else - { - Item *x = sp->get_bound (d); + { + Item *x = sp->get_bound (d); - span_points[d] = x->relative_coordinate (common, X_AXIS); - if (!x->break_status_dir () - && !x->extent (x, X_AXIS).is_empty ()) - span_points[d] += x->extent (x, X_AXIS)[d]; - } + span_points[d] = x->relative_coordinate (common, X_AXIS); + if (!x->break_status_dir () + && !x->extent (x, X_AXIS).is_empty ()) + span_points[d] += x->extent (x, X_AXIS)[d]; + } - span_points[d] -= d* t / 2; + span_points[d] -= d * t / 2; } while (flip (&d) != LEFT); Stencil m; - SCM line_positions = me->get_property ("line-positions"); + vector line_positions = Staff_symbol::line_positions (me); + int line_count = line_positions.size (); + Stencil line = Lookup::horizontal_line (span_points - -me->relative_coordinate (common, X_AXIS), - t); + - me->relative_coordinate (common, X_AXIS), + t); Real space = staff_space (me); + for (int i = 0; i < line_count; i++) + { + Stencil b (line); + b.translate_axis (line_positions[i] * 0.5 * space, Y_AXIS); + m.add_stencil (b); + } + return m.smobbed_copy (); +} + +vector +Staff_symbol::line_positions (Grob *me) +{ + SCM line_positions = me->get_property ("line-positions"); if (scm_is_pair (line_positions)) { + int line_count = scm_ilength (line_positions); + vector values (line_count); + int i = 0; for (SCM s = line_positions; scm_is_pair (s); - s = scm_cdr (s)) - { - Stencil b (line); - b.translate_axis (scm_to_double (scm_car (s)) - * 0.5 * space, Y_AXIS); - m.add_stencil (b); - } + s = scm_cdr (s)) + { + values[i++] = scm_to_double (scm_car (s)); + } + return values; } else { - int l = Staff_symbol::line_count (me); - Real height = (l - 1) * staff_space (me) / 2; - for (int i = 0; i < l; i++) - { - Stencil b (line); - b.translate_axis (height - i * space, Y_AXIS); - m.add_stencil (b); - } + int line_count = Staff_symbol::line_count (me); + Real height = line_count - 1; + vector values (line_count); + for (int i = 0; i < line_count; i++) + { + values[i] = height - i * 2; + } + return values; } - return m.smobbed_copy (); } - -int -Staff_symbol::get_steps (Grob *me) +vector +Staff_symbol::ledger_positions (Grob *me, int pos) { - return line_count (me) * 2; + SCM ledger_positions = me->get_property ("ledger-positions"); + Real ledger_extra = robust_scm2double (me->get_property ("ledger-extra"), 0); + vector line_positions = Staff_symbol::line_positions (me); + vector values; + + if (line_positions.empty ()) + return values; + + int line_count = line_positions.size (); + + // find the staff line nearest to note position + Real nearest_line = line_positions[0]; + Real line_dist = abs (line_positions[0] - pos); + for (int i = 1; i < line_count; i++) + { + if (abs (line_positions[i] - pos) < line_dist) + { + nearest_line = line_positions[i]; + line_dist = abs (line_positions[i] - pos); + } + } + + if (line_dist < .5) + return values; + + Direction dir = (Direction)sign (pos - nearest_line); + + if (scm_is_pair (ledger_positions)) + { + Real min_pos = HUGE_VAL; + Real max_pos = -HUGE_VAL; + SCM s2; + + // find the extent of the ledger pattern + for (SCM s = ledger_positions; scm_is_pair (s); s = scm_cdr (s)) + { + s2 = scm_car (s); + if (!scm_is_number (s2)) + s2 = scm_car (s2); + Real current_ledger = scm_to_double (s2); + if (current_ledger > max_pos) + max_pos = current_ledger; + if (current_ledger < min_pos) + min_pos = current_ledger; + } + + Real cycle = max_pos - min_pos; + + Interval ledger_fill; + ledger_fill.add_point (nearest_line + 0.5 * dir); + ledger_fill.add_point (pos + 0.5 * dir + ledger_extra * dir); + + // fill the Interval ledger_fill with ledger lines + int n = floor ((ledger_fill[DOWN] - min_pos) / cycle); + Real current; + SCM s = scm_cdr (ledger_positions); + do + { + s2 = scm_car (s); + if (scm_is_number (s2)) + { + current = scm_to_double (s2) + n * cycle; + if (ledger_fill.contains (current)) + values.push_back (current); + } + else + // grouped ledger lines, either add all or none + { + do + { + current = scm_to_double (scm_car (s2)) + n * cycle; + if (ledger_fill.contains (current)) + { + s2 = scm_car (s); + do + { + current = scm_to_double (scm_car (s2)) + n * cycle; + values.push_back (current); + s2 = scm_cdr (s2); + } + while (scm_is_pair (s2)); + } + else + s2 = scm_cdr (s2); + } + while (scm_is_pair (s2)); + } + s = scm_cdr (s); + if (!scm_is_pair (s)) + { + s = scm_cdr (ledger_positions); + n++; + } + } + while (current <= ledger_fill[UP]); + } + else + { + int ledger_count = floor ((abs (nearest_line - pos) + ledger_extra) / 2); + values.resize (ledger_count); + for (int i = 0; i < ledger_count; i++) + { + values[i] = nearest_line + dir * (ledger_count - i) * 2; + } + } + return values; } int Staff_symbol::line_count (Grob *me) { - SCM c = me->get_property ("line-count"); - if (scm_is_number (c)) - return scm_to_int (c); + SCM line_positions = me->get_property ("line-positions"); + if (scm_is_pair (line_positions)) + return scm_ilength (line_positions); else - return 0; + return robust_scm2int (me->get_property ("line-count"), 0); } Real @@ -150,14 +269,14 @@ Staff_symbol::get_ledger_line_thickness (Grob *me) return z[X_AXIS] * get_line_thickness (me) + z[Y_AXIS] * staff_space (me); } -MAKE_SCHEME_CALLBACK (Staff_symbol, height,1); +MAKE_SCHEME_CALLBACK (Staff_symbol, height, 1); SCM -Staff_symbol::height (SCM smob) +Staff_symbol::height (SCM smob) { Grob *me = unsmob_grob (smob); Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); t *= robust_scm2double (me->get_property ("thickness"), 1.0); - + SCM line_positions = me->get_property ("line-positions"); Interval y_ext; @@ -165,8 +284,8 @@ Staff_symbol::height (SCM smob) if (scm_is_pair (line_positions)) { for (SCM s = line_positions; scm_is_pair (s); - s = scm_cdr (s)) - y_ext.add_point (scm_to_double (scm_car (s)) * 0.5 * space); + s = scm_cdr (s)) + y_ext.add_point (scm_to_double (scm_car (s)) * 0.5 * space); } else { @@ -174,7 +293,7 @@ Staff_symbol::height (SCM smob) Real height = (l - 1) * staff_space (me) / 2; y_ext = Interval (-height, height); } - y_ext.widen (t/2); + y_ext.widen (t / 2); return ly_interval2scm (y_ext); } @@ -187,20 +306,20 @@ Staff_symbol::on_line (Grob *me, int pos) Real min_line = HUGE_VAL; Real max_line = -HUGE_VAL; for (SCM s = line_positions; scm_is_pair (s); s = scm_cdr (s)) - { - Real current_line = scm_to_double (scm_car (s)); - if (pos == current_line) - return true; - if (current_line > max_line) - max_line = current_line; - if (current_line < min_line) - min_line = current_line; - - } + { + Real current_line = scm_to_double (scm_car (s)); + if (pos == current_line) + return true; + if (current_line > max_line) + max_line = current_line; + if (current_line < min_line) + min_line = current_line; + + } if (pos < min_line) - return (( (int) (rint (pos - min_line)) % 2) == 0); + return (( (int) (rint (pos - min_line)) % 2) == 0); if (pos > max_line) - return (( (int) (rint (pos - max_line)) % 2) == 0); + return (( (int) (rint (pos - max_line)) % 2) == 0); return false; } @@ -227,18 +346,20 @@ Staff_symbol::line_span (Grob *me) } ADD_INTERFACE (Staff_symbol, - "This spanner draws the lines of a staff. A staff symbol" - " defines a vertical unit, the @emph{staff space}. Quantities" - " that go by a half staff space are called @emph{positions}." - " The center (i.e., middle line or space) is position@tie{}0." - " The length of the symbol may be set by hand through the" - " @code{width} property.", - - /* properties */ - "ledger-line-thickness " - "line-count " - "line-positions " - "staff-space " - "thickness " - "width " - ); + "This spanner draws the lines of a staff. A staff symbol" + " defines a vertical unit, the @emph{staff space}. Quantities" + " that go by a half staff space are called @emph{positions}." + " The center (i.e., middle line or space) is position@tie{}0." + " The length of the symbol may be set by hand through the" + " @code{width} property.", + + /* properties */ + "ledger-extra " + "ledger-line-thickness " + "ledger-positions " + "line-count " + "line-positions " + "staff-space " + "thickness " + "width " + );