From 1f8a60df45cfe68b39a6461b4f898a677847ff8c Mon Sep 17 00:00:00 2001 From: Frederic Bron Date: Thu, 23 Jul 2009 11:48:44 +0200 Subject: [PATCH] fixed issue 569: Consistency in property names: beam-thickness --- input/regression/display-lily-tests.ly | 4 ++-- lily/beam-quanting.cc | 18 +++++++-------- lily/beam.cc | 32 +++++++++++++------------- lily/include/beam.hh | 2 +- lily/slur-scoring.cc | 2 +- lily/stem.cc | 6 ++--- ly/engraver-init.ly | 6 ++--- python/convertrules.py | 1 + scm/define-grobs.scm | 3 +-- scm/layout-beam.scm | 2 +- scm/music-functions.scm | 2 +- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index 80d41549ee..7d81a696af 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -208,9 +208,9 @@ stderr of this run." \test "" ##[ \unset autoBeaming #] %% Layout properties \test "" ##[ \override Staff . Stem #'thickness = #4.0 #] % OverrideProperty -\test "" ##[ \once \override Beam #'thickness = #0.6 #] +\test "" ##[ \once \override Beam #'beam-thickness = #0.6 #] \test "" ##[ \revert Staff . Stem #'thickness #] % RevertProperty -\test "" ##[ \revert Beam #'thickness #] +\test "" ##[ \revert Beam #'beam-thickness #] %% \applyOutput \test "" ##[ \applyOutput #'Foo #(lambda (arg) (list)) #] diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index 48272ae10f..06b7c2d80b 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -111,14 +111,14 @@ Beam::quanting (SCM smob, SCM posns) divided by the current staff_space. */ Real ss = Staff_symbol_referencer::staff_space (me); - Real thickness = Beam::get_thickness (me) / ss; + Real beam_thickness = Beam::get_beam_thickness (me) / ss; Real slt = Staff_symbol_referencer::line_thickness (me) / ss; Real dy_mus = robust_scm2double (me->get_property ("least-squares-dy"), 0); Real straddle = 0.0; - Real sit = (thickness - slt) / 2; + Real sit = (beam_thickness - slt) / 2; Real inter = 0.5; - Real hang = 1.0 - (thickness - slt) / 2; + Real hang = 1.0 - (beam_thickness - slt) / 2; Real quants [] = {straddle, sit, inter, hang }; int num_quants = int (sizeof (quants) / sizeof (Real)); @@ -249,7 +249,7 @@ Beam::quanting (SCM smob, SCM posns) if (qscores[i].demerits < reasonable_score) { Real d = score_forbidden_quants (qscores[i].yl, qscores[i].yr, - rad, slt, thickness, beam_translation, + rad, slt, beam_thickness, beam_translation, edge_beam_counts, ldir, rdir, ¶meters); qscores[i].demerits += d; @@ -441,7 +441,7 @@ Real Beam::score_forbidden_quants (Real yl, Real yr, Real radius, Real slt, - Real thickness, Real beam_translation, + Real beam_thickness, Real beam_translation, Drul_array beam_counts, Direction ldir, Direction rdir, @@ -469,8 +469,8 @@ Beam::score_forbidden_quants (Real yl, Real yr, will be in the gap of the (2, sit) quant, leading to a false demerit. */ - Real gap1 = y[d] - stem_dir * ((j - 1) * beam_translation + thickness / 2 - slt / 2.2); - Real gap2 = y[d] - stem_dir * (j * beam_translation - thickness / 2 + slt / 2.2); + Real gap1 = y[d] - stem_dir * ((j - 1) * beam_translation + beam_thickness / 2 - slt / 2.2); + Real gap2 = y[d] - stem_dir * (j * beam_translation - beam_thickness / 2 + slt / 2.2); Interval gap; gap.add_point (gap1); @@ -498,9 +498,9 @@ Beam::score_forbidden_quants (Real yl, Real yr, if (max (beam_counts[LEFT], beam_counts[RIGHT]) >= 2) { Real straddle = 0.0; - Real sit = (thickness - slt) / 2; + Real sit = (beam_thickness - slt) / 2; Real inter = 0.5; - Real hang = 1.0 - (thickness - slt) / 2; + Real hang = 1.0 - (beam_thickness - slt) / 2; Direction d = LEFT; do diff --git a/lily/beam.cc b/lily/beam.cc index e803b806c8..ac40754609 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -82,9 +82,9 @@ Beam::add_stem (Grob *me, Grob *s) } Real -Beam::get_thickness (Grob *me) +Beam::get_beam_thickness (Grob *me) { - return robust_scm2double (me->get_property ("thickness"), 0) + return robust_scm2double (me->get_property ("beam-thickness"), 0) * Staff_symbol_referencer::staff_space (me); } @@ -95,12 +95,12 @@ Beam::get_beam_translation (Grob *me) int beam_count = get_beam_count (me); Real staff_space = Staff_symbol_referencer::staff_space (me); Real line = Staff_symbol_referencer::line_thickness (me); - Real thickness = get_thickness (me); + Real beam_thickness = get_beam_thickness (me); Real fract = robust_scm2double (me->get_property ("length-fraction"), 1.0); Real beam_translation = beam_count < 4 - ? (2 * staff_space + line - thickness) / 2.0 - : (3 * staff_space + line - thickness) / 3.0; + ? (2 * staff_space + line - beam_thickness) / 2.0 + : (3 * staff_space + line - beam_thickness) / 3.0; return fract * beam_translation; } @@ -564,7 +564,7 @@ Beam::print (SCM grob) Real dy = pos[RIGHT] - pos[LEFT]; Real slope = (dy && span.length ()) ? dy / span.length () : 0; - Real thick = get_thickness (me); + Real beam_thickness = get_beam_thickness (me); Real beam_dy = get_beam_translation (me); Direction feather_dir = to_dir (me->get_property ("grow-direction")); @@ -578,7 +578,7 @@ Beam::print (SCM grob) local_slope += feather_dir * segments[i].vertical_count_ * beam_dy / span.length (); } - Stencil b = Lookup::beam (local_slope, segments[i].horizontal_.length (), thick, blot); + Stencil b = Lookup::beam (local_slope, segments[i].horizontal_.length (), beam_thickness, blot); b.translate_axis (segments[i].horizontal_[LEFT], X_AXIS); @@ -794,7 +794,7 @@ Beam::consider_auto_knees (Grob *me) } Real beam_translation = get_beam_translation (me); - Real beam_thickness = Beam::get_thickness (me); + Real beam_thickness = Beam::get_beam_thickness (me); int beam_count = Beam::get_beam_count (me); Real height_of_beams = beam_thickness / 2 + (beam_count - 1) * beam_translation; @@ -842,11 +842,11 @@ set_minimum_dy (Grob *me, Real *dy) */ Real ss = Staff_symbol_referencer::staff_space (me); - Real thickness = Beam::get_thickness (me) / ss; + Real beam_thickness = Beam::get_beam_thickness (me) / ss; Real slt = Staff_symbol_referencer::line_thickness (me) / ss; - Real sit = (thickness - slt) / 2; + Real sit = (beam_thickness - slt) / 2; Real inter = 0.5; - Real hang = 1.0 - (thickness - slt) / 2; + Real hang = 1.0 - (beam_thickness - slt) / 2; *dy = sign (*dy) * max (fabs (*dy), min (min (sit, inter), hang)); @@ -976,7 +976,7 @@ Beam::calc_least_squares_positions (SCM smob, SCM /* posns */) { /* FIXME. -> UP */ Direction d = (Direction) (sign (chord.delta ()) * UP); - pos[d] = get_thickness (me) / 2; + pos[d] = get_beam_thickness (me) / 2; pos[-d] = -pos[d]; } else @@ -1272,7 +1272,7 @@ Beam::set_stem_lengths (SCM smob) if (robust_scm2int (me->get_property ("gap-count"), 0)) { gap = true; - thick = get_thickness (me); + thick = get_beam_thickness (me); } Grob *fvs = first_normal_stem (me); @@ -1443,7 +1443,7 @@ Beam::rest_collision_callback (SCM smob, SCM prev_offset) + (stem->relative_coordinate (common, X_AXIS) - x0) * slope; Real beam_translation = get_beam_translation (beam); - Real beam_thickness = Beam::get_thickness (beam); + Real beam_thickness = Beam::get_beam_thickness (beam); /* TODO: this is not strictly correct for 16th knee beams. @@ -1552,7 +1552,7 @@ Beam::get_direction_beam_count (Grob *me, Direction d) ADD_INTERFACE (Beam, "A beam.\n" "\n" - "The @code{thickness} property is the weight of beams," + "The @code{beam-thickness} property is the weight of beams," " measured in staffspace. The @code{direction} property is" " not user-serviceable. Use the @code{direction} property" " of @code{Stem} instead.\n" @@ -1596,6 +1596,7 @@ ADD_INTERFACE (Beam, "auto-knee-gap " "beamed-stem-shorten " "beaming " + "beam-thickness " "break-overshoot " "clip-edges " "concaveness " @@ -1616,5 +1617,4 @@ ADD_INTERFACE (Beam, "quantized-positions " "shorten " "stems " - "thickness " ); diff --git a/lily/include/beam.hh b/lily/include/beam.hh index 3abccea544..2b877ad644 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -79,7 +79,7 @@ public: static void set_stemlens (Grob *); static int get_beam_count (Grob *me); static Real get_beam_translation (Grob *me); - static Real get_thickness (Grob *me); + static Real get_beam_thickness (Grob *me); static void connect_beams (Grob *me); static vector get_beam_segments (Grob *me_grob, Grob **common); static Interval no_visible_stem_positions (Grob *me, Interval default_value); diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index bb2b1f3b2b..417a8171a0 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -116,7 +116,7 @@ Slur_score_state::get_encompass_info (Grob *col) const { ei.stem_ = stem->extent (common_[Y_AXIS], Y_AXIS)[dir_]; if (Grob *b = Stem::get_beam (stem)) - ei.stem_ += stem_dir * 0.5 * Beam::get_thickness (b); + ei.stem_ += stem_dir * 0.5 * Beam::get_beam_thickness (b); Interval x = stem->extent (common_[X_AXIS], X_AXIS); ei.x_ = x.is_empty () diff --git a/lily/stem.cc b/lily/stem.cc index 8ba6f2b6c9..bde62f5712 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -557,7 +557,7 @@ Stem::height (SCM smob) programming_error ("no stem direction"); dir = UP; } - iv[dir] += dir * Beam::get_thickness (beam) * 0.5; + iv[dir] += dir * Beam::get_beam_thickness (beam) * 0.5; } return ly_interval2scm (iv); @@ -740,7 +740,7 @@ Stem::print (SCM smob) else if (stemlet) { Real beam_translation = Beam::get_beam_translation (beam); - Real beam_thickness = Beam::get_thickness (beam); + Real beam_thickness = Beam::get_beam_thickness (beam); int beam_count = beam_multiplicity (me).length () + 1; y2 -= d @@ -884,7 +884,7 @@ Stem::calc_stem_info (SCM smob) } Real beam_translation = Beam::get_beam_translation (beam); - Real beam_thickness = Beam::get_thickness (beam); + Real beam_thickness = Beam::get_beam_thickness (beam); int beam_count = Beam::get_direction_beam_count (beam, my_dir); Real length_fraction = robust_scm2double (me->get_property ("length-fraction"), 1.0); diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 85ab0662a0..5ff869b930 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -248,7 +248,7 @@ multiple voices on the same staff." fontSize = #-4 \override Stem #'length-fraction = #(magstep -4) \override Beam #'length-fraction = #(magstep -4) - \override Beam #'thickness = #0.35 + \override Beam #'beam-thickness = #0.35 } \context { @@ -627,7 +627,7 @@ automatically when an output definition (a @code{\score} or (Voice Dots font-size -3) (Voice Stem length-fraction 0.8) (Voice Stem no-stem-extend #t) - (Voice Beam thickness 0.384) + (Voice Beam beam-thickness 0.384) (Voice Beam length-fraction 0.8) (Voice Accidental font-size -4) (Voice AccidentalCautionary font-size -4) @@ -709,7 +709,7 @@ context." %% TabStaff increase the staff-space, which in turn %% increases beam thickness and spacing; beams are %% too big. We have to adjust the beam settings: - \override Beam #'thickness = #0.32 + \override Beam #'beam-thickness = #0.32 \override Beam #'length-fraction = #0.62 %% No accidental in tablature ! diff --git a/python/convertrules.py b/python/convertrules.py index 8f9c9d00d4..c245c3d353 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2905,6 +2905,7 @@ def conv(str): stderr_write ("\n") stderr_write (NOT_SMART % _("Dash parameters for slurs and ties are now in \'dash-details.\n")) stderr_write (UPDATE_MANUALLY) + str = re.sub ('(\\bBeam\\s+#\')(?=thickness\\b)', '\\1beam-', str) return str @rule ((2, 13, 4), diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 4e15a0576d..5886e4226a 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -368,8 +368,7 @@ (shorten . ,ly:beam::calc-stem-shorten) (stencil . ,ly:beam::print) - ;; TODO: should be in SLT. - (thickness . 0.48) ; in staff-space + (beam-thickness . 0.48) ; in staff-space (meta . ((class . Spanner) (object-callbacks . ((normal-stems . ,ly:beam::calc-normal-stems))) diff --git a/scm/layout-beam.scm b/scm/layout-beam.scm index e99387864d..0834024aa4 100644 --- a/scm/layout-beam.scm +++ b/scm/layout-beam.scm @@ -11,7 +11,7 @@ . QUANT) pairs, where QUANT is -1 (hang), 0 (center), 1 (sit) or -2/ 2 (inter) " - (let* ((thick (ly:grob-property beam 'thickness)) + (let* ((thick (ly:grob-property beam 'beam-thickness)) (layout (ly:grob-layout beam)) (lthick (ly:output-def-lookup layout 'line-thickness)) (staff-thick lthick) ; fixme. diff --git a/scm/music-functions.scm b/scm/music-functions.scm index b3d58db60a..cc1c3d2e85 100644 --- a/scm/music-functions.scm +++ b/scm/music-functions.scm @@ -387,7 +387,7 @@ i.e. this is not an override" (Voice Dots font-size -3) (Voice Stem length-fraction 0.8) (Voice Stem no-stem-extend #t) - (Voice Beam thickness 0.384) + (Voice Beam beam-thickness 0.384) (Voice Beam length-fraction 0.8) (Voice Accidental font-size -4) (Voice AccidentalCautionary font-size -4) -- 2.39.5