source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "beam.hh"
-#include "beaming.hh"
+#include "beaming-pattern.hh"
#include "directional-element-interface.hh"
#include "main.hh"
#include "international.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.
Beam_stem_segment::Beam_stem_segment ()
{
+ max_connect_ = 1000; // infinity
stem_ = 0;
width_ = 0.0;
stem_x_ = 0.0;
return m;
}
+MAKE_SCHEME_CALLBACK (Beam, calc_normal_stems, 1);
+SCM
+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;
+}
MAKE_SCHEME_CALLBACK (Beam, calc_direction, 1);
SCM
/* Beams with less than 2 two stems don't make much sense, but could happen
when you do
- [r8 c8 r8].
+ r8[ c8 r8]
- For a beam that only has one stem, we try to do some disappearance magic:
- we revert the flag, and move on to The Eternal Engraving Fields. */
+ */
- Direction d = CENTER;
+ Direction dir = CENTER;
- int count = visible_stem_count (me);
+ int count = normal_stem_count (me);
if (count < 2)
{
extract_grob_set (me, "stems", stems);
- if (stems.size () == 1)
+ if (stems.size () == 0)
{
- me->warning (_ ("removing beam with less than two stems"));
-
- stems[0]->set_object ("beam", SCM_EOL);
+ me->warning (_ ("removing beam with no stems"));
me->suicide ();
- return SCM_UNSPECIFIED;
- }
- else if (stems.size () == 0)
- {
- me->suicide ();
return SCM_UNSPECIFIED;
}
else
{
- Grob *stem = first_visible_stem (me);
+ Grob *stem = first_normal_stem (me);
/*
- ugh: stems[0] case happens for chord tremolo.
+ This happens for chord tremolos.
*/
- d = 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 (count >= 1)
{
- if (!d)
- d = get_default_dir (me);
+ if (!dir)
+ dir = get_default_dir (me);
consider_auto_knees (me);
}
- if (d)
+ if (dir)
{
- set_stem_directions (me, d);
+ set_stem_directions (me, dir);
}
- return scm_from_int (d);
+ 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)
{
}
else
{
+ /*
+ FIXME: what's this for?
+ */
SCM s = scm_cdr (this_beaming);
for (; scm_is_pair (s); s = scm_cdr (s))
{
vector<Beam_segment>
Beam::get_beam_segments (Grob *me_grob, Grob **common)
{
+ /* ugh, this has a side-effect that we need to ensure that
+ Stem #'beaming is correct */
+ (void) me_grob->get_property ("beaming");
+
Spanner *me = dynamic_cast<Spanner*> (me_grob);
extract_grob_set (me, "stems", stems);
*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"));
+ Slice ranks;
for (vsize i = 0; i < stems.size (); i++)
{
Grob *stem = stems[i];
{
if (!scm_is_integer (scm_car (s)))
continue;
-
+
+ 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;
- stem_segments[scm_to_int (scm_car (s))].push_back (seg);
+ 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);
}
}
while (flip (&d) != LEFT);
i != stem_segments.end (); i++)
{
vector<Beam_stem_segment> segs = (*i).second;
- vector_sort (segs, default_compare);
+ vector_sort (segs, less<Beam_stem_segment> ());
Beam_segment current;
- current.vertical_count_ = (*i).first;
+
+ int vertical_count = (*i).first;
for (vsize j = 0; j < segs.size (); j++)
{
/*
Direction event_dir = LEFT;
do
{
- Drul_array<bool> on_bound (j == 0 && event_dir==LEFT,
- j == segs.size() - 1 && event_dir==RIGHT);
- Drul_array<bool> inside (j > 0, j < segs.size()-1);
- bool event = on_bound[event_dir]
- || abs (segs[j].rank_ - segs[j+event_dir].rank_) > 1;
+ bool on_line_bound = (segs[j].dir_ == LEFT) ? segs[j].stem_index_ == 0
+ : segs[j].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_beam_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_);
if (!event)
continue;
- current.vertical_count_ = (*i).first;
+ current.vertical_count_ = vertical_count;
current.horizontal_[event_dir] = segs[j].stem_x_;
if (segs[j].dir_ == event_dir)
{
- if (on_bound[event_dir] && me->get_bound (event_dir)->break_status_dir ())
+ if (on_line_bound
+ && me->get_bound (event_dir)->break_status_dir ())
{
- current.horizontal_[event_dir] += event_dir * break_overshoot[event_dir];
+ current.horizontal_[event_dir]
+ = (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.
-
- if (inside[event_dir])
- notehead_width = min (notehead_width,
- fabs (segs[j+ event_dir].stem_x_
- - segs[j].stem_x_)/2);
-
+ ? 1.98
+ : 1.32; // URG.
+
+
+ if (inside_stem)
+ {
+ Grob *neighbor_stem = stems[segs[j].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.5);
+ }
current.horizontal_[event_dir] += event_dir * notehead_width;
}
}
else
{
current.horizontal_[event_dir] += event_dir * segs[j].width_/2;
+ if (segs[j].gapped_)
+ {
+ current.horizontal_[event_dir] -= event_dir * gap_length;
+
+ if (Stem::is_invisible (segs[j].stem_))
+ {
+ /*
+ Need to do this in case of whole notes. We don't want the
+ heads to collide with the beams.
+ */
+ extract_grob_set (segs[j].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)
{
- current.vertical_count_ = (*i).first;
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)
{
Grob *commonx = 0;
vector<Beam_segment> segments = get_beam_segments (me, &commonx);
- Real x0, dx;
- if (visible_stem_count (me))
+ Interval span;
+ if (normal_stem_count (me))
{
- x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
- dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0;
+ span[LEFT] = first_normal_stem (me)->relative_coordinate (commonx, X_AXIS);
+ span[RIGHT] = last_normal_stem (me)->relative_coordinate (commonx, X_AXIS);
}
else
{
extract_grob_set (me, "stems", stems);
- x0 = stems[0]->relative_coordinate (commonx, X_AXIS);
- dx = stems.back ()->relative_coordinate (commonx, X_AXIS) - x0;
+ span[LEFT] = stems[0]->relative_coordinate (commonx, X_AXIS);
+ span[RIGHT] = stems.back ()->relative_coordinate (commonx, X_AXIS);
}
Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
SCM posns = me->get_property ("quantized-positions");
- Drul_array<Real> pos;
+ Interval pos;
if (!is_number_pair (posns))
{
programming_error ("no beam positions?");
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
Real dy = pos[RIGHT] - pos[LEFT];
- Real slope = (dy && dx) ? dy / dx : 0;
+ Real slope = (dy && span.length ()) ? dy / span.length () : 0;
Real thick = get_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 ++)
{
- Stencil b = Lookup::beam (slope, segments[i].horizontal_.length (), thick, blot);
+ Real local_slope = slope;
+ if (feather_dir)
+ {
+ local_slope += feather_dir * segments[i].vertical_count_ * beam_dy / span.length ();
+ }
+
+ Stencil b = Lookup::beam (local_slope, segments[i].horizontal_.length (), thick, blot);
b.translate_axis (segments[i].horizontal_[LEFT], X_AXIS);
- b.translate_axis (slope * (segments[i].horizontal_[LEFT] - x0)
+
+ 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);
}
#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))
+ {
+ 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);
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, 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 (pos[LEFT], Y_AXIS);
the_beam.translate_axis (-me->relative_coordinate (commonx, X_AXIS), X_AXIS);
return the_beam.smobbed_copy ();
}
{
Grob *s = stems[i];
Direction stem_dir = CENTER;
- SCM stem_dir_scm = s->get_property_data (ly_symbol2scm ("direction"));
+ SCM stem_dir_scm = s->get_property_data ("direction");
if (is_direction (stem_dir_scm))
{
stem_dir = to_dir (stem_dir_scm);
{
Grob *s = stems[i];
- SCM forcedir = s->get_property_data (ly_symbol2scm ("direction"));
+ SCM forcedir = s->get_property_data ("direction");
if (!to_dir (forcedir))
set_grob_direction (s, d);
}
gaps.set_full ();
- extract_grob_set (me, "stems", stems);
+ extract_grob_set (me, "normal-stems", stems);
Grob *common = common_refpoint_of_array (stems, me, Y_AXIS);
Real staff_space = Staff_symbol_referencer::staff_space (me);
for (vsize i = 0; i < stems.size (); i++)
{
Grob *stem = stems[i];
- if (Stem::is_invisible (stem))
- continue;
Interval head_extents = Stem::head_positions (stem);
if (!head_extents.is_empty ())
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 (ly_symbol2scm ("direction"))))
+ if (to_dir (stem->get_property_data ("direction")))
{
Direction stemdir = to_dir (stem->get_property ("direction"));
head_extents[-stemdir] = -stemdir * infinity_f;
for (vsize i = 0; i < stems.size (); i++)
{
Grob *stem = stems[i];
- if (Stem::is_invisible (stem))
- continue;
-
Interval head_extents = head_extents_array[j++];
Direction d = (head_extents.center () < max_gap.center ())
-MAKE_SCHEME_CALLBACK(Beam, calc_stem_shorten, 1)
+MAKE_SCHEME_CALLBACK (Beam, calc_stem_shorten, 1)
SCM
Beam::calc_stem_shorten (SCM smob)
{
return scm_from_int (0);
Real forced_fraction = 1.0 * forced_stem_count (me)
- / visible_stem_count (me);
+ / normal_stem_count (me);
int beam_count = get_beam_count (me);
}
+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.
Grob *me = unsmob_grob (smob);
- int count = visible_stem_count (me);
+ 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, "stems", stems);
+ extract_grob_set (me, "normal-stems", stems);
Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS);
Real my_y = me->relative_coordinate (commony, Y_AXIS);
- Grob *fvs = first_visible_stem (me);
- Grob *lvs = last_visible_stem (me);
+ Grob *fvs = first_normal_stem (me);
+ Grob *lvs = last_normal_stem (me);
Interval ideal (Stem::get_stem_info (fvs).ideal_y_
- + fvs->relative_coordinate (commony, Y_AXIS) -my_y,
+ + fvs->relative_coordinate (commony, Y_AXIS) - my_y,
Stem::get_stem_info (lvs).ideal_y_
+ lvs->relative_coordinate (commony, Y_AXIS) - my_y);
- Real x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
+ Real x0 = first_normal_stem (me)->relative_coordinate (commonx, X_AXIS);
for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
Real x = s->relative_coordinate (commonx, X_AXIS) - x0;
x_posns.push_back (x);
}
- Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0;
+ Real dx = last_normal_stem (me)->relative_coordinate (commonx, X_AXIS) - x0;
Real y = 0;
Real slope = 0;
Real ldy = 0.0;
if (!ideal.delta ())
{
- Interval chord (Stem::chord_start_y (first_visible_stem (me)),
- Stem::chord_start_y (last_visible_stem (me)));
+ Interval chord (Stem::chord_start_y (stems[0]),
+ Stem::chord_start_y (stems.back ()));
/* Simple beams (2 stems) on middle line should be allowed to be
slightly sloped.
for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
- if (Stem::is_invisible (s))
- continue;
ideals.push_back (Offset (x_posns[i],
Stem::get_stem_info (s).ideal_y_
+ s->relative_coordinate (commony, Y_AXIS)
Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS);
- Grob *fvs = first_visible_stem (me);
+ Grob *fvs = first_normal_stem (me);
if (!fvs)
return posns;
x_posns.push_back (x);
}
- Grob *lvs = last_visible_stem (me);
+ Grob *lvs = last_normal_stem (me);
if (!lvs)
return posns;
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));
Grob *me = unsmob_grob (smob);
Drul_array<Real> pos = ly_scm2interval (posns);
- if (visible_stem_count (me) <= 1)
+ if (normal_stem_count (me) <= 1)
return posns;
Real dy = pos[RIGHT] - pos[LEFT];
- Grob *fvs = first_visible_stem (me);
- Grob *lvs = last_visible_stem (me);
+ Grob *fvs = first_normal_stem (me);
+ Grob *lvs = last_normal_stem (me);
Grob *commonx = fvs->common_refpoint (lvs, X_AXIS);
- Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS)
- - first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
+ Real dx = last_normal_stem (me)->relative_coordinate (commonx, X_AXIS)
+ - first_normal_stem (me)->relative_coordinate (commonx, X_AXIS);
Real slope = dy && dx ? dy / dx : 0;
/* Return the Y position of the stem-end, given the Y-left, Y-right
in POS for stem S. This Y position is relative to S. */
Real
-Beam::calc_stem_y (Grob *me, Grob *s, Grob ** common,
- Real xl, Real xr,
+Beam::calc_stem_y (Grob *me, Grob *stem, Grob **common,
+ 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 = s->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;
- Direction my_dir = get_grob_direction (s);
- SCM beaming = s->get_property ("beaming");
+ Real stem_y = linear_combination(pos, xdir);
- 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 (s);
- if (!bm.is_empty ())
- stem_y += bm[my_dir] * beam_translation;
- }
+ SCM beaming = stem->get_property ("beaming");
+
+ 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)
- - s->relative_coordinate (common[Y_AXIS], Y_AXIS);
+ - stem->relative_coordinate (common[Y_AXIS], Y_AXIS);
return stem_y + id;
}
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)
{
Grob *me = unsmob_grob (smob);
- /* trigger callback. */
+ /* trigger callbacks. */
(void) me->get_property ("direction");
+ (void) me->get_property ("beaming");
SCM posns = me->get_property ("positions");
bool gap = false;
Real thick = 0.0;
- if (scm_is_number (me->get_property ("gap-count"))
- && scm_to_int (me->get_property ("gap-count")))
+ if (robust_scm2int (me->get_property ("gap-count"), 0))
{
gap = true;
thick = get_thickness (me);
}
- Grob *fvs = first_visible_stem (me);
- Grob *lvs = last_visible_stem (me);
+ Grob *fvs = first_normal_stem (me);
+ Grob *lvs = last_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++)
{
Grob *s = stems[i];
- if (Stem::is_invisible (s))
- continue;
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);
/*
Make the stems go up to the end of the beam. This doesn't matter
for normal beams, but for tremolo beams it looks silly otherwise.
*/
- if (gap)
+ if (gap
+ && !Stem::is_invisible (s))
stem_y += thick * 0.5 * get_grob_direction (s);
+ /*
+ Do set_stemend for invisible stems too, so tuplet brackets
+ have a reference point for sloping
+ */
Stem::set_stemend (s, 2 * stem_y / staff_space);
}
}
void
-Beam::set_beaming (Grob *me, Beaming_info_list const *beaming)
+Beam::set_beaming (Grob *me, Beaming_pattern const *beaming)
{
extract_grob_set (me, "stems", stems);
if (beaming_prop == SCM_EOL
|| index_get_cell (beaming_prop, d) == SCM_EOL)
{
- int b = beaming->infos_.at (i).beams_i_drul_[d];
+ int count = beaming->beamlet_count (i, d);
if (i > 0
- && i < stems.size () -1
+ && i + 1 < stems.size ()
&& Stem::is_invisible (stem))
- b = min (b, beaming->infos_.at (i).beams_i_drul_[-d]);
+ count = min (count, beaming->beamlet_count (i,-d));
- Stem::set_beaming (stem, b, d);
+ if ( ((i == 0 && d == LEFT)
+ || (i == stems.size ()-1 && d == RIGHT))
+ && stems.size () > 1
+ && to_boolean (me->get_property ("clip-edges")))
+ count = 0;
+
+ Stem::set_beaming (stem, count, d);
}
}
while (flip (&d) != LEFT);
int
Beam::forced_stem_count (Grob *me)
{
- extract_grob_set (me, "stems", stems);
+ extract_grob_set (me, "normal-stems", stems);
int f = 0;
for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
- if (Stem::is_invisible (s))
- continue;
-
/* 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"));
}
int
-Beam::visible_stem_count (Grob *me)
+Beam::normal_stem_count (Grob *me)
{
- extract_grob_set (me, "stems", stems);
- int c = 0;
- for (vsize i = stems.size (); i--;)
- {
- if (!Stem::is_invisible (stems[i]))
- c++;
- }
- return c;
+ extract_grob_set (me, "normal-stems", stems);
+ return stems.size ();
}
Grob *
-Beam::first_visible_stem (Grob *me)
+Beam::first_normal_stem (Grob *me)
{
- extract_grob_set (me, "stems", stems);
-
- for (vsize i = 0; i < stems.size (); i++)
- {
- if (!Stem::is_invisible (stems[i]))
- return stems[i];
- }
- return 0;
+ extract_grob_set (me, "normal-stems", stems);
+ return stems.size () ? stems[0] : 0;
}
Grob *
-Beam::last_visible_stem (Grob *me)
+Beam::last_normal_stem (Grob *me)
{
- extract_grob_set (me, "stems", stems);
-
- for (vsize i = stems.size (); i--;)
- {
- if (!Stem::is_invisible (stems[i]))
- return stems[i];
- }
- return 0;
+ extract_grob_set (me, "normal-stems", stems);
+ return stems.size () ? stems.back () : 0;
}
/*
rest -> stem -> beam -> interpolate_y_position ()
*/
-MAKE_SCHEME_CALLBACK (Beam, rest_collision_callback, 2);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1, "");
SCM
Beam::rest_collision_callback (SCM smob, SCM prev_offset)
{
Grob *beam = unsmob_grob (stem->get_object ("beam"));
if (!beam
|| !Beam::has_interface (beam)
- || !Beam::visible_stem_count (beam))
+ || !Beam::normal_stem_count (beam))
return scm_from_double (0.0);
- Drul_array<Real> pos (0, 0);
- SCM s = beam->get_property ("positions");
- if (scm_is_pair (s) && scm_is_number (scm_car (s)))
- pos = ly_scm2interval (s);
- else
- programming_error ("positions property should always be pair of numbers.");
+ Drul_array<Real> pos (robust_scm2drul (beam->get_property ("positions"),
+ Drul_array<Real> (0,0)));
Real staff_space = Staff_symbol_referencer::staff_space (rest);
Real dy = pos[RIGHT] - pos[LEFT];
- Drul_array<Grob*> visible_stems (first_visible_stem (beam),
- last_visible_stem (beam));
+ 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 beam_y = stem_y - d * height_of_my_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);
= staff_space * (robust_scm2double (stem->get_property ("stemlet-length"), 0.0)
+ robust_scm2double (rest->get_property ("minimum-distance"), 0.0));
- Real shift = d * min (((beam_y - d * minimum_distance) - rest_dim) * d, 0.0);
+ Real shift = d * min (d * (beam_y - d * minimum_distance - rest_dim), 0.0);
shift /= staff_space;
Real rad = Staff_symbol_referencer::line_count (rest) * staff_space / 2;
< rad)
shift = ceil (fabs (shift)) * sign (shift);
- return scm_from_double (staff_space * shift);
+ return scm_from_double (offset + staff_space * shift);
}
bool
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,
- "beam-interface",
-
- "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. "
-
- ,
+ "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 "
"break-overshoot "
- "chord-tremolo "
+ "clip-edges "
"concaveness "
"damping "
"details "
- "direction "
+ "direction "
"gap "
"gap-count "
+ "grow-direction "
"inspect-quants "
"knee "
"length-fraction "
"least-squares-dy "
"neutral-direction "
+ "normal-stems "
"positions "
"quant-score "
"quantized-positions "