/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
#include "beam.hh"
+#include "axis-group-interface.hh"
+#include "align-interface.hh"
#include "beam-scoring-problem.hh"
#include "beaming-pattern.hh"
#include "directional-element-interface.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 "pointer-group-interface.hh"
#include "rhythmic-head.hh"
#include "spanner.hh"
+#include "staff-symbol.hh"
#include "staff-symbol-referencer.hh"
#include "stem.hh"
#include "warn.hh"
#include <map>
-
Beam_stem_segment::Beam_stem_segment ()
{
- max_connect_ = 1000; // infinity
+ max_connect_ = 1000; // infinity
stem_ = 0;
width_ = 0.0;
stem_x_ = 0.0;
}
bool
-beam_segment_less (Beam_segment const& a, Beam_segment const& b)
+beam_segment_less (Beam_segment const &a, Beam_segment const &b)
{
return a.horizontal_[LEFT] < b.horizontal_[LEFT];
}
if (Stem::get_beam (s))
{
programming_error ("Stem already has beam");
- return ;
+ return;
}
Pointer_group_interface::add_grob (me, ly_symbol2scm ("stems"), s);
Beam::get_beam_thickness (Grob *me)
{
return robust_scm2double (me->get_property ("beam-thickness"), 0)
- * Staff_symbol_referencer::staff_space (me);
+ * Staff_symbol_referencer::staff_space (me);
}
/* Return the translation between 2 adjoining beams. */
Real fract = robust_scm2double (me->get_property ("length-fraction"), 1.0);
Real beam_translation = beam_count < 4
- ? (2 * staff_space + line - beam_thickness) / 2.0
- : (3 * staff_space + line - beam_thickness) / 3.0;
+ ? (2 * staff_space + line - beam_thickness) / 2.0
+ : (3 * staff_space + line - beam_thickness) / 3.0;
return fract * beam_translation;
}
SCM
Beam::calc_normal_stems (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (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++)
+ Grob_array *ga = Grob_array::unsmob (val);
+ for (vsize i = 0; i < stems.size (); i++)
if (Stem::is_normal_stem (stems[i]))
ga->add (stems[i]);
SCM
Beam::calc_direction (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
/* Beams with less than 2 two stems don't make much sense, but could happen
when you do
{
extract_grob_set (me, "stems", stems);
if (stems.size () == 0)
- {
- me->warning (_ ("removing beam with no stems"));
- me->suicide ();
+ {
+ me->warning (_ ("removing beam with no stems"));
+ me->suicide ();
- return SCM_UNSPECIFIED;
- }
+ return SCM_UNSPECIFIED;
+ }
else
- {
- Grob *stem = first_normal_stem (me);
-
- /*
- This happens for chord tremolos.
- */
- 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"));
- }
+ {
+ Grob *stem = first_normal_stem (me);
+
+ /*
+ This happens for chord tremolos.
+ */
+ 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"));
+
+ extract_grob_set (stem, "note-heads", heads);
+ /* default position of Kievan heads with beams is down
+ placing this here avoids warnings downstream */
+ if (heads.size())
+ {
+ if (heads[0]->get_property ("style") == ly_symbol2scm ("kievan"))
+ {
+ if (dir == CENTER)
+ dir = DOWN;
+ }
+ }
+ }
}
if (count >= 1)
{
if (!dir)
- dir = get_default_dir (me);
+ dir = get_default_dir (me);
consider_auto_knees (me);
}
return scm_from_int (dir);
}
-
-
/* We want a maximal number of shared beams, but if there is choice, we
* take the one that is closest to the end of the stem. This is for
* situations like
*/
int
position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming,
- Direction left_dir,
- Direction right_dir)
+ Direction left_dir,
+ Direction right_dir)
{
Slice lslice = int_list_to_slice (scm_cdr (left_beaming));
{
int count = 0;
for (SCM s = scm_car (right_beaming); scm_is_pair (s); s = scm_cdr (s))
- {
- int k = -right_dir * scm_to_int (scm_car (s)) + i;
- if (scm_c_memq (scm_from_int (k), left_beaming) != SCM_BOOL_F)
- count++;
- }
+ {
+ int k = -right_dir * scm_to_int (scm_car (s)) + i;
+ if (scm_c_memq (scm_from_int (k), left_beaming) != SCM_BOOL_F)
+ count++;
+ }
if (count >= best_count)
- {
- best_count = count;
- best_start = i;
- }
+ {
+ best_count = count;
+ best_start = i;
+ }
}
return best_start;
SCM
Beam::calc_beaming (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
extract_grob_set (me, "stems", stems);
Direction this_dir = get_grob_direction (this_stem);
if (scm_is_pair (last_beaming) && scm_is_pair (this_beaming))
- {
- int start_point = position_with_maximal_common_beams
- (last_beaming, this_beaming,
- last_dir ? last_dir : this_dir,
- this_dir);
-
- Direction d = LEFT;
- Slice new_slice;
- do
- {
- new_slice.set_empty ();
- SCM s = index_get_cell (this_beaming, d);
- for (; scm_is_pair (s); s = scm_cdr (s))
- {
- int new_beam_pos
- = start_point - this_dir * scm_to_int (scm_car (s));
-
- new_slice.add_point (new_beam_pos);
- scm_set_car_x (s, scm_from_int (new_beam_pos));
- }
- }
- while (flip (&d) != LEFT);
-
- if (!new_slice.is_empty ())
- last_int = new_slice;
- }
+ {
+ int start_point = position_with_maximal_common_beams
+ (last_beaming, this_beaming,
+ last_dir ? last_dir : this_dir,
+ this_dir);
+
+ Slice new_slice;
+ for (LEFT_and_RIGHT (d))
+ {
+ new_slice.set_empty ();
+ SCM s = index_get_cell (this_beaming, d);
+ for (; scm_is_pair (s); s = scm_cdr (s))
+ {
+ int new_beam_pos
+ = start_point - this_dir * scm_to_int (scm_car (s));
+
+ new_slice.add_point (new_beam_pos);
+ scm_set_car_x (s, scm_from_int (new_beam_pos));
+ }
+ }
+
+ if (!new_slice.is_empty ())
+ last_int = new_slice;
+ }
else
- {
- /*
- FIXME: what's this for?
- */
- SCM s = scm_cdr (this_beaming);
- for (; scm_is_pair (s); s = scm_cdr (s))
- {
- int np = -this_dir * scm_to_int (scm_car (s));
- scm_set_car_x (s, scm_from_int (np));
- last_int.add_point (np);
- }
- }
+ {
+ /*
+ FIXME: what's this for?
+ */
+ SCM s = scm_cdr (this_beaming);
+ for (; scm_is_pair (s); s = scm_cdr (s))
+ {
+ int np = -this_dir * scm_to_int (scm_car (s));
+ scm_set_car_x (s, scm_from_int (np));
+ last_int.add_point (np);
+ }
+ }
if (scm_ilength (scm_cdr (this_beaming)) > 0)
- {
- last_beaming = this_beaming;
- last_dir = this_dir;
- }
+ {
+ last_beaming = this_beaming;
+ last_dir = this_dir;
+ }
}
return SCM_EOL;
bool
operator <(Beam_stem_segment const &a,
- Beam_stem_segment const &b)
+ Beam_stem_segment const &b)
{
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;
-// TODO - should store result in a property?
-vector<Beam_segment>
-Beam::get_beam_segments (Grob *me_grob, Grob **common)
+MAKE_SCHEME_CALLBACK (Beam, calc_beam_segments, 1);
+SCM
+Beam::calc_beam_segments (SCM smob)
{
/* ugh, this has a side-effect that we need to ensure that
Stem #'beaming is correct */
+ Grob *me_grob = Grob::unsmob (smob);
(void) me_grob->get_property ("beaming");
- Spanner *me = dynamic_cast<Spanner*> (me_grob);
+ Spanner *me = dynamic_cast<Spanner *> (me_grob);
extract_grob_set (me, "stems", stems);
- Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
- commonx = me->get_bound (LEFT)->common_refpoint (commonx, X_AXIS);
- commonx = me->get_bound (RIGHT)->common_refpoint (commonx, X_AXIS);
-
- *common = commonx;
+ Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
+ for (LEFT_and_RIGHT (d))
+ commonx = me->get_bound (d)->common_refpoint (commonx, X_AXIS);
int gap_count = robust_scm2int (me->get_property ("gap-count"), 0);
Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
Real stem_width = robust_scm2double (stem->get_property ("thickness"), 1.0) * lt;
Real stem_x = stem->relative_coordinate (commonx, X_AXIS);
SCM beaming = stem->get_property ("beaming");
- 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))
- {
- 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.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);
- }
- }
- while (flip (&d) != LEFT);
+
+ for (LEFT_and_RIGHT (d))
+ {
+ // 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))
+ {
+ 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.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);
+ }
+ }
}
Drul_array<Real> break_overshoot
= robust_scm2drul (me->get_property ("break-overshoot"),
- Drul_array<Real> (-0.5, 0.0));
+ Drul_array<Real> (-0.5, 0.0));
vector<Beam_segment> segments;
for (Position_stem_segments_map::const_iterator i (stem_segments.begin ());
// 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;
+ int vertical_count = (*i).first;
for (vsize j = 0; j < segs.size (); j++)
- {
- // 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
- {
- 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)
- ? 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] = 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_line_bound
- && me->get_bound (event_dir)->break_status_dir ())
- {
- current.horizontal_[event_dir]
- = (robust_relative_extent (me->get_bound (event_dir),
- commonx, X_AXIS)[RIGHT]
- + event_dir * break_overshoot[event_dir]);
- }
- else
- {
- 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[seg.stem_index_ + event_dir];
- Real neighbor_stem_x = neighbor_stem->relative_coordinate (commonx, X_AXIS);
-
- length = min (length,
- fabs (neighbor_stem_x - seg.stem_x_) * max_proportion[seg.dir_]);
- }
- 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 * 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 ();
- }
- }
- while (flip (&event_dir) != LEFT);
- }
+ {
+ // 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).
+ Beam_stem_segment const &seg = segs[j];
+ for (LEFT_and_RIGHT (event_dir))
+ {
+ 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)
+ ? 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 irrelevant because it will
+ // be connected with the next segment in the event_dir direction.
+ // If we skip the left edge here, the right edge of
+ // the previous segment has already been skipped since
+ // the conditions are symmetric
+ continue;
+
+ current.vertical_count_ = vertical_count;
+ 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_line_bound
+ && me->get_bound (event_dir)->break_status_dir ())
+ {
+ current.horizontal_[event_dir]
+ = (Axis_group_interface::generic_bound_extent (me->get_bound (event_dir),
+ commonx, X_AXIS)[RIGHT]
+ + event_dir * break_overshoot[event_dir]);
+ }
+ else
+ {
+ 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[seg.stem_index_ + event_dir];
+ Real neighbor_stem_x = neighbor_stem->relative_coordinate (commonx, X_AXIS);
+
+ length = min (length,
+ fabs (neighbor_stem_x - seg.stem_x_) * max_proportion[seg.dir_]);
+ }
+ 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 * 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 ();
+ }
+ }
+ }
+
+ }
+
+ SCM segments_scm = SCM_EOL;
+
+ for (vsize i = segments.size (); i--;)
+ {
+ segments_scm = scm_cons (scm_list_2 (scm_cons (ly_symbol2scm ("vertical-count"),
+ scm_from_int (segments[i].vertical_count_)),
+ scm_cons (ly_symbol2scm ("horizontal"),
+ ly_interval2scm (segments[i].horizontal_))),
+ segments_scm);
+ }
+ return segments_scm;
+}
+
+MAKE_SCHEME_CALLBACK (Beam, calc_x_positions, 1);
+SCM
+Beam::calc_x_positions (SCM smob)
+{
+ Spanner *me = unsmob_spanner (smob);
+ SCM segments = me->get_property ("beam-segments");
+ Interval x_positions;
+ x_positions.set_empty ();
+ for (SCM s = segments; scm_is_pair (s); s = scm_cdr (s))
+ x_positions.unite (robust_scm2interval (ly_assoc_get (ly_symbol2scm ("horizontal"),
+ scm_car (s),
+ SCM_EOL),
+ Interval (0.0, 0.0)));
+
+ // Case for beams without segments (i.e. uniting two skips with a beam)
+ // TODO: should issue a warning? warning likely issued downstream, but couldn't hurt...
+ if (x_positions.is_empty ())
+ {
+ extract_grob_set (me, "stems", stems);
+ Grob *common_x = common_refpoint_of_array (stems, me, X_AXIS);
+ for (LEFT_and_RIGHT (d))
+ x_positions[d] = me->relative_coordinate (common_x, X_AXIS);
+ }
+ return ly_interval2scm (x_positions);
+}
+
+vector<Beam_segment>
+Beam::get_beam_segments (Grob *me)
+{
+ SCM segments_scm = me->get_property ("beam-segments");
+ vector<Beam_segment> segments;
+ for (SCM s = segments_scm; scm_is_pair (s); s = scm_cdr (s))
+ {
+ segments.push_back (Beam_segment ());
+ segments.back ().vertical_count_ = robust_scm2int (ly_assoc_get (ly_symbol2scm ("vertical-count"), scm_car (s), SCM_EOL), 0);
+ segments.back ().horizontal_ = robust_scm2interval (ly_assoc_get (ly_symbol2scm ("horizontal"), scm_car (s), SCM_EOL), Interval (0.0, 0.0));
}
return segments;
Beam::print (SCM grob)
{
Spanner *me = unsmob_spanner (grob);
- Grob *commonx = 0;
- vector<Beam_segment> segments = get_beam_segments (me, &commonx);
+ /*
+ TODO - mild code dup for all the commonx calls.
+ Some use just common_refpoint_of_array, some (in print and
+ calc_beam_segments) use this plus calls to get_bound.
- Interval span;
- if (normal_stem_count (me))
- {
- 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);
- span[LEFT] = stems[0]->relative_coordinate (commonx, X_AXIS);
- span[RIGHT] = stems.back ()->relative_coordinate (commonx, X_AXIS);
- }
+ Figure out if there is any particular reason for this and
+ consolidate in one Beam::get_common function.
+ */
+ extract_grob_set (me, "stems", stems);
+ Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
+ for (LEFT_and_RIGHT (d))
+ commonx = me->get_bound (d)->common_refpoint (commonx, X_AXIS);
+
+ vector<Beam_segment> segments = get_beam_segments (me);
+
+ if (!segments.size ())
+ return SCM_EOL;
Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
SCM posns = me->get_property ("quantized-positions");
+ Interval span = robust_scm2interval (me->get_property ("X-positions"), Interval (0, 0));
Interval pos;
if (!is_number_pair (posns))
{
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
Real dy = pos[RIGHT] - pos[LEFT];
- Real slope = (dy && span.length ()) ? dy / span.length () : 0;
+ Real slope = (dy && span.length ()) ? dy / span.length () : 0;
Real beam_thickness = get_beam_thickness (me);
Real beam_dy = get_beam_translation (me);
Interval placements = robust_scm2interval (me->get_property ("normalized-endpoints"), Interval (0.0, 0.0));
Stencil the_beam;
+ vsize extreme = (segments[0].vertical_count_ == 0
+ ? segments[0].vertical_count_
+ : segments.back ().vertical_count_);
- int extreme = (segments[0].vertical_count_ == 0
- ? segments[0].vertical_count_
- : segments.back ().vertical_count_);
-
- for (vsize i = 0; i < segments.size (); i ++)
+ for (vsize i = 0; i < segments.size (); i++)
{
Real local_slope = slope;
/*
*/
if (feather_dir)
local_slope += (feather_dir * segments[i].vertical_count_
- * beam_dy
- * placements.length ()
+ * beam_dy
+ * placements.length ()
/ span.length ());
Stencil b = Lookup::beam (local_slope, segments[i].horizontal_.length (), beam_thickness, blot);
// we need two translations: the normal one and
// the one of the lowest segment
- int idx[] = {i, extreme};
+ size_t idx[] = {i, extreme};
Real translations[2];
for (int j = 0; j < 2; j++)
extract_grob_set (me, "stems", stems);
/*
- This code prints the demerits for each beam. Perhaps this
- should be switchable for those who want to twiddle with the
- parameters.
+ This code prints the demerits for each beam. Perhaps this
+ should be switchable for those who want to twiddle with the
+ parameters.
*/
string str;
SCM properties = Font_interface::text_font_alist_chain (me);
- properties = scm_cons(scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-5), SCM_EOL),
- properties);
+ properties = scm_cons (scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-5), SCM_EOL),
+ properties);
Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP;
- Stencil score = *unsmob_stencil (Text_interface::interpret_markup
+ Stencil score = *Stencil::unsmob (Text_interface::interpret_markup
(me->layout ()->self_scm (), properties, annotation));
if (!score.is_empty ())
- {
- score.translate_axis (me->relative_coordinate(commonx, X_AXIS), X_AXIS);
- 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
for (iterof (s, stems); s != stems.end (); s++)
{
Interval positions = Stem::head_positions (*s);
- Direction d = DOWN;
- do
- {
- if (sign (positions[d]) == d)
- extremes[d] = d * max (d * positions[d], d * extremes[d]);
- }
- while (flip (&d) != DOWN);
+ for (DOWN_and_UP (d))
+ {
+ if (sign (positions[d]) == d)
+ extremes[d] = d * max (d * positions[d], d * extremes[d]);
+ }
}
Drul_array<int> total (0, 0);
Direction stem_dir = CENTER;
SCM stem_dir_scm = s->get_property_data ("direction");
if (is_direction (stem_dir_scm))
- {
- stem_dir = to_dir (stem_dir_scm);
- force_dir = true;
- }
+ {
+ stem_dir = to_dir (stem_dir_scm);
+ force_dir = true;
+ }
else
- stem_dir = to_dir (s->get_property ("default-direction"));
+ stem_dir = to_dir (s->get_property ("default-direction"));
if (!stem_dir)
- stem_dir = to_dir (s->get_property ("neutral-direction"));
+ stem_dir = to_dir (s->get_property ("neutral-direction"));
if (stem_dir)
- {
- count[stem_dir] ++;
- total[stem_dir] += max (int (- stem_dir * Stem::head_positions (s) [-stem_dir]), 0);
- }
+ {
+ count[stem_dir]++;
+ total[stem_dir] += max (int (- stem_dir * Stem::head_positions (s) [-stem_dir]), 0);
+ }
}
-
if (!force_dir)
{
if (abs (extremes[UP]) > -extremes[DOWN])
- return DOWN;
+ return DOWN;
else if (extremes[UP] < -extremes[DOWN])
- return UP;
+ return UP;
}
Direction dir = CENTER;
if ((d = (Direction) sign (count[UP] - count[DOWN])))
dir = d;
else if (count[UP]
- && count[DOWN]
- && (d = (Direction) sign (total[UP] / count[UP] - total[DOWN]/count[DOWN])))
+ && count[DOWN]
+ && (d = (Direction) sign (total[UP] / count[UP] - total[DOWN] / count[DOWN])))
dir = d;
- else if ((d = (Direction) sign (total[UP] - total[DOWN])))
+ else if ((d = (Direction) sign (total[UP] - total[DOWN])))
dir = d;
else
dir = to_dir (me->get_property ("neutral-direction"));
SCM forcedir = s->get_property_data ("direction");
if (!to_dir (forcedir))
- set_grob_direction (s, d);
+ set_grob_direction (s, d);
}
}
if (!scm_is_number (scm))
return;
- Interval_set gaps;
-
- gaps.set_full ();
+ vector<Interval> forbidden_intervals;
extract_grob_set (me, "normal-stems", stems);
Interval head_extents = Stem::head_positions (stem);
if (!head_extents.is_empty ())
- {
- head_extents[LEFT] += -1;
- head_extents[RIGHT] += 1;
- head_extents *= staff_space * 0.5;
-
- /*
- We could subtract beam Y position, but this routine only
- sets stem directions, a constant shift does not have an
- influence.
- */
- head_extents += stem->pure_relative_y_coordinate (common, 0, INT_MAX);
-
- if (to_dir (stem->get_property_data ("direction")))
- {
- Direction stemdir = to_dir (stem->get_property ("direction"));
- head_extents[-stemdir] = -stemdir * infinity_f;
- }
- }
+ {
+ head_extents[LEFT] += -1;
+ head_extents[RIGHT] += 1;
+ head_extents *= staff_space * 0.5;
+
+ /*
+ We could subtract beam Y position, but this routine only
+ sets stem directions, a constant shift does not have an
+ influence.
+ */
+ head_extents += stem->pure_relative_y_coordinate (common, 0, INT_MAX);
+
+ if (to_dir (stem->get_property_data ("direction")))
+ {
+ Direction stemdir = to_dir (stem->get_property ("direction"));
+ head_extents[-stemdir] = -stemdir * infinity_f;
+ }
+ }
head_extents_array.push_back (head_extents);
- gaps.remove_interval (head_extents);
+ forbidden_intervals.push_back (head_extents);
}
Interval max_gap;
Real max_gap_len = 0.0;
- for (vsize i = gaps.allowed_regions_.size () -1; i != VPOS ;i--)
+ vector<Interval> allowed_regions
+ = Interval_set::interval_union (forbidden_intervals).complement ().intervals ();
+ for (vsize i = allowed_regions.size () - 1; i != VPOS; i--)
{
- Interval gap = gaps.allowed_regions_[i];
+ Interval gap = allowed_regions[i];
/*
- the outer gaps are not knees.
+ the outer gaps are not knees.
*/
if (isinf (gap[LEFT]) || isinf (gap[RIGHT]))
- continue;
+ continue;
if (gap.length () >= max_gap_len)
- {
- max_gap_len = gap.length ();
- max_gap = gap;
- }
+ {
+ max_gap_len = gap.length ();
+ max_gap = gap;
+ }
}
Real beam_translation = get_beam_translation (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;
+ + (beam_count - 1) * beam_translation;
Real threshold = scm_to_double (scm) + height_of_beams;
if (max_gap_len > threshold)
{
int j = 0;
for (vsize i = 0; i < stems.size (); i++)
- {
- Grob *stem = stems[i];
- Interval head_extents = head_extents_array[j++];
-
- Direction d = (head_extents.center () < max_gap.center ())
- ? UP : DOWN;
-
- stem->set_property ("direction", scm_from_int (d));
-
- head_extents.intersect (max_gap);
- assert (head_extents.is_empty () || head_extents.length () < 1e-6);
- }
- }
-}
-
-/* Set stem's shorten property if unset.
-
-TODO:
-take some y-position (chord/beam/nearest?) into account
-scmify forced-fraction
-
-This is done in beam because the shorten has to be uniform over the
-entire beam.
-*/
-
-
+ {
+ Grob *stem = stems[i];
+ Interval head_extents = head_extents_array[j++];
-void
-set_minimum_dy (Grob *me, Real *dy)
-{
- if (*dy)
- {
- /*
- If dy is smaller than the smallest quant, we
- get absurd direction-sign penalties.
- */
+ Direction d = (head_extents.center () < max_gap.center ())
+ ? UP : DOWN;
- Real ss = Staff_symbol_referencer::staff_space (me);
- Real beam_thickness = Beam::get_beam_thickness (me) / ss;
- Real slt = Staff_symbol_referencer::line_thickness (me) / ss;
- Real sit = (beam_thickness - slt) / 2;
- Real inter = 0.5;
- Real hang = 1.0 - (beam_thickness - slt) / 2;
+ stem->set_property ("direction", scm_from_int (d));
- *dy = sign (*dy) * max (fabs (*dy),
- min (min (sit, inter), hang));
+ head_extents.intersect (max_gap);
+ assert (head_extents.is_empty () || head_extents.length () < 1e-6);
+ }
}
}
-
-
MAKE_SCHEME_CALLBACK (Beam, calc_stem_shorten, 1)
SCM
Beam::calc_stem_shorten (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
/*
shortening looks silly for x staff beams
return scm_from_int (0);
Real forced_fraction = 1.0 * forced_stem_count (me)
- / normal_stem_count (me);
+ / normal_stem_count (me);
int beam_count = get_beam_count (me);
Real staff_space = Staff_symbol_referencer::staff_space (me);
SCM shorten_elt
- = robust_list_ref (beam_count -1, shorten_list);
+ = robust_list_ref (beam_count - 1, shorten_list);
Real shorten = scm_to_double (shorten_elt) * staff_space;
shorten *= forced_fraction;
-
if (shorten)
return scm_from_double (shorten);
return scm_from_double (0.0);
}
-
-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 */)
-{
- Grob *me = unsmob_grob (smob);
-
- int count = normal_stem_count (me);
- Interval pos (0,0);
- if (count < 1)
- return ly_interval2scm (no_visible_stem_positions (me, pos));
-
- vector<Real> x_posns;
- 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_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,
- Stem::get_stem_info (lvs).ideal_y_
- + lvs->relative_coordinate (commony, Y_AXIS) - my_y);
-
- 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_normal_stem (me)->relative_coordinate (commonx, X_AXIS) - x0;
-
- Real y = 0;
- Real slope = 0;
- Real dy = 0;
- Real ldy = 0.0;
- if (!ideal.delta ())
- {
- 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.
-
- However, if both stems reach middle line,
- ideal[LEFT] == ideal[RIGHT] and ideal.delta () == 0.
-
- For that case, we apply artificial slope */
- if (!ideal[LEFT] && chord.delta () && count == 2)
- {
- /* FIXME. -> UP */
- Direction d = (Direction) (sign (chord.delta ()) * UP);
- pos[d] = get_beam_thickness (me) / 2;
- pos[-d] = -pos[d];
- }
- else
- pos = ideal;
-
- /*
- For broken beams this doesn't work well. In this case, the
- slope esp. of the first part of a broken beam should predict
- where the second part goes.
- */
- ldy = pos[RIGHT] - pos[LEFT];
- }
- else
- {
- vector<Offset> ideals;
- for (vsize i = 0; i < stems.size (); i++)
- {
- Grob *s = stems[i];
- ideals.push_back (Offset (x_posns[i],
- Stem::get_stem_info (s).ideal_y_
- + s->relative_coordinate (commony, Y_AXIS)
- - my_y));
- }
-
- minimise_least_squares (&slope, &y, ideals);
-
- dy = slope * dx;
-
- set_minimum_dy (me, &dy);
-
- ldy = dy;
- pos = Interval (y, (y + dy));
- }
-
- /*
- "position" is relative to the staff.
- */
- scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me));
-
- me->set_property ("least-squares-dy", scm_from_double (ldy));
- return ly_interval2scm (pos);
-}
-
-
-// Assuming V is not empty, pick a 'reasonable' point inside V.
-static Real
-point_in_interval (Interval v, Real dist)
-{
- if (isinf (v[DOWN]))
- return v[UP] - dist;
- else if (isinf (v[UP]))
- return v[DOWN] + dist;
- else
- return v.center ();
-}
-
-/*
- We can't combine with previous function, since check concave and
- slope damping comes first.
-
- TODO: we should use the concaveness to control the amount of damping
- applied.
-*/
-MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 2);
+MAKE_SCHEME_CALLBACK (Beam, quanting, 3);
SCM
-Beam::shift_region_to_valid (SCM grob, SCM posns)
+Beam::quanting (SCM smob, SCM ys_scm, SCM align_broken_intos)
{
- Grob *me = unsmob_grob (grob);
-
- /*
- Code dup.
- */
- vector<Real> x_posns;
- extract_grob_set (me, "stems", stems);
- extract_grob_set (me, "covered-grobs", covered);
-
- Grob *common[NO_AXES] = { me, me };
- for (Axis a = X_AXIS; a < NO_AXES; incr (a)) {
- common[a] = common_refpoint_of_array (stems, me, a);
- common[a] = common_refpoint_of_array (covered, common[a], a);
- }
- Grob *fvs = first_normal_stem (me);
-
- if (!fvs)
- return posns;
- Interval x_span;
- x_span[LEFT] = fvs->relative_coordinate (common[X_AXIS], X_AXIS);
- for (vsize i = 0; i < stems.size (); i++)
- {
- Grob *s = stems[i];
-
- Real x = s->relative_coordinate (common[X_AXIS], X_AXIS) - x_span[LEFT];
- x_posns.push_back (x);
- }
-
- Grob *lvs = last_normal_stem (me);
- x_span[RIGHT] = lvs->relative_coordinate (common[X_AXIS], X_AXIS);
-
- Drul_array<Real> pos = ly_scm2interval (posns);
-
- scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
-
- Real beam_dy = pos[RIGHT] - pos[LEFT];
- Real beam_left_y = pos[LEFT];
- Real slope = x_span.delta () ? (beam_dy / x_span.delta ()) : 0.0;
-
- /*
- Shift the positions so that we have a chance of finding good
- quants (i.e. no short stem failures.)
- */
- Interval feasible_left_point;
- feasible_left_point.set_full ();
-
- for (vsize i = 0; i < stems.size (); i++)
- {
- Grob *s = stems[i];
- if (Stem::is_invisible (s))
- continue;
-
- Direction d = get_grob_direction (s);
- Real left_y
- = Stem::get_stem_info (s).shortest_y_
- - slope * x_posns [i];
-
- /*
- left_y is now relative to the stem S. We want relative to
- ourselves, so translate:
- */
- left_y
- += + s->relative_coordinate (common[Y_AXIS], Y_AXIS)
- - me->relative_coordinate (common[Y_AXIS], Y_AXIS);
-
- Interval flp;
- flp.set_full ();
- flp[-d] = left_y;
-
- feasible_left_point.intersect (flp);
- }
-
- /*
- We have two intervals here, one for the up variant (beams goes
- over the collision) one for the down.
- */
- Drul_array<Interval> collision_free (feasible_left_point,
- feasible_left_point);
-
- vector<Grob*> filtered;
- /*
- We only update these for objects that are too large for quanting
- to find a workaround. Typically, these are notes with
- stems, and timesig/keysig/clef, which take out the entire area
- inside the staff as feasible.
-
- The code below disregards the thickness and multiplicity of the
- beam. This should not be a problem, as the beam quanting will
- take care of computing the impact those exactly.
- */
- Real min_y_size = 2.0;
- for (vsize i = 0; i < covered.size(); i++)
- {
- if (!covered[i]->is_live())
- continue;
-
- Box b;
- for (Axis a = X_AXIS; a < NO_AXES; incr (a))
- b[a] = covered[i]->extent (common[a], a);
-
- if (b[X_AXIS].is_empty () || b[Y_AXIS].is_empty ())
- continue;
-
- if (intersection (b[X_AXIS], x_span).is_empty ())
- continue;
-
- filtered.push_back (covered[i]);
- Grob *head_stem = Rhythmic_head::get_stem (covered[i]);
- if (head_stem && Stem::is_normal_stem (head_stem)
- && Note_head::has_interface (covered[i]))
- {
- if (Stem::get_beam (head_stem))
- {
- /*
- We must assume that stems are infinitely long in this
- case, as asking for the length of the stem typically
- leads to circular dependencies.
-
- This strategy assumes that we don't want to handle the
- collision of beams in opposite non-forced directions
- with this code, where shortening the stems of both
- would resolve the problem, eg.
-
- x x
- | |
- =====
-
- =====
- | |
- x x
-
- Such beams would need a coordinating grob to resolve
- the collision, since both will likely want to occupy
- the centerline.
- */
- Direction stemdir = get_grob_direction (head_stem);
- b[Y_AXIS][stemdir] = stemdir * infinity_f;
- }
- else
- {
- // TODO - should we include the extent of the stem here?
- }
- }
-
- if (b[Y_AXIS].length () < min_y_size)
- continue;
-
- Direction d = LEFT;
- do
- {
- Real x = b[X_AXIS][d] - x_span[LEFT];
- Real dy = slope * x;
-
- Direction yd = DOWN;
- do
- {
- Real left_y = b[Y_AXIS][yd];
-
- if (left_y == yd * infinity_f)
- {
- collision_free[yd].set_empty ();
- continue;
- }
-
- left_y -= dy;
-
- // Translate back to beam as ref point.
- left_y -= me->relative_coordinate (common[Y_AXIS], Y_AXIS);
-
- Interval allowed;
- allowed.set_full ();
-
- allowed[-yd] = left_y;
- collision_free[yd].intersect (allowed);
- }
- while (flip (&yd) != DOWN);
- }
- while (flip (&d) != LEFT);
- }
-
- Grob_array *arr =
- Pointer_group_interface::get_grob_array (me,
- ly_symbol2scm ("covered-grobs"));
- arr->set_array (filtered);
-
- if (collision_free[DOWN].contains (beam_left_y)
- || collision_free[UP].contains (beam_left_y))
- {
- // We're good to go. Do nothing.
- }
- else if (collision_free[DOWN].is_empty() != collision_free[UP].is_empty())
- {
- // Only one of them offers is feasible solution. Pick that one.
- Interval v =
- (!collision_free[DOWN].is_empty()) ?
- collision_free[DOWN] :
- collision_free[UP];
-
- beam_left_y = point_in_interval (v, 2.0);
- }
- else if (!collision_free[DOWN].is_empty ()
- && !collision_free[UP].is_empty ())
- {
- // Above and below are candidates, take the one closest to the
- // starting solution.
- Interval best =
- (collision_free[DOWN].distance (beam_left_y)
- < collision_free[UP].distance (beam_left_y)) ?
- collision_free[DOWN] : collision_free[UP];
-
- beam_left_y = point_in_interval (best, 2.0);
- }
- else if (!feasible_left_point.is_empty ())
- {
- // We are somewhat screwed: we have a collision, but at least
- // there is a way to satisfy stem length constraints.
- beam_left_y = point_in_interval (feasible_left_point, 2.0);
- }
- else
- {
- // We are completely screwed.
- warning (_ ("no viable initial configuration found: may not find good beam slope"));
- }
-
- pos = Drul_array<Real> (beam_left_y, (beam_left_y + beam_dy));
- scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me));
-
- return ly_interval2scm (pos);
-}
-
-/* This neat trick is by Werner Lemberg,
- damped = tanh (slope)
- corresponds with some tables in [Wanske] CHECKME */
-MAKE_SCHEME_CALLBACK (Beam, slope_damping, 2);
-SCM
-Beam::slope_damping (SCM smob, SCM posns)
-{
- Grob *me = unsmob_grob (smob);
- Drul_array<Real> pos = ly_scm2interval (posns);
-
- 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);
- if (concaveness >= 10000)
- {
- pos[LEFT] = pos[RIGHT];
- me->set_property ("least-squares-dy", scm_from_double (0));
- damping = 0;
- }
-
- if (damping)
- {
- scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
-
- Real dy = pos[RIGHT] - pos[LEFT];
-
- Grob *fvs = first_normal_stem (me);
- Grob *lvs = last_normal_stem (me);
-
- Grob *commonx = fvs->common_refpoint (lvs, 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;
-
- slope = 0.6 * tanh (slope) / (damping + concaveness);
-
- Real damped_dy = slope * dx;
-
- set_minimum_dy (me, &damped_dy);
-
- pos[LEFT] += (dy - damped_dy) / 2;
- pos[RIGHT] -= (dy - damped_dy) / 2;
-
- scale_drul (&pos, 1 / 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);
+ Grob *me = Grob::unsmob (smob);
+ Drul_array<Real> ys = robust_scm2drul (ys_scm, Drul_array<Real> (infinity_f, -infinity_f));
+ bool cbs = to_boolean (align_broken_intos);
+ Beam_scoring_problem problem (me, ys, cbs);
ys = problem.solve ();
+
return ly_interval2scm (ys);
}
-
/*
Report slice containing the numbers that are both in (car BEAMING)
and (cdr BEAMING)
{
if (scm_c_memq (scm_car (s), scm_cdr (beaming)) != SCM_BOOL_F)
- l.add_point (scm_to_int (scm_car (s)));
+ l.add_point (scm_to_int (scm_car (s)));
}
return l;
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, Direction feather_dir,
- Drul_array<Real> pos, bool french)
+ 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 dx = xr - xl;
- Real relx = dx ? (stem->relative_coordinate (common[X_AXIS], X_AXIS) - xl)/dx : 0;
- Real xdir = 2*relx-1;
+ 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);
+ Real stem_y = linear_combination (pos, xdir);
SCM beaming = stem->get_property ("beaming");
Slice beam_slice (french
- ? where_are_the_whole_beams (beaming)
- : Stem::beam_multiplicity (stem));
+ ? 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]);
+ beam_slice = Slice (0, 0);
+ Interval beam_multiplicity (beam_slice[LEFT],
+ beam_slice[RIGHT]);
/*
feather dir = 1 , relx 0->1 : factor 0 -> 1
feather_factor = 1 - relx;
stem_y += feather_factor * beam_translation
- * beam_multiplicity[Direction(((french) ? DOWN : UP)*stem_dir)];
+ * 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);
+ - stem->relative_coordinate (common[Y_AXIS], Y_AXIS);
return stem_y + id;
}
SCM
Beam::set_stem_lengths (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
/* trigger callbacks. */
(void) me->get_property ("direction");
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;
+ Interval x_span = robust_scm2interval (me->get_property ("X-positions"), Interval (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, feather_dir,
- pos, french && s != lvs && s!= fvs);
+ x_span[LEFT], x_span[RIGHT], 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.
+ 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
- && !Stem::is_invisible (s))
- stem_y += thick * 0.5 * get_grob_direction (s);
+ && !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
+ Do set_stem_positions for invisible stems too, so tuplet brackets
+ have a reference point for sloping
*/
- Stem::set_stemend (s, 2 * stem_y / staff_space);
+ Stem::set_stem_positions (s, 2 * stem_y / staff_space);
}
return posns;
{
extract_grob_set (me, "stems", stems);
- Direction d = LEFT;
for (vsize i = 0; i < stems.size (); i++)
{
/*
- Don't overwrite user settings.
+ Don't overwrite user settings.
*/
- do
- {
- Grob *stem = stems[i];
- SCM beaming_prop = stem->get_property ("beaming");
- if (beaming_prop == SCM_EOL
- || index_get_cell (beaming_prop, d) == SCM_EOL)
- {
- int count = beaming->beamlet_count (i, d);
- if (i > 0
- && i + 1 < stems.size ()
- && Stem::is_invisible (stem))
- count = min (count, beaming->beamlet_count (i,-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);
+ for (LEFT_and_RIGHT (d))
+ {
+ Grob *stem = stems[i];
+ SCM beaming_prop = stem->get_property ("beaming");
+ if (beaming_prop == SCM_EOL
+ || index_get_cell (beaming_prop, d) == SCM_EOL)
+ {
+ int count = beaming->beamlet_count (i, d);
+ if (i > 0
+ && i + 1 < stems.size ()
+ && Stem::is_invisible (stem))
+ count = min (count, beaming->beamlet_count (i, -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);
+ }
+ }
}
}
Grob *s = stems[i];
/* I can imagine counting those boundaries as a half forced stem,
- but let's count them full for now. */
+ 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)
- f++;
+ && defdir
+ && get_grob_direction (s) != defdir)
+ f++;
}
return f;
}
SCM
Beam::rest_collision_callback (SCM smob, SCM prev_offset)
{
- Grob *rest = unsmob_grob (smob);
+ Grob *rest = Grob::unsmob (smob);
if (scm_is_number (rest->get_property ("staff-position")))
return scm_from_int (0);
Real offset = robust_scm2double (prev_offset, 0.0);
- Grob *st = unsmob_grob (rest->get_object ("stem"));
+ Grob *st = Grob::unsmob (rest->get_object ("stem"));
Grob *stem = st;
if (!stem)
return scm_from_double (0.0);
- Grob *beam = unsmob_grob (stem->get_object ("beam"));
+ Grob *beam = Grob::unsmob (stem->get_object ("beam"));
if (!beam
|| !Beam::has_interface (beam)
|| !Beam::normal_stem_count (beam))
return scm_from_double (0.0);
+ Grob *common_y = rest->common_refpoint (beam, Y_AXIS);
+
Drul_array<Real> pos (robust_scm2drul (beam->get_property ("positions"),
- Drul_array<Real> (0,0)));
+ Drul_array<Real> (0, 0)));
+
+ for (LEFT_and_RIGHT (dir))
+ pos[dir] += beam->relative_coordinate (common_y, Y_AXIS);
Real staff_space = Staff_symbol_referencer::staff_space (rest);
Real dy = pos[RIGHT] - pos[LEFT];
- 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;
+ Interval x_span = robust_scm2interval (beam->get_property ("X-positions"),
+ Interval (0.0, 0.0));
+ Real x0 = x_span[LEFT];
+ Real dx = x_span.length ();
Real slope = dy && dx ? dy / dx : 0;
Direction d = get_grob_direction (stem);
Real stem_y = pos[LEFT]
- + (stem->relative_coordinate (common, X_AXIS) - x0) * slope;
+ + (stem->relative_coordinate (common, X_AXIS) - x0) * slope;
Real beam_translation = get_beam_translation (beam);
Real beam_thickness = Beam::get_beam_thickness (beam);
= Stem::beam_multiplicity (stem).length () + 1;
Real height_of_my_beams = beam_thickness / 2
- + (beam_count - 1) * beam_translation;
+ + (beam_count - 1) * beam_translation;
Real beam_y = stem_y - d * height_of_my_beams;
- Grob *common_y = rest->common_refpoint (beam, Y_AXIS);
-
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)
- + robust_scm2double (rest->get_property ("minimum-distance"), 0.0));
+ + robust_scm2double (rest->get_property ("minimum-distance"), 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;
/* Always move discretely by half spaces */
shift = ceil (fabs (shift * 2.0)) / 2.0 * sign (shift);
+ Interval staff_span = Staff_symbol_referencer::staff_span (rest);
+ staff_span *= staff_space / 2;
+
/* Inside staff, move by whole spaces*/
- if ((rest_extent[d] + staff_space * shift) * d
- < rad
- || (rest_extent[-d] + staff_space * shift) * -d
- < rad)
+ if (staff_span.contains (rest_extent[d] + staff_space * shift)
+ || staff_span.contains (rest_extent[-d] + staff_space * shift))
shift = ceil (fabs (shift)) * sign (shift);
return scm_from_double (offset + staff_space * shift);
}
+/*
+ Estimate the position of a rest under a beam,
+ as the average position of its neighboring heads.
+*/
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, pure_rest_collision_callback, 4, 1, "");
+SCM
+Beam::pure_rest_collision_callback (SCM smob,
+ SCM, /* start */
+ SCM, /* end */
+ SCM prev_offset)
+{
+ Real previous = robust_scm2double (prev_offset, 0.0);
+
+ Grob *me = Grob::unsmob (smob);
+ Grob *stem = Grob::unsmob (me->get_object ("stem"));
+ if (!stem)
+ return scm_from_double (previous);
+ Grob *beam = Grob::unsmob (stem->get_object ("beam"));
+ if (!beam
+ || !Beam::normal_stem_count (beam)
+ || !is_direction (beam->get_property_data ("direction")))
+ return scm_from_double (previous);
+
+ Real ss = Staff_symbol_referencer::staff_space (me);
+
+ /*
+ This gives the extrema of rest positions.
+ Even with noteheads on ledgers, beams typically remain within the staff,
+ and push rests at most one staff-space (2 positions) from the staff.
+ */
+ Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
+ Interval rest_max_pos = staff ? Staff_symbol::line_span (staff) : Interval (0.0, 0.0);
+ rest_max_pos.widen (2);
+
+ extract_grob_set (beam, "stems", stems);
+ vector<Grob *> my_stems;
+
+ for (vsize i = 0; i < stems.size (); i++)
+ if (Stem::head_count (stems[i]) || stems[i] == stem)
+ my_stems.push_back (stems[i]);
+
+ vsize idx = -1;
+
+ for (vsize i = 0; i < my_stems.size (); i++)
+ if (my_stems[i] == stem)
+ {
+ idx = i;
+ break;
+ }
+ Grob *left;
+ Grob *right;
+
+ if (idx == (vsize) - 1 || my_stems.size () == 1)
+ return scm_from_double (previous);
+ else if (idx == 0)
+ left = right = my_stems[1];
+ else if (idx == my_stems.size () - 1)
+ left = right = my_stems[idx - 1];
+ else
+ {
+ left = my_stems[idx - 1];
+ right = my_stems[idx + 1];
+ }
+
+ /* In stems with several heads, use the one closest to the beam. */
+ Direction beamdir = get_grob_direction (beam);
+ Real shift = min (max ( (Stem::head_positions (left)[beamdir]
+ + Stem::head_positions (right)[beamdir]) / 2.0,
+ rest_max_pos[DOWN]),
+ rest_max_pos[UP]
+ ) * ss / 2.0
+ - previous;
+
+ // So that ceil below kicks in for rests that would otherwise brush
+ // up against a beam quanted to a ledger line, add a bit of space
+ // between the beam and the rest.
+ shift += (0.01 * beamdir);
+
+ /* Always move by a whole number of staff spaces */
+ shift = ceil (fabs (shift / ss)) * ss * sign (shift);
+
+ return scm_from_double (previous + shift);
+}
+
bool
Beam::is_knee (Grob *me)
{
{
Direction dir = get_grob_direction (stems[i]);
if (d && d != dir)
- {
- knee = true;
- break;
- }
+ {
+ knee = true;
+ break;
+ }
d = dir;
}
SCM
Beam::calc_cross_staff (SCM smob)
{
- return scm_from_bool (is_cross_staff (unsmob_grob (smob)));
+ return scm_from_bool (is_cross_staff (Grob::unsmob (smob)));
}
int
for (vsize i = stems.size (); i--;)
{
/*
- Should we take invisible stems into account?
+ Should we take invisible stems into account?
*/
if (get_grob_direction (stems[i]) == d)
- bc = max (bc, (Stem::beam_multiplicity (stems[i]).length () + 1));
+ bc = max (bc, (Stem::beam_multiplicity (stems[i]).length () + 1));
}
return bc;
}
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"
+ "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"
"The following properties may be set in the @code{details}"
" list.\n"
"\n"
" calculating direction penalties.\n"
"@end table\n",
- /* properties */
- "annotation "
- "auto-knee-gap "
- "beamed-stem-shorten "
- "beaming "
- "beam-thickness "
- "break-overshoot "
- "clip-edges "
- "concaveness "
- "collision-interfaces "
- "collision-voice-only "
- "covered-grobs "
- "damping "
- "details "
- "direction "
- "gap "
- "gap-count "
- "grow-direction "
- "inspect-quants "
- "knee "
- "length-fraction "
- "least-squares-dy "
- "neutral-direction "
- "normal-stems "
- "positions "
- "quantized-positions "
- "shorten "
- "stems "
- );
+ /* properties */
+ "annotation "
+ "auto-knee-gap "
+ "beamed-stem-shorten "
+ "beaming "
+ "beam-segments "
+ "beam-thickness "
+ "break-overshoot "
+ "clip-edges "
+ "concaveness "
+ "collision-interfaces "
+ "collision-voice-only "
+ "covered-grobs "
+ "damping "
+ "details "
+ "direction "
+ "gap "
+ "gap-count "
+ "grow-direction "
+ "inspect-quants "
+ "knee "
+ "length-fraction "
+ "least-squares-dy "
+ "neutral-direction "
+ "normal-stems "
+ "positions "
+ "quantized-positions "
+ "shorten "
+ "skip-quanting "
+ "stems "
+ "X-positions "
+ );
projects / lilypond.git / blobdiff