source file of the GNU LilyPond music typesetter
- (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
}
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;
}
{
Grob *stem = stems[seg.stem_index_];
Drul_array<Real> beamlet_length =
- robust_scm2interval (stem->get_property ("beamlet-default-length"), Interval (1.0, 1.0));
+ robust_scm2interval (stem->get_property ("beamlet-default-length"), Interval (1.1, 1.1));
Drul_array<Real> max_proportion =
- robust_scm2interval (stem->get_property ("beamlet-max-length-proportion"), Interval (0.5, 0.5));
+ robust_scm2interval (stem->get_property ("beamlet-max-length-proportion"), Interval (0.75, 0.75));
Real length = beamlet_length[seg.dir_];
if (inside_stem)
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));
*/
MAKE_SCHEME_CALLBACK (Beam, calc_least_squares_positions, 2);
SCM
-Beam::calc_least_squares_positions (SCM smob, SCM posns)
+Beam::calc_least_squares_positions (SCM smob, SCM /* posns */)
{
- (void) posns;
-
Grob *me = unsmob_grob (smob);
int count = normal_stem_count (me);
{
/* 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.",
+ " of @code{Stem} instead.\n"
+ "\n"
+ "The following properties may be set in the @code{details}"
+ " list.\n"
+ "\n"
+ "@table @code\n"
+ "@item stem-length-demerit-factor\n"
+ "Demerit factor used for inappropriate stem lengths.\n"
+ "@item secondary-beam-demerit\n"
+ "Demerit used in quanting calculations for multiple"
+ " beams.\n"
+ "@item region-size\n"
+ "Size of region for checking quant scores.\n"
+ "@item beam-eps\n"
+ "Epsilon for beam quant code to check for presence"
+ " in gap.\n"
+ "@item stem-length-limit-penalty\n"
+ "Penalty for differences in stem lengths on a beam.\n"
+ "@item damping-direction-penalty\n"
+ "Demerit penalty applied when beam direction is different"
+ " from damping direction.\n"
+ "@item hint-direction-penalty\n"
+ "Demerit penalty applied when beam direction is different"
+ " from damping direction, but damping slope is"
+ " <= @code{round-to-zero-slope}.\n"
+ "@item musical-direction-factor\n"
+ "Demerit scaling factor for difference between"
+ " beam slope and music slope.\n"
+ "@item ideal-slope-factor\n"
+ "Demerit scaling factor for difference between"
+ " beam slope and damping slope.\n"
+ "@item round-to-zero-slope\n"
+ "Damping slope which is considered zero for purposes of"
+ " calculating direction penalties.\n"
+ "@end table\n",
/* properties */
"annotation "
"auto-knee-gap "
"beamed-stem-shorten "
"beaming "
+ "beam-thickness "
"break-overshoot "
"clip-edges "
"concaveness "
"quantized-positions "
"shorten "
"stems "
- "thickness "
);
projects / lilypond.git / blobdiff