/*
- beam.cc -- implement Beam
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
+
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#include "beam.hh"
+#include "beam-scoring-problem.hh"
#include "beaming-pattern.hh"
#include "directional-element-interface.hh"
-#include "main.hh"
+#include "grob-array.hh"
#include "international.hh"
#include "interval-set.hh"
#include "item.hh"
#include "least-squares.hh"
#include "lookup.hh"
+#include "main.hh"
#include "misc.hh"
#include "output-def.hh"
#include "pointer-group-interface.hh"
#include "staff-symbol-referencer.hh"
#include "stem.hh"
#include "warn.hh"
-#include "grob-array.hh"
#if DEBUG_BEAM_SCORING
#include "text-interface.hh" // debug output.
}
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;
}
Beam::calc_normal_stems (SCM smob)
{
Grob *me = unsmob_grob (smob);
-
+
extract_grob_set (me, "stems", stems);
SCM val = Grob_array::make_array ();
Grob_array *ga = unsmob_grob_array (val);
for (vsize i = 0; i < stems.size (); i++)
if (Stem::is_normal_stem (stems[i]))
ga->add (stems[i]);
-
- return val;
+
+ return val;
}
MAKE_SCHEME_CALLBACK (Beam, calc_direction, 1);
return SCM_UNSPECIFIED;
}
- else
+ else
{
Grob *stem = first_normal_stem (me);
/*
- ugh: stems[0] case happens for chord tremolo.
+ This happens for chord tremolos.
*/
- dir = to_dir ((stem ? stem : stems[0])->get_property ("default-direction"));
+ if (!stem)
+ stem = stems[0];
+
+ if (is_direction (stem->get_property_data ("direction")))
+ dir = to_dir (stem->get_property_data ("direction"));
+ else
+ dir = to_dir (stem->get_property ("default-direction"));
}
}
{
if (!dir)
dir = get_default_dir (me);
-
+
consider_auto_knees (me);
}
{
set_stem_directions (me, dir);
}
-
+
return scm_from_int (dir);
}
return best_start;
}
-MAKE_SCHEME_CALLBACK(Beam, calc_beaming, 1)
+MAKE_SCHEME_CALLBACK (Beam, calc_beaming, 1)
SCM
Beam::calc_beaming (SCM smob)
{
Grob *me = unsmob_grob (smob);
-
+
extract_grob_set (me, "stems", stems);
Slice last_int;
last_int.set_empty ();
-
+
SCM last_beaming = scm_cons (SCM_EOL, scm_list_1 (scm_from_int (0)));
Direction last_dir = CENTER;
for (vsize i = 0; i < stems.size (); i++)
else
{
/*
- FIXME: what's this for?
+ FIXME: what's this for?
*/
SCM s = scm_cdr (this_beaming);
for (; scm_is_pair (s); s = scm_cdr (s))
last_int.add_point (np);
}
}
-
+
if (scm_ilength (scm_cdr (this_beaming)) > 0)
{
last_beaming = this_beaming;
return a.rank_ < b.rank_;
}
-typedef map<int, vector<Beam_stem_segment> > Position_stem_segments_map;
+typedef map<int, vector<Beam_stem_segment> > Position_stem_segments_map;
vector<Beam_segment>
Beam::get_beam_segments (Grob *me_grob, Grob **common)
commonx = me->get_bound (RIGHT)->common_refpoint (commonx, X_AXIS);
*common = commonx;
-
+
int gap_count = robust_scm2int (me->get_property ("gap-count"), 0);
Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
Position_stem_segments_map stem_segments;
Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
+ /* There are two concepts of "rank" that are used in the following code.
+ The beam_rank is the vertical position of the beam (larger numbers are
+ closer to the noteheads). Beam_stem_segment.rank_, on the other hand,
+ is the horizontal position of the segment (this is incremented by two
+ for each stem; the beam segment on the right side of the stem has
+ a higher rank (by one) than its neighbour to the left). */
Slice ranks;
-
for (vsize i = 0; i < stems.size (); i++)
{
Grob *stem = stems[i];
Direction d = LEFT;
do
{
+ // Find the maximum and minimum beam ranks.
+ // Given that RANKS is never reset to empty, the interval will always be
+ // smallest for the left beamlet of the first stem, and then it might grow.
+ // Do we really want this? (It only affects the tremolo gaps) --jneem
for (SCM s = index_get_cell (beaming, d);
scm_is_pair (s); s = scm_cdr (s))
{
int beam_rank = scm_to_int (scm_car (s));
ranks.add_point (beam_rank);
}
-
+
for (SCM s = index_get_cell (beaming, d);
scm_is_pair (s); s = scm_cdr (s))
{
if (!scm_is_integer (scm_car (s)))
continue;
-
+
int beam_rank = scm_to_int (scm_car (s));
Beam_stem_segment seg;
seg.stem_ = stem;
seg.stem_x_ = stem_x;
- seg.rank_ = 2 * i + (d+1)/2;
+ seg.rank_ = 2 * i + (d+1)/2;
seg.width_ = stem_width;
seg.stem_index_ = i;
seg.dir_ = d;
seg.max_connect_ = robust_scm2int (stem->get_property ("max-beam-connect"), 1000);
-
+
Direction stem_dir = get_grob_direction (stem);
-
+
seg.gapped_
= (stem_dir * beam_rank < (stem_dir * ranks[-stem_dir] + gap_count));
stem_segments[beam_rank].push_back (seg);
Beam_segment current;
+ // Iterate over all of the segments of the current beam rank,
+ // merging the adjacent Beam_stem_segments into one Beam_segment
+ // when appropriate.
int vertical_count = (*i).first;
for (vsize j = 0; j < segs.size (); j++)
{
- /*
- event_dir == LEFT: left edge of a beamsegment.
- */
+ // Keeping track of the different directions here is a little tricky.
+ // segs[j].dir_ is the direction of the beam segment relative to the stem
+ // (ie. segs[j].dir_ == LEFT if the beam segment sticks out to the left of
+ // its stem) whereas event_dir refers to the edge of the beam segment that
+ // we are currently looking at (ie. if segs[j].dir_ == event_dir then we
+ // are looking at that edge of the beam segment that is furthest from its
+ // stem).
Direction event_dir = LEFT;
+ Beam_stem_segment const& seg = segs[j];
do
{
- bool on_bound = (event_dir == LEFT) ? j == 0 :
- j == segs.size() - 1;
-
+ Beam_stem_segment const& neighbor_seg = segs[j + event_dir];
+ // TODO: make names clearer? --jneem
+ // on_line_bound: whether the current segment is on the boundary of the WHOLE beam
+ // on_beam_bound: whether the current segment is on the boundary of just that part
+ // of the beam with the current beam_rank
+ bool on_line_bound = (seg.dir_ == LEFT) ? seg.stem_index_ == 0
+ : seg.stem_index_ == stems.size() - 1;
+ bool on_beam_bound = (event_dir == LEFT) ? j == 0 :
+ j == segs.size () - 1;
bool inside_stem = (event_dir == LEFT)
- ? segs[j].stem_index_ > 0
- : segs[j].stem_index_ + 1 < stems.size () ;
-
- bool event = on_bound
- || abs (segs[j].rank_ - segs[j+event_dir].rank_) > 1
- || (abs (vertical_count) >= segs[j].max_connect_
- || abs (vertical_count) >= segs[j + event_dir].max_connect_);
-
+ ? seg.stem_index_ > 0
+ : seg.stem_index_ + 1 < stems.size () ;
+
+ bool event = on_beam_bound
+ || abs (seg.rank_ - neighbor_seg.rank_) > 1
+ || (abs (vertical_count) >= seg.max_connect_
+ || abs (vertical_count) >= neighbor_seg.max_connect_);
+
if (!event)
+ // Then this edge of the current segment is irrelevent because it will
+ // be connected with the next segment in the event_dir direction.
continue;
current.vertical_count_ = vertical_count;
- current.horizontal_[event_dir] = segs[j].stem_x_;
- if (segs[j].dir_ == event_dir)
+ current.horizontal_[event_dir] = seg.stem_x_;
+ if (seg.dir_ == event_dir)
+ // then we are examining the edge of a beam segment that is furthest
+ // from its stem.
{
- if (on_bound
+ if (on_line_bound
&& me->get_bound (event_dir)->break_status_dir ())
{
current.horizontal_[event_dir]
- = (me->get_bound (event_dir)->extent (commonx, X_AXIS)[RIGHT]
+ = (robust_relative_extent (me->get_bound (event_dir),
+ commonx, X_AXIS)[RIGHT]
+ event_dir * break_overshoot[event_dir]);
}
else
{
- Real notehead_width =
- Stem::duration_log (segs[j].stem_) == 1
- ? 1.98
- : 1.32; // URG.
-
+ Grob *stem = stems[seg.stem_index_];
+ Drul_array<Real> beamlet_length =
+ 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.75, 0.75));
+ Real length = beamlet_length[seg.dir_];
if (inside_stem)
{
- Grob *neighbor_stem = stems[segs[j].stem_index_ + event_dir];
+ Grob *neighbor_stem = stems[seg.stem_index_ + event_dir];
Real neighbor_stem_x = neighbor_stem->relative_coordinate (commonx, X_AXIS);
- notehead_width = min (notehead_width,
- fabs (neighbor_stem_x - segs[j].stem_x_)/2);
+ length = min (length,
+ fabs (neighbor_stem_x - seg.stem_x_) * max_proportion[seg.dir_]);
}
- current.horizontal_[event_dir] += event_dir * notehead_width;
+ current.horizontal_[event_dir] += event_dir * length;
}
}
else
+ // we are examining the edge of a beam segment that is closest
+ // (ie. touching, unless there is a gap) its stem.
{
- current.horizontal_[event_dir] += event_dir * segs[j].width_/2;
- if (segs[j].gapped_)
- current.horizontal_[event_dir] -= event_dir * gap_length;
+ current.horizontal_[event_dir] += event_dir * seg.width_/2;
+ if (seg.gapped_)
+ {
+ current.horizontal_[event_dir] -= event_dir * gap_length;
+
+ if (Stem::is_invisible (seg.stem_))
+ {
+ /*
+ Need to do this in case of whole notes. We don't want the
+ heads to collide with the beams.
+ */
+ extract_grob_set (seg.stem_, "note-heads", heads);
+
+ for (vsize k = 0; k < heads.size (); k ++)
+ current.horizontal_[event_dir]
+ = event_dir * min (event_dir * current.horizontal_[event_dir],
+ - gap_length/2
+ + event_dir
+ * heads[k]->extent (commonx,
+ X_AXIS)[-event_dir]);
+ }
+ }
}
if (event_dir == RIGHT)
{
segments.push_back (current);
- current = Beam_segment();
+ current = Beam_segment ();
}
}
while (flip (&event_dir) != LEFT);
}
-
+
}
return segments;
}
-MAKE_SCHEME_CALLBACK(Beam, print, 1);
+MAKE_SCHEME_CALLBACK (Beam, print, 1);
SCM
Beam::print (SCM grob)
{
}
else
{
- extract_grob_set (me, "stems", stems);
+ extract_grob_set (me, "stems", stems);
span[LEFT] = stems[0]->relative_coordinate (commonx, X_AXIS);
span[RIGHT] = stems.back ()->relative_coordinate (commonx, X_AXIS);
}
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"));
-
+
Stencil the_beam;
for (vsize i = 0; i < segments.size (); i ++)
{
{
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);
-
+
b.translate_axis (local_slope
* (segments[i].horizontal_[LEFT] - span.linear_combination (feather_dir))
+ pos.linear_combination (feather_dir)
+ beam_dy * segments[i].vertical_count_, Y_AXIS);
- the_beam.add_stencil (b);
+ the_beam.add_stencil (b);
}
-
+
#if (DEBUG_BEAM_SCORING)
- SCM quant_score = me->get_property ("quant-score");
- SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring"));
- if (to_boolean (debug) && scm_is_string (quant_score))
+ SCM annotation = me->get_property ("annotation");
+ if (!scm_is_string (annotation))
{
- extract_grob_set (me, "stems", stems);
+ SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring"));
+ if (to_boolean (debug))
+ annotation = me->get_property ("quant-score");
+ }
+
+ if (scm_is_string (annotation))
+ {
+ extract_grob_set (me, "stems", stems);
/*
This code prints the demerits for each beam. Perhaps this
string str;
SCM properties = Font_interface::text_font_alist_chain (me);
+ properties = scm_cons(scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-3), SCM_EOL),
+ properties);
+
Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP;
Stencil score = *unsmob_stencil (Text_interface::interpret_markup
- (me->layout ()->self_scm (), properties, quant_score));
+ (me->layout ()->self_scm (), properties, annotation));
if (!score.is_empty ())
- the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0);
+ {
+ score.translate_axis (me->relative_coordinate(commonx, X_AXIS), X_AXIS);
+ the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0);
+ }
}
#endif
the_beam.translate_axis (-me->relative_coordinate (commonx, X_AXIS), X_AXIS);
return the_beam.smobbed_copy ();
}
-
+
Direction
Beam::get_default_dir (Grob *me)
{
else if (extremes[UP] < -extremes[DOWN])
return UP;
}
-
+
Direction dir = CENTER;
Direction d = CENTER;
if ((d = (Direction) sign (count[UP] - count[DOWN])))
dir = d;
else
dir = to_dir (me->get_property ("neutral-direction"));
-
+
return dir;
}
sets stem directions, a constant shift does not have an
influence.
*/
- head_extents += stem->relative_coordinate (common, Y_AXIS);
+ head_extents += stem->pure_relative_y_coordinate (common, 0, INT_MAX);
if (to_dir (stem->get_property_data ("direction")))
{
}
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_stem_shorten, 1)
+
+MAKE_SCHEME_CALLBACK (Beam, calc_stem_shorten, 1)
SCM
Beam::calc_stem_shorten (SCM smob)
{
Grob *me = unsmob_grob (smob);
-
+
/*
shortening looks silly for x staff beams
*/
shorten *= forced_fraction;
-
+
if (shorten)
return scm_from_double (shorten);
}
+Interval
+Beam::no_visible_stem_positions (Grob *me, Interval default_value)
+{
+ extract_grob_set (me, "stems", stems);
+ if (stems.empty ())
+ return default_value;
+
+ Interval head_positions;
+ Slice multiplicity;
+ for (vsize i = 0; i < stems.size(); i++)
+ {
+ head_positions.unite (Stem::head_positions (stems[i]));
+ multiplicity.unite (Stem::beam_multiplicity (stems[i]));
+ }
+
+ Direction dir = get_grob_direction (me);
+ Real y = head_positions[dir]
+ * 0.5 * Staff_symbol_referencer::staff_space (me)
+ + dir * get_beam_translation (me) * (multiplicity.length () + 1);
+
+ y /= Staff_symbol_referencer::staff_space (me);
+ return Interval (y,y);
+}
+
/*
Compute a first approximation to the beam slope.
*/
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);
Interval pos (0,0);
if (count < 1)
- return ly_interval2scm (pos);
+ return ly_interval2scm (no_visible_stem_positions (me, pos));
vector<Real> x_posns;
extract_grob_set (me, "normal-stems", stems);
{
/* 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
Real dx = lvs->relative_coordinate (commonx, X_AXIS) - x0;
Drul_array<Real> pos = ly_scm2interval (posns);
-
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
if (normal_stem_count (me) <= 1)
return posns;
-
SCM s = me->get_property ("damping");
Real damping = scm_to_double (s);
Real concaveness = robust_scm2double (me->get_property ("concaveness"), 0.0);
me->set_property ("least-squares-dy", scm_from_double (0));
damping = 0;
}
-
+
if (damping)
{
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
return ly_interval2scm (pos);
}
+
+MAKE_SCHEME_CALLBACK (Beam, quanting, 2);
+SCM
+Beam::quanting (SCM smob, SCM posns)
+{
+ Grob *me = unsmob_grob (smob);
+ Drul_array<Real> ys(0, 0);
+ ys = robust_scm2drul (posns, ys);
+ Beam_scoring_problem problem (me, ys);
+
+ ys = problem.solve ();
+ return ly_interval2scm (ys);
+}
+
+
/*
Report slice containing the numbers that are both in (car BEAMING)
and (cdr BEAMING)
in POS for stem S. This Y position is relative to S. */
Real
Beam::calc_stem_y (Grob *me, Grob *stem, Grob **common,
- Real xl, Real xr,
+ Real xl, Real xr, Direction feather_dir,
Drul_array<Real> pos, bool french)
{
Real beam_translation = get_beam_translation (me);
+ Direction stem_dir = get_grob_direction (stem);
- Real r = stem->relative_coordinate (common[X_AXIS], X_AXIS) - xl;
- Real dy = pos[RIGHT] - pos[LEFT];
Real dx = xr - xl;
- Real stem_y_beam0 = (dy && dx
- ? r / dx
- * dy
- : 0) + pos[LEFT];
+ Real relx = dx ? (stem->relative_coordinate (common[X_AXIS], X_AXIS) - xl)/dx : 0;
+ Real xdir = 2*relx-1;
+
+ Real stem_y = linear_combination(pos, xdir);
- Direction my_dir = get_grob_direction (stem);
SCM beaming = stem->get_property ("beaming");
- Real stem_y = stem_y_beam0;
- if (french)
- {
- Slice bm = where_are_the_whole_beams (beaming);
- if (!bm.is_empty ())
- stem_y += beam_translation * bm[-my_dir];
- }
- else
- {
- Slice bm = Stem::beam_multiplicity (stem);
- if (!bm.is_empty ())
- stem_y += bm[my_dir] * beam_translation;
- }
+ Slice beam_slice (french
+ ? where_are_the_whole_beams (beaming)
+ : Stem::beam_multiplicity (stem));
+ if (beam_slice.is_empty ())
+ beam_slice = Slice (0,0);
+ Interval beam_multiplicity(beam_slice[LEFT],
+ beam_slice[RIGHT]);
+ /*
+ feather dir = 1 , relx 0->1 : factor 0 -> 1
+ feather dir = 0 , relx 0->1 : factor 1 -> 1
+ feather dir = -1, relx 0->1 : factor 1 -> 0
+ */
+ Real feather_factor = 1;
+ if (feather_dir > 0)
+ feather_factor = relx;
+ else if (feather_dir < 0)
+ feather_factor = 1 - relx;
+
+ stem_y += feather_factor * beam_translation
+ * beam_multiplicity[Direction(((french) ? DOWN : UP)*stem_dir)];
Real id = me->relative_coordinate (common[Y_AXIS], Y_AXIS)
- stem->relative_coordinate (common[Y_AXIS], Y_AXIS);
Hmm. At this time, beam position and slope are determined. Maybe,
stem directions and length should set to relative to the chord's
position of the beam. */
-MAKE_SCHEME_CALLBACK(Beam, set_stem_lengths, 1);
+MAKE_SCHEME_CALLBACK (Beam, set_stem_lengths, 1);
SCM
Beam::set_stem_lengths (SCM smob)
{
(void) me->get_property ("beaming");
SCM posns = me->get_property ("positions");
-
+
extract_grob_set (me, "stems", stems);
if (!stems.size ())
return posns;
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);
Real xl = fvs ? fvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0;
Real xr = lvs ? lvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0;
+ Direction feather_dir = to_dir (me->get_property ("grow-direction"));
for (vsize i = 0; i < stems.size (); i++)
{
bool french = to_boolean (s->get_property ("french-beaming"));
Real stem_y = calc_stem_y (me, s, common,
- xl, xr,
+ xl, xr, feather_dir,
pos, french && s != lvs && s!= fvs);
/*
for normal beams, but for tremolo beams it looks silly otherwise.
*/
if (gap
- && !Stem::is_invisible (s))
+ && !Stem::is_invisible (s))
stem_y += thick * 0.5 * get_grob_direction (s);
/*
/* I can imagine counting those boundaries as a half forced stem,
but let's count them full for now. */
Direction defdir = to_dir (s->get_property ("default-direction"));
-
+
if (abs (Stem::chord_start_y (s)) > 0.1
&& defdir
&& get_grob_direction (s) != defdir)
rest -> stem -> beam -> interpolate_y_position ()
*/
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1, "");
SCM
Beam::rest_collision_callback (SCM smob, SCM prev_offset)
{
return scm_from_int (0);
Real offset = robust_scm2double (prev_offset, 0.0);
-
+
Grob *st = unsmob_grob (rest->get_object ("stem"));
Grob *stem = st;
if (!stem)
Drul_array<Grob*> visible_stems (first_normal_stem (beam),
last_normal_stem (beam));
extract_grob_set (beam, "stems", stems);
-
+
Grob *common = common_refpoint_of_array (stems, beam, X_AXIS);
-
+
Real x0 = visible_stems[LEFT]->relative_coordinate (common, X_AXIS);
Real dx = visible_stems[RIGHT]->relative_coordinate (common, X_AXIS) - x0;
Real slope = dy && dx ? dy / dx : 0;
+ (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.
Grob *common_y = rest->common_refpoint (beam, Y_AXIS);
- /*
- TODO: this is dubious, because this call needs the info we're
- computing right now.
- */
- Interval rest_extent = rest->extent (common_y, Y_AXIS);
- rest_extent.translate (offset);
-
+ Interval rest_extent = rest->extent (rest, Y_AXIS);
+ rest_extent.translate (offset + rest->get_parent (Y_AXIS)->relative_coordinate (common_y, Y_AXIS));
+
Real rest_dim = rest_extent[d];
Real minimum_distance
= staff_space * (robust_scm2double (stem->get_property ("stemlet-length"), 0.0)
return knee;
}
+bool
+Beam::is_cross_staff (Grob *me)
+{
+ extract_grob_set (me, "stems", stems);
+ Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (me);
+ for (vsize i = 0; i < stems.size (); i++)
+ if (Staff_symbol_referencer::get_staff_symbol (stems[i]) != staff_symbol)
+ return true;
+ return false;
+}
+
+MAKE_SCHEME_CALLBACK (Beam, calc_cross_staff, 1)
+SCM
+Beam::calc_cross_staff (SCM smob)
+{
+ return scm_from_bool (is_cross_staff (unsmob_grob (smob)));
+}
+
int
Beam::get_direction_beam_count (Grob *me, Direction d)
{
}
ADD_INTERFACE (Beam,
+ "A beam.\n"
+ "\n"
+ "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"
+ "\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",
- "A beam. \n\n"
- "The @code{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. "
-
- ,
-
/* properties */
+ "annotation "
"auto-knee-gap "
"beamed-stem-shorten "
"beaming "
+ "beam-thickness "
"break-overshoot "
"clip-edges "
"concaveness "
"damping "
"details "
- "direction "
+ "direction "
"gap "
"gap-count "
"grow-direction "
"quantized-positions "
"shorten "
"stems "
- "thickness "
);
projects / lilypond.git / blobdiff