\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)) #]
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));
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;
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<int> beam_counts,
Direction ldir, Direction rdir,
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);
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
}
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);
}
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;
}
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"));
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);
}
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;
*/
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));
{
/* 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
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);
+ (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.
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"
"auto-knee-gap "
"beamed-stem-shorten "
"beaming "
+ "beam-thickness "
"break-overshoot "
"clip-edges "
"concaveness "
"quantized-positions "
"shorten "
"stems "
- "thickness "
);
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<Beam_segment> get_beam_segments (Grob *me_grob, Grob **common);
static Interval no_visible_stem_positions (Grob *me, Interval default_value);
{
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 ()
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);
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
}
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);
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 {
(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)
%% 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 !
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),
(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)))
. 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.
(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)