/*
beam.cc -- implement Beam
-
+
source file of the GNU LilyPond music typesetter
-
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
-
*/
/*
-TODO:
-
-
- * Junk stem_info.
+ TODO:
- * Use Number_pair i.s.o Interval to represent (yl, yr).
-
- Determine auto knees based on positions if it's set by the user.
+ - the code is littered with * and / staff_space calls for
+ #'positions. Consider moving to real-world coordinates?
-Notes:
+ Problematic issue is user tweaks (user tweaks are in staff-coordinates.)
+ Notes:
- - Stems run to the Y-center of the beam.
-
- - beam_translation is the offset between Y centers of the beam.
+ - Stems run to the Y-center of the beam.
+ - beam_translation is the offset between Y centers of the beam.
*/
+#include "beam.hh"
-#include <math.h> // tanh.
-
-#include "molecule.hh"
+#include "beaming-pattern.hh"
#include "directional-element-interface.hh"
-#include "beaming.hh"
-#include "beam.hh"
-#include "misc.hh"
+#include "main.hh"
+#include "international.hh"
+#include "interval-set.hh"
+#include "item.hh"
#include "least-squares.hh"
-#include "stem.hh"
-#include "paper-def.hh"
#include "lookup.hh"
-#include "group-interface.hh"
-#include "staff-symbol-referencer.hh"
-#include "item.hh"
+#include "misc.hh"
+#include "output-def.hh"
+#include "pointer-group-interface.hh"
#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
#include "warn.hh"
+#if DEBUG_BEAM_SCORING
+#include "text-interface.hh" // debug output.
+#include "font-interface.hh" // debug output.
+#endif
-#define DEBUG_QUANTING 0
+#include <map>
-#if DEBUG_QUANTING
-#include "text-item.hh" // debug output.
-#include "font-interface.hh" // debug output.
-#endif
+Beam_stem_segment::Beam_stem_segment ()
+{
+ max_connect_ = 1000; // infinity
+ stem_ = 0;
+ width_ = 0.0;
+ stem_x_ = 0.0;
+ rank_ = 0;
+ stem_index_ = 0;
+ dir_ = CENTER;
+}
+Beam_segment::Beam_segment ()
+{
+ vertical_count_ = 0;
+}
void
Beam::add_stem (Grob *me, Grob *s)
{
- Pointer_group_interface::add_grob (me, ly_symbol2scm ("stems"), s);
-
- s->add_dependency (me);
-
- assert (!Stem::get_beam (s));
- s->set_grob_property ("beam", me->self_scm ());
+ if (Stem::get_beam (s))
+ {
+ programming_error ("Stem already has beam");
+ return ;
+ }
- add_bound_item (dynamic_cast<Spanner*> (me), dynamic_cast<Item*> (s));
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("stems"), s);
+ s->set_object ("beam", me->self_scm ());
+ add_bound_item (dynamic_cast<Spanner *> (me), dynamic_cast<Item *> (s));
}
+Real
+Beam::get_thickness (Grob *me)
+{
+ return robust_scm2double (me->get_property ("thickness"), 0)
+ * Staff_symbol_referencer::staff_space (me);
+}
-/*
- this returns the translation between 2 adjoining beams.
- */
+/* Return the translation between 2 adjoining beams. */
Real
Beam::get_beam_translation (Grob *me)
{
- SCM func = me->get_grob_property ("space-function");
- SCM s = gh_call2 (func, me->self_scm (), gh_int2scm (get_beam_count (me)));
- return gh_scm2double (s);
+ 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 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;
+
+ return fract * beam_translation;
}
-/*
- Maximum beam_count.
- */
+/* Maximum beam_count. */
int
-Beam::get_beam_count (Grob *me)
+Beam::get_beam_count (Grob *me)
{
int m = 0;
- for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+
+ extract_grob_set (me, "stems", stems);
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob *sc = unsmob_grob (ly_car (s));
-
- m = m >? (Stem::beam_multiplicity (sc).length () + 1);
+ Grob *stem = stems[i];
+ m = max (m, (Stem::beam_multiplicity (stem).length () + 1));
}
return m;
}
-MAKE_SCHEME_CALLBACK (Beam, space_function, 2);
-SCM
-Beam::space_function (SCM smob, SCM beam_count)
-{
- Grob *me = unsmob_grob (smob);
-
- Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real line = me->get_paper ()->get_var ("linethickness");
- Real thickness = gh_scm2double (me->get_grob_property ("thickness"))
- * staff_space;
-
- Real beam_translation = gh_scm2int (beam_count) < 4
- ? (2*staff_space + line - thickness) / 2.0
- : (3*staff_space + line - thickness) / 3.0;
-
- return gh_double2scm (beam_translation);
-}
-
-/* After pre-processing all directions should be set.
- Several post-processing routines (stem, slur, script) need stem/beam
- direction.
- Currenly, this means that beam has set all stem's directions.
- [Alternatively, stems could set its own directions, according to
- their beam, during 'final-pre-processing'.] */
-MAKE_SCHEME_CALLBACK (Beam, before_line_breaking, 1);
+MAKE_SCHEME_CALLBACK (Beam, calc_direction, 1);
SCM
-Beam::before_line_breaking (SCM smob)
+Beam::calc_direction (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
/* Beams with less than 2 two stems don't make much sense, but could happen
when you do
-
- [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. */
+
+ r8[ c8 r8]
+
+ */
+
+ Direction dir = CENTER;
int count = visible_stem_count (me);
if (count < 2)
{
- me->warning (_ ("beam has less than two visible stems"));
-
- SCM stems = me->get_grob_property ("stems");
- if (scm_ilength (stems) == 1)
+ extract_grob_set (me, "stems", stems);
+ if (stems.size () == 0)
{
- me->warning (_ ("Beam has less than two stems. Removing beam."));
-
- unsmob_grob (gh_car (stems))->remove_grob_property ("beam");
+ me->warning (_ ("removing beam with no stems"));
me->suicide ();
return SCM_UNSPECIFIED;
}
- else if (scm_ilength (stems) == 0)
+ else
{
- me->suicide ();
- return SCM_UNSPECIFIED;
+ Grob *stem = first_visible_stem (me);
+
+ /*
+ ugh: stems[0] case happens for chord tremolo.
+ */
+ dir = to_dir ((stem ? stem : stems[0])->get_property ("default-direction"));
}
}
+
if (count >= 1)
{
- Direction d = get_default_dir (me);
-
- consider_auto_knees (me, d);
- set_stem_directions (me, d);
-
- connect_beams (me);
-
- set_stem_shorten (me);
+ if (!dir)
+ dir = get_default_dir (me);
+
+ consider_auto_knees (me);
}
- return SCM_EOL;
+ if (dir)
+ {
+ set_stem_directions (me, dir);
+ }
+
+ 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
-
- x
- |
- |
- |===|
- |=
- |
- x
-
+/* 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
+ *
+ * x
+ * |
+ * |
+ * |===|
+ * |=
+ * |
+ * x
*/
int
position_with_maximal_common_beams (SCM left_beaming, SCM right_beaming,
Direction left_dir,
Direction right_dir)
{
- Slice lslice = int_list_to_slice (gh_cdr (left_beaming));
+ Slice lslice = int_list_to_slice (scm_cdr (left_beaming));
int best_count = 0;
int best_start = 0;
for (int i = lslice[-left_dir];
- (i - lslice[left_dir])* left_dir <= 0 ; i+= left_dir)
+ (i - lslice[left_dir]) * left_dir <= 0; i += left_dir)
{
- int count =0;
- for ( SCM s = gh_car (right_beaming); gh_pair_p (s); s = gh_cdr (s))
+ int count = 0;
+ for (SCM s = scm_car (right_beaming); scm_is_pair (s); s = scm_cdr (s))
{
- int k = - right_dir * gh_scm2int (gh_car (s)) + i;
- if (scm_memq (gh_int2scm (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_count = count;
best_start = i;
}
}
return best_start;
}
-void
-Beam::connect_beams (Grob *me)
+MAKE_SCHEME_CALLBACK(Beam, calc_beaming, 1)
+SCM
+Beam::calc_beaming (SCM smob)
{
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
+ Grob *me = unsmob_grob (smob);
+
+ extract_grob_set (me, "stems", stems);
Slice last_int;
- last_int.set_empty();
- SCM last_beaming = SCM_EOL;
+ last_int.set_empty ();
+
+ SCM last_beaming = scm_cons (SCM_EOL, scm_list_1 (scm_from_int (0)));
Direction last_dir = CENTER;
- for (int i = 0; i< stems.size(); i++)
+ for (vsize i = 0; i < stems.size (); i++)
{
Grob *this_stem = stems[i];
- SCM this_beaming = this_stem->get_grob_property ("beaming");
+ SCM this_beaming = this_stem->get_property ("beaming");
- Direction this_dir = Directional_element_interface::get(this_stem);
- if (i > 0)
+ 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, this_dir);
-
+ last_dir ? last_dir : this_dir,
+ this_dir);
+
Direction d = LEFT;
- Slice new_slice ;
+ Slice new_slice;
do
{
- if (d == RIGHT && i == stems.size()-1)
- continue;
-
- new_slice.set_empty();
+ new_slice.set_empty ();
SCM s = index_get_cell (this_beaming, d);
- for (; gh_pair_p (s); s = gh_cdr (s))
+ for (; scm_is_pair (s); s = scm_cdr (s))
{
- int new_beam_pos =
- start_point - this_dir * gh_scm2int (gh_car (s));
+ int new_beam_pos
+ = start_point - this_dir * scm_to_int (scm_car (s));
new_slice.add_point (new_beam_pos);
- gh_set_car_x (s, gh_int2scm (new_beam_pos));
+ scm_set_car_x (s, scm_from_int (new_beam_pos));
}
-
-
}
while (flip (&d) != LEFT);
- if (!new_slice.empty_b())
- last_int = new_slice;
+ if (!new_slice.is_empty ())
+ last_int = new_slice;
}
else
{
- gh_set_car_x ( this_beaming, SCM_EOL);
- SCM s = gh_cdr (this_beaming);
- for (; gh_pair_p (s); s = gh_cdr (s))
+ SCM s = scm_cdr (this_beaming);
+ for (; scm_is_pair (s); s = scm_cdr (s))
{
- int np = - this_dir * gh_scm2int (gh_car(s));
- gh_set_car_x (s, gh_int2scm (np));
+ 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 (i == stems.size () -1)
- {
- gh_set_cdr_x (this_beaming, SCM_EOL);
- }
-
- if (scm_ilength (gh_cdr (this_beaming)) > 0)
+
+ if (scm_ilength (scm_cdr (this_beaming)) > 0)
{
last_beaming = this_beaming;
last_dir = this_dir;
}
}
- }
-MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1);
-SCM
-Beam::brew_molecule (SCM grob)
-{
- Grob *me = unsmob_grob (grob);
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
- Grob* xcommon = common_refpoint_of_array (stems, me, X_AXIS);
+ return SCM_EOL;
+}
- Real x0, dx;
- if (visible_stem_count (me))
- {
- // ugh -> use commonx
- x0 = first_visible_stem (me)->relative_coordinate (xcommon, X_AXIS);
- dx = last_visible_stem (me)->relative_coordinate (xcommon, X_AXIS) - x0;
- }
- else
- {
- x0 = stems[0]->relative_coordinate (xcommon, X_AXIS);
- dx = stems.top ()->relative_coordinate (xcommon, X_AXIS) - x0;
- }
+bool
+operator <(Beam_stem_segment const &a,
+ Beam_stem_segment const &b)
+{
+ return a.rank_ < b.rank_;
+}
- SCM posns = me->get_grob_property ("positions");
- Interval pos;
- if (!ly_number_pair_p (posns))
- {
- programming_error ("No beam posns");
- pos = Interval (0,0);
- }
- else
- pos= ly_scm2interval (posns);
+typedef map<int, vector<Beam_stem_segment> > Position_stem_segments_map;
- Real dy = pos.delta ();
- Real dydx = dy && dx ? dy/dx : 0;
-
- Real thick = gh_scm2double (me->get_grob_property ("thickness"));
- Real bdy = get_beam_translation (me);
+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 ("quantized-positions");
- SCM last_beaming = SCM_EOL;;
- Real last_xposn = -1;
- Real last_width = -1 ;
+ Spanner *me = dynamic_cast<Spanner*> (me_grob);
+ extract_grob_set (me, "stems", stems);
+ Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
- SCM gap = me->get_grob_property ("gap");
- Molecule the_beam;
- Real lt = me->get_paper ()->get_var ("linethickness");
- for (int i = 0; i< stems.size(); i++)
- {
- Grob * st =stems[i];
-
- SCM this_beaming = st->get_grob_property ("beaming");
- Real xposn = st->relative_coordinate (xcommon, X_AXIS);
- Real stem_width = gh_scm2double (st->get_grob_property ("thickness")) *lt;
+ commonx = me->get_bound (LEFT)->common_refpoint (commonx, X_AXIS);
+ commonx = me->get_bound (RIGHT)->common_refpoint (commonx, X_AXIS);
- if (i > 0)
- {
- SCM left = gh_cdr (last_beaming);
- SCM right = gh_car (this_beaming);
+ *common = commonx;
+
+ int gap_count = robust_scm2int (me->get_property ("gap-count"), 0);
+ Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
- Array<int> fullbeams;
- Array<int> lfliebertjes;
- Array<int> rfliebertjes;
+ Position_stem_segments_map stem_segments;
+ Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
- for (SCM s = left;
- gh_pair_p (s); s =gh_cdr (s))
- {
- int b = gh_scm2int (gh_car (s));
- if (scm_memq (gh_car(s), right) != SCM_BOOL_F)
- {
- fullbeams.push (b);
- }
- else
- {
- lfliebertjes.push (b);
- }
- }
- for (SCM s = right;
- gh_pair_p (s); s =gh_cdr (s))
+ Slice ranks;
+
+ for (vsize i = 0; i < stems.size (); i++)
+ {
+ Grob *stem = stems[i];
+ 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
+ {
+ for (SCM s = index_get_cell (beaming, d);
+ scm_is_pair (s); s = scm_cdr (s))
{
- int b = gh_scm2int (gh_car (s));
- if (scm_memq (gh_car(s), left) == SCM_BOOL_F)
- {
- rfliebertjes.push (b);
- }
- }
+ if (!scm_is_integer (scm_car (s)))
+ continue;
-
- Real w = xposn - last_xposn;
- Real stem_offset = 0.0;
- Real width_corr = 0.0;
- if (i == 1)
- {
- stem_offset -= last_width/2;
- width_corr += last_width/2;
+ int beam_rank = scm_to_int (scm_car (s));
+ ranks.add_point (beam_rank);
}
- if (i == stems.size() -1)
- {
- width_corr += stem_width/2;
- }
-
- if (gh_number_p (gap))
+ for (SCM s = index_get_cell (beaming, d);
+ scm_is_pair (s); s = scm_cdr (s))
{
- Real g = gh_scm2double (gap);
- stem_offset += g;
- width_corr -= 2*g;
- }
+ if (!scm_is_integer (scm_car (s)))
+ continue;
- Molecule whole = Lookup::beam (dydx, w + width_corr, thick);
- for (int j = fullbeams.size(); j--;)
- {
- Molecule b (whole);
- b.translate_axis (last_xposn - x0 + stem_offset, X_AXIS);
- b.translate_axis (dydx * (last_xposn - x0) + bdy * fullbeams[j], Y_AXIS);
- the_beam.add_molecule (b);
+ 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);
+ }
- if (lfliebertjes.size() || rfliebertjes.size())
- {
+ Drul_array<Real> break_overshoot
+ = robust_scm2drul (me->get_property ("break-overshoot"),
+ Drul_array<Real> (-0.5, 0.0));
- Real nw_f;
- if (!Stem::first_head (st))
- nw_f = 0;
- else
- {
- int t = Stem::duration_log (st);
+ vector<Beam_segment> segments;
+ for (Position_stem_segments_map::const_iterator i (stem_segments.begin ());
+ i != stem_segments.end (); i++)
+ {
+ vector<Beam_stem_segment> segs = (*i).second;
+ vector_sort (segs, less<Beam_stem_segment> ());
- SCM proc = me->get_grob_property ("flag-width-function");
- SCM result = gh_call1 (proc, gh_int2scm (t));
- nw_f = gh_scm2double (result);
- }
-
- /* Half beam should be one note-width,
- but let's make sure two half-beams never touch */
+ Beam_segment current;
+
+ int vertical_count = (*i).first;
+ for (vsize j = 0; j < segs.size (); j++)
+ {
+ /*
+ event_dir == LEFT: left edge of a beamsegment.
+ */
+ 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
+ || (abs (vertical_count) >= segs[j].max_connect_
+ || abs (vertical_count) >= segs[j + event_dir].max_connect_);
- Real w = xposn - last_xposn;
- w = w/2 <? nw_f;
+ if (!event)
+ continue;
- Molecule half = Lookup::beam (dydx, w, thick);
- for (int j = lfliebertjes.size(); j--;)
+ 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 ())
+ {
+ current.horizontal_[event_dir]
+ = (me->get_bound (event_dir)->extent (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);
+
+ current.horizontal_[event_dir] += event_dir * notehead_width;
+ }
+ }
+ else
{
- Molecule b (half);
- b.translate_axis (last_xposn - x0, X_AXIS);
- b.translate_axis (dydx * (last_xposn-x0) + bdy * lfliebertjes[j], Y_AXIS);
- the_beam.add_molecule (b);
+ current.horizontal_[event_dir] += event_dir * segs[j].width_/2;
+ if (segs[j].gapped_)
+ current.horizontal_[event_dir] -= event_dir * gap_length;
}
- for (int j = rfliebertjes.size(); j--;)
+
+ if (event_dir == RIGHT)
{
- Molecule b (half);
- b.translate_axis (xposn - x0 - w , X_AXIS);
- b.translate_axis (dydx * (xposn-x0 -w) + bdy * rfliebertjes[j], Y_AXIS);
- the_beam.add_molecule (b);
+ segments.push_back (current);
+ current = Beam_segment();
}
}
- }
+ while (flip (&event_dir) != LEFT);
+ }
+
+ }
+
+ return segments;
+}
+
+MAKE_SCHEME_CALLBACK(Beam, print, 1);
+SCM
+Beam::print (SCM grob)
+{
+ Spanner *me = unsmob_spanner (grob);
+ Grob *commonx = 0;
+ vector<Beam_segment> segments = get_beam_segments (me, &commonx);
+
+ Interval span;
+ if (visible_stem_count (me))
+ {
+ span[LEFT] = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
+ span[RIGHT] = last_visible_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);
+ }
- last_xposn = xposn;
- last_width = stem_width;
- last_beaming = this_beaming;
+ Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
+
+ SCM posns = me->get_property ("quantized-positions");
+ Interval pos;
+ if (!is_number_pair (posns))
+ {
+ programming_error ("no beam positions?");
+ pos = Interval (0, 0);
}
+ else
+ pos = ly_scm2realdrul (posns);
- the_beam.translate_axis (x0 - me->relative_coordinate (xcommon, X_AXIS), X_AXIS);
- the_beam.translate_axis (pos[LEFT], Y_AXIS);
+ scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
-#if (DEBUG_QUANTING)
+ Real dy = pos[RIGHT] - pos[LEFT];
+ 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 ++)
{
+ 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 (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))
+ {
+ 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.
*/
- String str;
- if (1)
- {
- str += to_string (gh_scm2int (me->get_grob_property ("best-idx")));
- str += ":";
- }
- str += to_string (gh_scm2double (me->get_grob_property ("quant-score")),
- "%.2f");
+ string str;
+ SCM properties = Font_interface::text_font_alist_chain (me);
- SCM properties = Font_interface::font_alist_chain (me);
+ Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP;
-
- Molecule tm = Text_item::text2molecule (me, scm_makfrom0str (str.to_str0 ()), properties);
- the_beam.add_at_edge (Y_AXIS, UP, tm, 5.0);
+ Stencil score = *unsmob_stencil (Text_interface::interpret_markup
+ (me->layout ()->self_scm (), properties, quant_score));
+
+ if (!score.is_empty ())
+ the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0, 0);
}
#endif
-
-
-
- return the_beam.smobbed_copy();
-}
-
-
-
+ the_beam.translate_axis (-me->relative_coordinate (commonx, X_AXIS), X_AXIS);
+ return the_beam.smobbed_copy ();
+}
+
Direction
-Beam::get_default_dir (Grob *me)
+Beam::get_default_dir (Grob *me)
{
- Drul_array<int> total;
- total[UP] = total[DOWN] = 0;
- Drul_array<int> count;
- count[UP] = count[DOWN] = 0;
- Direction d = DOWN;
+ extract_grob_set (me, "stems", stems);
- Link_array<Item> stems=
- Pointer_group_interface__extract_grobs (me, (Item*)0, "stems");
+ Drul_array<Real> extremes (0.0, 0.0);
+ 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);
+ }
+
+ Drul_array<int> total (0, 0);
+ Drul_array<int> count (0, 0);
- for (int i=0; i <stems.size (); i++)
- do {
+ bool force_dir = false;
+ for (vsize i = 0; i < stems.size (); i++)
+ {
Grob *s = stems[i];
- Direction sd = Directional_element_interface::get (s);
+ 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;
+ }
+ else
+ stem_dir = to_dir (s->get_property ("default-direction"));
- int center_distance = int(- d * Stem::head_positions (s) [-d]) >? 0;
- int current = sd ? (1 + d * sd)/2 : center_distance;
+ if (!stem_dir)
+ stem_dir = to_dir (s->get_property ("neutral-direction"));
- if (current)
+ if (stem_dir)
{
- total[d] += current;
- count[d] ++;
+ count[stem_dir] ++;
+ total[stem_dir] += max (int (- stem_dir * Stem::head_positions (s) [-stem_dir]), 0);
}
- } while (flip (&d) != DOWN);
+ }
+
+
+ if (!force_dir)
+ {
+ if (abs (extremes[UP]) > -extremes[DOWN])
+ return DOWN;
+ else if (extremes[UP] < -extremes[DOWN])
+ return UP;
+ }
- SCM func = me->get_grob_property ("dir-function");
- SCM s = gh_call2 (func,
- gh_cons (gh_int2scm (count[UP]),
- gh_int2scm (count[DOWN])),
- gh_cons (gh_int2scm (total[UP]),
- gh_int2scm (total[DOWN])));
-
- if (gh_number_p (s) && gh_scm2int (s))
- return to_dir (s);
+ Direction dir = CENTER;
+ Direction d = 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])))
+ dir = d;
+ else if ((d = (Direction) sign (total[UP] - total[DOWN])))
+ dir = d;
+ else
+ dir = to_dir (me->get_property ("neutral-direction"));
- /* If dir is not determined: get default */
- return to_dir (me->get_grob_property ("neutral-direction"));
+ return dir;
}
-
/* Set all stems with non-forced direction to beam direction.
Urg: non-forced should become `without/with unforced' direction,
once stem gets cleaned-up. */
void
Beam::set_stem_directions (Grob *me, Direction d)
{
- Link_array<Item> stems
- =Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems");
-
- for (int i=0; i <stems.size (); i++)
+ extract_grob_set (me, "stems", stems);
+
+ for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
- /* For knees, non-forced stems should probably have their
- natural direction. In any case, when knee, beam direction is
- foe.
-
- TODO: for x staff knees, set direction pointing to 'the
- other' staff, rather than natural.
- */
- if (knee_b(me))
- {
- Stem::get_direction (s); // this actually sets it, if necessary
- }
- else
- {
- SCM force = s->remove_grob_property ("dir-forced");
- if (!gh_boolean_p (force) || !gh_scm2bool (force))
- Directional_element_interface::set (s, d);
- }
- }
-}
-
-/*
- A union of intervals in the real line.
-
- Abysmal performance (quadratic) for large N, hopefully we don't have
- that large N. In any case, this should probably be rewritten to use
- a balanced tree.
- */
-struct Int_set
-{
- Array<Interval> allowed_regions_;
-
- Int_set()
- {
- set_full();
- }
-
- void set_full()
- {
- allowed_regions_.clear();
- Interval s;
- s.set_full ();
- allowed_regions_.push (s);
- }
-
- void remove_interval (Interval rm)
- {
- for (int i = 0; i < allowed_regions_.size(); )
- {
- Interval s = rm;
-
- s.intersect (allowed_regions_[i]);
-
- if (!s.empty_b ())
- {
- Interval before = allowed_regions_[i];
- Interval after = allowed_regions_[i];
-
- before[RIGHT] = s[LEFT];
- after[LEFT] = s[RIGHT];
-
- if (!before.empty_b())
- {
- allowed_regions_.insert (before, i);
- i++;
- }
- allowed_regions_.del (i);
- if (!after.empty_b ())
- {
- allowed_regions_.insert (after, i);
- i++;
- }
- }
- else
- i++;
- }
- }
-};
+ SCM forcedir = s->get_property_data ("direction");
+ if (!to_dir (forcedir))
+ set_grob_direction (s, d);
+ }
+}
/*
Only try horizontal beams for knees. No reliable detection of
anything else is possible here, since we don't know funky-beaming
settings, or X-distances (slopes!) People that want sloped
knee-beams, should set the directions manually.
- */
+
+
+ TODO:
+
+ this routine should take into account the stemlength scoring
+ of a possible knee/nonknee beam.
+*/
void
-Beam::consider_auto_knees (Grob* me, Direction d)
+Beam::consider_auto_knees (Grob *me)
{
- SCM scm = me->get_grob_property ("auto-knee-gap");
- if (!gh_number_p (scm))
- return ;
+ SCM scm = me->get_property ("auto-knee-gap");
+ if (!scm_is_number (scm))
+ return;
- Real threshold = gh_scm2double (scm);
-
- Int_set gaps;
+ Interval_set gaps;
gaps.set_full ();
-
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
-
- Grob *common = common_refpoint_of_array (stems, me, Y_AXIS);
+ extract_grob_set (me, "stems", stems);
+
+ Grob *common = common_refpoint_of_array (stems, me, Y_AXIS);
Real staff_space = Staff_symbol_referencer::staff_space (me);
-
- Array<Interval> hps_array;
- for (int i=0; i < stems.size (); i++)
+
+ vector<Interval> head_extents_array;
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob* stem = stems[i];
- if (Stem::invisible_b (stem))
+ Grob *stem = stems[i];
+ if (Stem::is_invisible (stem))
continue;
-
- Interval hps = Stem::head_positions (stem);
-
- if(!hps.empty_b())
+ Interval head_extents = Stem::head_positions (stem);
+ if (!head_extents.is_empty ())
{
- hps[LEFT] += -1;
- hps[RIGHT] += 1;
- hps *= staff_space * 0.5 ;
- hps += stem->relative_coordinate (common, Y_AXIS);
-
- if (to_boolean (stem->get_grob_property ("dir-forced")))
+ 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->relative_coordinate (common, Y_AXIS);
+
+ if (to_dir (stem->get_property_data ("direction")))
{
- Direction stemdir =Directional_element_interface::get (stem);
- hps[-stemdir] = - stemdir * infinity_f;
+ Direction stemdir = to_dir (stem->get_property ("direction"));
+ head_extents[-stemdir] = -stemdir * infinity_f;
}
}
- hps_array.push (hps);
+ head_extents_array.push_back (head_extents);
- gaps.remove_interval (hps);
+ gaps.remove_interval (head_extents);
}
Interval max_gap;
- Real max_gap_len =0.0;
+ Real max_gap_len = 0.0;
- for (int i = gaps.allowed_regions_.size() -1; i >= 0 ; i--)
+ for (vsize i = gaps.allowed_regions_.size () -1; i != VPOS ;i--)
{
Interval gap = gaps.allowed_regions_[i];
/*
the outer gaps are not knees.
- */
- if (isinf (gap[LEFT]) || isinf(gap[RIGHT]))
+ */
+ if (isinf (gap[LEFT]) || isinf (gap[RIGHT]))
continue;
-
+
if (gap.length () >= max_gap_len)
{
- max_gap_len = gap.length();
+ max_gap_len = gap.length ();
max_gap = gap;
}
}
+ Real beam_translation = get_beam_translation (me);
+ Real beam_thickness = Beam::get_thickness (me);
+ int beam_count = Beam::get_beam_count (me);
+ Real height_of_beams = beam_thickness / 2
+ + (beam_count - 1) * beam_translation;
+ Real threshold = scm_to_double (scm) + height_of_beams;
+
if (max_gap_len > threshold)
{
int j = 0;
- for (int i = 0; i < stems.size(); i++)
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob* stem = stems[i];
- if (Stem::invisible_b (stem))
+ Grob *stem = stems[i];
+ if (Stem::is_invisible (stem))
continue;
- Interval hps = hps_array[j++];
+ Interval head_extents = head_extents_array[j++];
+ Direction d = (head_extents.center () < max_gap.center ())
+ ? UP : DOWN;
- Direction d = (hps.center () < max_gap.center()) ?
- UP : DOWN ;
-
- stem->set_grob_property ("direction", gh_int2scm (d));
+ stem->set_property ("direction", scm_from_int (d));
- /*
- UGH. Check why we still need dir-forced; I think we can
- junk it.
- */
- stem->set_grob_property ("dir-forced", SCM_BOOL_T);
-
- hps.intersect (max_gap);
- assert (hps.empty_b () || hps.length () < 1e-6 );
+ 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.
+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.
*/
-void
-Beam::set_stem_shorten (Grob *me)
-{
- /*
- shortening looks silly for x staff beams
- */
- if (knee_b(me))
- return ;
-
- Real forced_fraction = forced_stem_count (me) / visible_stem_count (me);
- int beam_count = get_beam_count (me);
- SCM shorten = me->get_grob_property ("beamed-stem-shorten");
- if (shorten == SCM_EOL)
- return;
- int sz = scm_ilength (shorten);
-
- Real staff_space = Staff_symbol_referencer::staff_space (me);
- SCM shorten_elt = scm_list_ref (shorten,
- gh_int2scm (beam_count <? (sz - 1)));
- Real shorten_f = gh_scm2double (shorten_elt) * staff_space;
+void
+set_minimum_dy (Grob *me, Real *dy)
+{
+ if (*dy)
+ {
+ /*
+ If dy is smaller than the smallest quant, we
+ get absurd direction-sign penalties.
+ */
- /* your similar cute comment here */
- shorten_f *= forced_fraction;
+ Real ss = Staff_symbol_referencer::staff_space (me);
+ Real thickness = Beam::get_thickness (me) / ss;
+ Real slt = Staff_symbol_referencer::line_thickness (me) / ss;
+ Real sit = (thickness - slt) / 2;
+ Real inter = 0.5;
+ Real hang = 1.0 - (thickness - slt) / 2;
- if (shorten_f)
- me->set_grob_property ("shorten", gh_double2scm (shorten_f));
+ *dy = sign (*dy) * max (fabs (*dy),
+ min (min (sit, inter), hang));
+ }
}
-/* Call list of y-dy-callbacks, that handle setting of
- grob-properties
+
-*/
-MAKE_SCHEME_CALLBACK (Beam, after_line_breaking, 1);
+MAKE_SCHEME_CALLBACK(Beam, calc_stem_shorten, 1)
SCM
-Beam::after_line_breaking (SCM smob)
+Beam::calc_stem_shorten (SCM smob)
{
Grob *me = unsmob_grob (smob);
- /* Copy to mutable list. */
- SCM s = ly_deep_copy (me->get_grob_property ("positions"));
- me->set_grob_property ("positions", s);
+ /*
+ shortening looks silly for x staff beams
+ */
+ if (is_knee (me))
+ return scm_from_int (0);
- if (ly_car (s) == SCM_BOOL_F)
- {
+ Real forced_fraction = 1.0 * forced_stem_count (me)
+ / visible_stem_count (me);
- // one wonders if such genericity is necessary --hwn.
- SCM callbacks = me->get_grob_property ("position-callbacks");
- for (SCM i = callbacks; gh_pair_p (i); i = ly_cdr (i))
- gh_call1 (ly_car (i), smob);
- }
+ int beam_count = get_beam_count (me);
+
+ SCM shorten_list = me->get_property ("beamed-stem-shorten");
+ if (shorten_list == SCM_EOL)
+ return scm_from_int (0);
+
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+
+ SCM shorten_elt
+ = robust_list_ref (beam_count -1, shorten_list);
+ Real shorten = scm_to_double (shorten_elt) * staff_space;
+
+ shorten *= forced_fraction;
- set_stem_lengths (me);
- return SCM_UNSPECIFIED;
+
+ if (shorten)
+ return scm_from_double (shorten);
+
+ return scm_from_double (0.0);
}
-MAKE_SCHEME_CALLBACK (Beam, least_squares, 1);
+
+
+/*
+ Compute a first approximation to the beam slope.
+*/
+MAKE_SCHEME_CALLBACK (Beam, calc_least_squares_positions, 2);
SCM
-Beam::least_squares (SCM smob)
+Beam::calc_least_squares_positions (SCM smob, SCM posns)
{
+ (void) posns;
+
Grob *me = unsmob_grob (smob);
int count = visible_stem_count (me);
- Interval pos (0, 0);
-
- if (count <= 1)
- {
- me->set_grob_property ("positions", ly_interval2scm (pos));
- return SCM_UNSPECIFIED;
- }
+ Interval pos (0,0);
+ if (count < 1)
+ return ly_interval2scm (pos);
-
- Array<Real> x_posns ;
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
+ vector<Real> x_posns;
+ extract_grob_set (me, "stems", stems);
Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
- Grob *commony = common_refpoint_of_array (stems, me, Y_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);
-
- Interval ideal (Stem::calc_stem_info (fvs).ideal_y_
- + fvs->relative_coordinate (commony, Y_AXIS) -my_y,
- Stem::calc_stem_info (lvs).ideal_y_
+
+ Grob *fvs = first_visible_stem (me);
+ Grob *lvs = last_visible_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_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
- for (int i=0; i < stems.size (); i++)
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob* s = stems[i];
+ Grob *s = stems[i];
Real x = s->relative_coordinate (commonx, X_AXIS) - x0;
- x_posns.push (x);
+ x_posns.push_back (x);
}
Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0;
- Real y =0;
- Real dydx = 0;
+ Real y = 0;
+ Real slope = 0;
Real dy = 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)));
+ /* Simple beams (2 stems) on middle line should be allowed to be
+ slightly sloped.
- /*
- TODO -- use scoring for this.
+ However, if both stems reach middle line,
+ ideal[LEFT] == ideal[RIGHT] and ideal.delta () == 0.
- complicated, because we take stem-info.ideal for determining
- beam slopes.
- */
- /* Make simple beam on middle line have small tilt */
+ For that case, we apply artificial slope */
if (!ideal[LEFT] && chord.delta () && count == 2)
{
-
- /*
- FIXME. -> UP
- */
+ /* FIXME. -> UP */
Direction d = (Direction) (sign (chord.delta ()) * UP);
- pos[d] = gh_scm2double (me->get_grob_property ("thickness")) / 2;
- // * dir;
- pos[-d] = - pos[d];
+ pos[d] = get_thickness (me) / 2;
+ pos[-d] = -pos[d];
}
else
- {
- pos = ideal;
- }
+ pos = ideal;
- y = pos[LEFT];
- dy = pos[RIGHT]- y;
- dydx = dy/dx;
+ /*
+ 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
{
- Array<Offset> ideals;
- for (int i=0; i < stems.size (); i++)
+ vector<Offset> ideals;
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob* s = stems[i];
- if (Stem::invisible_b (s))
+ Grob *s = stems[i];
+ if (Stem::is_invisible (s))
continue;
- ideals.push (Offset (x_posns[i],
- Stem::calc_stem_info (s).ideal_y_
+ 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 (&dydx, &y, ideals);
- dy = dydx * dx;
- me->set_grob_property ("least-squares-dy", gh_double2scm (dy));
- pos = Interval (y, (y+dy));
+ minimise_least_squares (&slope, &y, ideals);
+
+ dy = slope * dx;
+
+ set_minimum_dy (me, &dy);
+
+ ldy = dy;
+ pos = Interval (y, (y + dy));
}
- me->set_grob_property ("positions", ly_interval2scm (pos));
-
- return SCM_UNSPECIFIED;
-}
+ /*
+ "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);
+}
/*
We can't combine with previous function, since check concave and
slope damping comes first.
- */
-MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 1);
+
+ TODO: we should use the concaveness to control the amount of damping
+ applied.
+*/
+MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 2);
SCM
-Beam::shift_region_to_valid (SCM grob)
+Beam::shift_region_to_valid (SCM grob, SCM posns)
{
Grob *me = unsmob_grob (grob);
/*
Code dup.
- */
- Array<Real> x_posns ;
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
+ */
+ vector<Real> x_posns;
+ extract_grob_set (me, "stems", stems);
Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
- Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS);
+ Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS);
Grob *fvs = first_visible_stem (me);
if (!fvs)
- return SCM_UNSPECIFIED;
-
- Real x0 =fvs->relative_coordinate (commonx, X_AXIS);
- for (int i=0; i < stems.size (); i++)
+ return posns;
+
+ Real x0 = fvs->relative_coordinate (commonx, X_AXIS);
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob* s = stems[i];
+ Grob *s = stems[i];
Real x = s->relative_coordinate (commonx, X_AXIS) - x0;
- x_posns.push (x);
+ x_posns.push_back (x);
}
Grob *lvs = last_visible_stem (me);
if (!lvs)
- return SCM_UNSPECIFIED;
-
+ return posns;
+
Real dx = lvs->relative_coordinate (commonx, X_AXIS) - x0;
- Interval pos = ly_scm2interval ( me->get_grob_property ("positions"));
- Real dy = pos.delta();
+ Drul_array<Real> pos = ly_scm2interval (posns);
+
+
+ scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
+
+ Real dy = pos[RIGHT] - pos[LEFT];
Real y = pos[LEFT];
- Real dydx =dy/dx;
+ Real slope = dx ? (dy / dx) : 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 (int i=0; i < stems.size (); i++)
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob* s = stems[i];
- if (Stem::invisible_b (s))
+ Grob *s = stems[i];
+ if (Stem::is_invisible (s))
continue;
- Direction d = Stem::get_direction (s);
+ Direction d = get_grob_direction (s);
- Real left_y =
- Stem::calc_stem_info (s).shortest_y_
- - dydx * x_posns [i];
+ 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 (commony, Y_AXIS)
+ */
+ left_y
+ += + s->relative_coordinate (commony, Y_AXIS)
- me->relative_coordinate (commony, Y_AXIS);
- Interval flp ;
+ Interval flp;
flp.set_full ();
flp[-d] = left_y;
feasible_left_point.intersect (flp);
}
-
- if (feasible_left_point.empty_b())
- {
- warning (_("Not sure that we can find a nice beam slope (no viable initial configuration found)."));
- }
- else if (!feasible_left_point.elem_b(y))
+
+ if (feasible_left_point.is_empty ())
+ warning (_ ("no viable initial configuration found: may not find good beam slope"));
+ else if (!feasible_left_point.contains (y))
{
+ const int REGION_SIZE = 2; // UGH UGH
if (isinf (feasible_left_point[DOWN]))
y = feasible_left_point[UP] - REGION_SIZE;
else if (isinf (feasible_left_point[UP]))
else
y = feasible_left_point.center ();
}
- pos = Interval (y, (y+dy));
- me->set_grob_property ("positions", ly_interval2scm (pos));
- return SCM_UNSPECIFIED;
-}
-
-
-MAKE_SCHEME_CALLBACK (Beam, check_concave, 1);
-SCM
-Beam::check_concave (SCM smob)
-{
- Grob *me = unsmob_grob (smob);
-
- Link_array<Grob> stems =
- Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
-
- for (int i = 0; i < stems.size ();)
- {
- if (Stem::invisible_b (stems[i]))
- stems.del (i);
- else
- i++;
- }
-
- if (stems.size () < 3)
- return SCM_UNSPECIFIED;
-
-
- /* Concaveness #1: If distance of an inner notehead to line between
- two outer noteheads is bigger than CONCAVENESS-GAP (2.0ss),
- beam is concave (Heinz Stolba).
-
- In the case of knees, the line connecting outer heads is often
- not related to the beam slope (it may even go in the other
- direction). Skip the check when the outer stems point in
- different directions. --hwn
-
- */
- bool concaveness1 = false;
- SCM gap = me->get_grob_property ("concaveness-gap");
- if (gh_number_p (gap)
- && Stem::get_direction(stems.top ())
- == Stem::get_direction(stems[0]))
- {
- Real r1 = gh_scm2double (gap);
- Real dy = Stem::chord_start_y (stems.top ())
- - Stem::chord_start_y (stems[0]);
-
-
- Real slope = dy / (stems.size () - 1);
-
- Real y0 = Stem::chord_start_y (stems[0]);
- for (int i = 1; i < stems.size () - 1; i++)
- {
- Real c = (Stem::chord_start_y (stems[i]) - y0) - i * slope;
- if (c > r1)
- {
- concaveness1 = true;
- break;
- }
- }
- }
-
-
- /* Concaveness #2: Sum distances of inner noteheads that fall
- outside the interval of the two outer noteheads.
-
- We only do this for beams where first and last stem have the same
- direction. --hwn.
-
-
- Note that "convex" stems compensate for "concave" stems.
- (is that intentional?) --hwn.
- */
-
- Real concaveness2 = 0;
- SCM thresh = me->get_grob_property ("concaveness-threshold");
- Real r2 = infinity_f;
- if (!concaveness1 && gh_number_p (thresh)
- && Stem::get_direction(stems.top ())
- == Stem::get_direction(stems[0]))
- {
- r2 = gh_scm2double (thresh);
-
- Direction dir = Stem::get_direction(stems.top ());
- Real concave = 0;
- Interval iv (Stem::chord_start_y (stems[0]),
- Stem::chord_start_y (stems.top ()));
-
- if (iv[MAX] < iv[MIN])
- iv.swap ();
-
- for (int i = 1; i < stems.size () - 1; i++)
- {
- Real f = Stem::chord_start_y (stems[i]);
- concave += ((f - iv[MAX] ) >? 0) +
- ((f - iv[MIN] ) <? 0);
- }
- concave *= dir;
- concaveness2 = concave / (stems.size () - 2);
-
- /* ugh: this is the a kludge to get
- input/regression/beam-concave.ly to behave as
- baerenreiter. */
-
- /*
- huh? we're dividing twice (which is not scalable) meaning that
- the longer the beam, the more unlikely it will be
- concave. Maybe you would even expect the other way around??
- --hwn.
-
- */
- concaveness2 /= (stems.size () - 2);
- }
-
- /* TODO: some sort of damping iso -> plain horizontal */
- if (concaveness1 || concaveness2 > r2)
- {
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
- Real r = pos.linear_combination (0);
- me->set_grob_property ("positions", ly_interval2scm (Interval (r, r)));
- me->set_grob_property ("least-squares-dy", gh_double2scm (0));
- }
+ pos = Drul_array<Real> (y, (y + dy));
+ scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me));
- return SCM_UNSPECIFIED;
+ 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, 1);
+MAKE_SCHEME_CALLBACK (Beam, slope_damping, 2);
SCM
-Beam::slope_damping (SCM smob)
+Beam::slope_damping (SCM smob, SCM posns)
{
Grob *me = unsmob_grob (smob);
+ Drul_array<Real> pos = ly_scm2interval (posns);
if (visible_stem_count (me) <= 1)
- return SCM_UNSPECIFIED;
-
- SCM s = me->get_grob_property ("damping");
- int damping = gh_scm2int (s);
+ 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)
{
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
- Real dy = pos.delta ();
+ scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
- Grob *fvs = first_visible_stem (me);
- Grob *lvs = last_visible_stem (me);
+ Real dy = pos[RIGHT] - pos[LEFT];
- Grob *commonx = fvs->common_refpoint (lvs, X_AXIS);
+ Grob *fvs = first_visible_stem (me);
+ Grob *lvs = last_visible_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 dydx = dy && dx ? dy/dx : 0;
- dydx = 0.6 * tanh (dydx) / damping;
- Real damped_dy = dydx * dx;
+ 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;
-
- me->set_grob_property ("positions", ly_interval2scm (pos));
+
+ scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me));
}
- return SCM_UNSPECIFIED;
+
+ return ly_interval2scm (pos);
}
/*
Report slice containing the numbers that are both in (car BEAMING)
and (cdr BEAMING)
- */
+*/
Slice
-where_are_the_whole_beams(SCM beaming)
+where_are_the_whole_beams (SCM beaming)
{
- Slice l;
-
- for( SCM s = gh_car (beaming); gh_pair_p (s) ; s = gh_cdr (s))
+ Slice l;
+
+ for (SCM s = scm_car (beaming); scm_is_pair (s); s = scm_cdr (s))
{
- if (scm_memq (gh_car (s), gh_cdr (beaming)) != SCM_BOOL_F)
-
- l.add_point (gh_scm2int (gh_car (s)));
+ if (scm_c_memq (scm_car (s), scm_cdr (beaming)) != SCM_BOOL_F)
+
+ l.add_point (scm_to_int (scm_car (s)));
}
return l;
}
-/*
- Calculate 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.
- */
+/* 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,
+Beam::calc_stem_y (Grob *me, Grob *stem, Grob **common,
Real xl, Real xr,
- Interval pos, bool french)
+ Drul_array<Real> pos, bool french)
{
Real beam_translation = get_beam_translation (me);
-
- Real r = s->relative_coordinate (common[X_AXIS], X_AXIS) - xl;
- Real dy = pos.delta ();
+ 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];
-
- Direction my_dir = Directional_element_interface::get (s);
- SCM beaming = s->get_grob_property ("beaming");
-
+
+ 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.empty_b())
+ if (!bm.is_empty ())
stem_y += beam_translation * bm[-my_dir];
}
else
{
- Slice bm = Stem::beam_multiplicity(s);
- if (!bm.empty_b())
- stem_y +=bm[my_dir] * beam_translation;
+ Slice bm = Stem::beam_multiplicity (stem);
+ if (!bm.is_empty ())
+ stem_y += bm[my_dir] * beam_translation;
}
-
+
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. */
-void
-Beam::set_stem_lengths (Grob *me)
+MAKE_SCHEME_CALLBACK(Beam, set_stem_lengths, 1);
+SCM
+Beam::set_stem_lengths (SCM smob)
{
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
+ Grob *me = unsmob_grob (smob);
- if (stems.size () <= 1)
- return;
+ /* trigger callbacks. */
+ (void) me->get_property ("direction");
+ (void) me->get_property ("beaming");
+
+ SCM posns = me->get_property ("positions");
+ extract_grob_set (me, "stems", stems);
+ if (!stems.size ())
+ return posns;
+
Grob *common[2];
for (int a = 2; a--;)
- common[a] = common_refpoint_of_array (stems, me, Axis(a));
-
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
- Real staff_space = Staff_symbol_referencer::staff_space (me);
+ common[a] = common_refpoint_of_array (stems, me, Axis (a));
- bool french = to_boolean (me->get_grob_property ("french-beaming"));
+ Drul_array<Real> pos = ly_scm2realdrul (posns);
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+ scale_drul (&pos, staff_space);
-
bool gap = false;
- Real thick =0.0;
- if (gh_number_p (me->get_grob_property ("gap"))
- &&gh_scm2double (me->get_grob_property ("gap")))
- {
- gap = true;
- thick = gh_scm2double (me->get_grob_property ("thickness"))
- * Staff_symbol_referencer::staff_space(me);
- }
-
- // ugh -> use commonx
- Grob * fvs = first_visible_stem (me);
+ Real thick = 0.0;
+ 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);
-
+
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;
-
- for (int i=0; i < stems.size (); i++)
+
+ for (vsize i = 0; i < stems.size (); i++)
{
- Grob* s = stems[i];
- if (Stem::invisible_b (s))
- continue;
+ Grob *s = stems[i];
+ bool french = to_boolean (s->get_property ("french-beaming"));
Real stem_y = calc_stem_y (me, s, common,
xl, xr,
- pos, french && i > 0&& (i < stems.size () -1));
+ 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
+ && !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
*/
- if (gap)
- stem_y += thick * 0.5 * Directional_element_interface::get(s);
-
- Stem::set_stemend (s, 2* stem_y / staff_space);
+ Stem::set_stemend (s, 2 * stem_y / staff_space);
}
+
+ return posns;
}
void
-Beam::set_beaming (Grob *me, Beaming_info_list *beaming)
+Beam::set_beaming (Grob *me, Beaming_pattern const *beaming)
{
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob *)0, "stems");
-
+ extract_grob_set (me, "stems", stems);
+
Direction d = LEFT;
- for (int i=0; i < stems.size (); i++)
+ for (vsize i = 0; i < stems.size (); i++)
{
/*
Don't overwrite user settings.
- */
-
+ */
do
{
- /* Don't set beaming for outside of outer stems */
- if ((d == LEFT && i == 0)
- ||(d == RIGHT && i == stems.size () -1))
- continue;
-
-
- SCM beaming_prop = stems[i]->get_grob_property ("beaming");
- if (beaming_prop == SCM_EOL ||
- index_get_cell (beaming_prop, d) == SCM_EOL)
+ 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 b = beaming->infos_.elem (i).beams_i_drul_[d];
- Stem::set_beaming (stems[i], b, d);
+ int count = beaming->beamlet_count (i, d);
+ if (i > 0
+ && i < stems.size () -1
+ && 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);
}
int
-Beam::forced_stem_count (Grob *me)
+Beam::forced_stem_count (Grob *me)
{
- Link_array<Grob>stems =
- Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
+ extract_grob_set (me, "stems", stems);
+
int f = 0;
- for (int i=0; i < stems.size (); i++)
+ for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
- if (Stem::invisible_b (s))
+ if (Stem::is_invisible (s))
continue;
- if (((int)Stem::chord_start_y (s))
- && (Stem::get_direction (s) != Stem::get_default_dir (s)))
- f++;
+ /* 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)
+ f++;
}
return f;
}
-
-
-
int
-Beam::visible_stem_count (Grob *me)
+Beam::visible_stem_count (Grob *me)
{
- Link_array<Grob>stems =
- Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
+ extract_grob_set (me, "stems", stems);
int c = 0;
- for (int i = stems.size (); i--;)
+ for (vsize i = stems.size (); i--;)
{
- if (!Stem::invisible_b (stems[i]))
- c++;
+ if (!Stem::is_invisible (stems[i]))
+ c++;
}
return c;
}
-Grob*
-Beam::first_visible_stem (Grob *me)
+Grob *
+Beam::first_visible_stem (Grob *me)
{
- Link_array<Grob>stems =
- Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
-
- for (int i = 0; i < stems.size (); i++)
+ extract_grob_set (me, "stems", stems);
+
+ for (vsize i = 0; i < stems.size (); i++)
{
- if (!Stem::invisible_b (stems[i]))
- return stems[i];
+ if (!Stem::is_invisible (stems[i]))
+ return stems[i];
}
return 0;
}
-Grob*
-Beam::last_visible_stem (Grob *me)
+Grob *
+Beam::last_visible_stem (Grob *me)
{
- Link_array<Grob>stems =
- Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
- for (int i = stems.size (); i--;)
+ extract_grob_set (me, "stems", stems);
+
+ for (vsize i = stems.size (); i--;)
{
- if (!Stem::invisible_b (stems[i]))
- return stems[i];
+ if (!Stem::is_invisible (stems[i]))
+ return stems[i];
}
return 0;
}
-
/*
[TODO]
-
+
handle rest under beam (do_post: beams are calculated now)
what about combination of collisions and rest under beam.
Should lookup
-
- rest -> stem -> beam -> interpolate_y_position ()
+
+ 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 element_smob, SCM axis)
+Beam::rest_collision_callback (SCM smob, SCM prev_offset)
{
- Grob *rest = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
-
- assert (a == Y_AXIS);
+ Grob *rest = unsmob_grob (smob);
+ if (scm_is_number (rest->get_property ("staff-position")))
+ return scm_from_int (0);
- Grob *st = unsmob_grob (rest->get_grob_property ("stem"));
+ Real offset = robust_scm2double (prev_offset, 0.0);
+
+ Grob *st = unsmob_grob (rest->get_object ("stem"));
Grob *stem = st;
if (!stem)
- return gh_double2scm (0.0);
- Grob *beam = unsmob_grob (stem->get_grob_property ("beam"));
+ return scm_from_double (0.0);
+ Grob *beam = unsmob_grob (stem->get_object ("beam"));
if (!beam
|| !Beam::has_interface (beam)
|| !Beam::visible_stem_count (beam))
- return gh_double2scm (0.0);
+ return scm_from_double (0.0);
- // make callback for rest from this.
- // todo: make sure this calced already.
-
- // Interval pos = ly_scm2interval (beam->get_grob_property ("positions"));
- Interval pos (0, 0);
- SCM s = beam->get_grob_property ("positions");
- if (gh_pair_p (s) && gh_number_p (ly_car (s)))
+ 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.");
+
+ Real staff_space = Staff_symbol_referencer::staff_space (rest);
- Real dy = pos.delta ();
- // ugh -> use commonx
- Real x0 = first_visible_stem (beam)->relative_coordinate (0, X_AXIS);
- Real dx = last_visible_stem (beam)->relative_coordinate (0, X_AXIS) - x0;
- Real dydx = dy && dx ? dy/dx : 0;
+ scale_drul (&pos, staff_space);
+
+ Real dy = pos[RIGHT] - pos[LEFT];
+
+ Drul_array<Grob*> visible_stems (first_visible_stem (beam),
+ last_visible_stem (beam));
+ extract_grob_set (beam, "stems", stems);
- Direction d = Stem::get_direction (stem);
- Real beamy = (stem->relative_coordinate (0, X_AXIS) - x0) * dydx + pos[LEFT];
+ 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;
- Real staff_space = Staff_symbol_referencer::staff_space (rest);
+ Direction d = get_grob_direction (stem);
+ Real stem_y = pos[LEFT]
+ + (stem->relative_coordinate (common, X_AXIS) - x0) * slope;
+
+ Real beam_translation = get_beam_translation (beam);
+ Real beam_thickness = Beam::get_thickness (beam);
+
+ /*
+ TODO: this is not strictly correct for 16th knee beams.
+ */
+ int beam_count
+ = Stem::beam_multiplicity (stem).length () + 1;
+ Real height_of_my_beams = beam_thickness / 2
+ + (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 (common_y, Y_AXIS);
+ rest_extent.translate (offset);
- Real rest_dim = rest->extent (rest, Y_AXIS)[d]*2.0 / staff_space; // refp??
+ 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));
- Real minimum_dist
- = gh_scm2double (rest->get_grob_property ("minimum-beam-collision-distance"));
- Real dist =
- minimum_dist + -d * (beamy - rest_dim) >? 0;
+ Real shift = d * min (((beam_y - d * minimum_distance) - rest_dim) * d, 0.0);
- int stafflines = Staff_symbol_referencer::line_count (rest);
+ shift /= staff_space;
+ Real rad = Staff_symbol_referencer::line_count (rest) * staff_space / 2;
- // move discretely by half spaces.
- int discrete_dist = int (ceil (dist));
+ /* Always move discretely by half spaces */
+ shift = ceil (fabs (shift * 2.0)) / 2.0 * sign (shift);
- // move by whole spaces inside the staff.
- if (discrete_dist < stafflines+1)
- discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0);
+ /* Inside staff, move by whole spaces*/
+ if ((rest_extent[d] + staff_space * shift) * d
+ < rad
+ || (rest_extent[-d] + staff_space * shift) * -d
+ < rad)
+ shift = ceil (fabs (shift)) * sign (shift);
- return gh_double2scm (-d * discrete_dist);
+ return scm_from_double (staff_space * shift);
}
bool
-Beam::knee_b (Grob*me)
+Beam::is_knee (Grob *me)
{
- SCM k = me->get_grob_property ("knee");
- if (gh_boolean_p (k))
- return gh_scm2bool (k);
+ SCM k = me->get_property ("knee");
+ if (scm_is_bool (k))
+ return ly_scm2bool (k);
bool knee = false;
int d = 0;
- for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+ extract_grob_set (me, "stems", stems);
+ for (vsize i = stems.size (); i--;)
{
- Direction dir = Directional_element_interface::get
- (unsmob_grob (ly_car (s)));
+ Direction dir = get_grob_direction (stems[i]);
if (d && d != dir)
{
knee = true;
}
d = dir;
}
-
- me->set_grob_property ("knee", gh_bool2scm (knee));
+
+ me->set_property ("knee", ly_bool2scm (knee));
return knee;
}
-ADD_INTERFACE (Beam, "beam-interface",
- "A beam.
-
-#'thickness= weight of beams, in staffspace
-
-
-We take the least squares line through the ideal-length stems, and
-then damp that using
-
- damped = tanh (slope)
-
-this gives an unquantized left and right position for the beam end.
-Then we take all combinations of quantings near these left and right
-positions, and give them a score (according to how close they are to
-the ideal slope, how close the result is to the ideal stems, etc.). We
-take the best scoring combination.
+int
+Beam::get_direction_beam_count (Grob *me, Direction d)
+{
+ extract_grob_set (me, "stems", stems);
+ int bc = 0;
-",
- "french-beaming position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness");
+ for (vsize i = stems.size (); i--;)
+ {
+ /*
+ Should we take invisible stems into account?
+ */
+ if (get_grob_direction (stems[i]) == d)
+ bc = max (bc, (Stem::beam_multiplicity (stems[i]).length () + 1));
+ }
+ return bc;
+}
+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. "
+
+ ,
+
+ /* properties */
+ "auto-knee-gap "
+ "beamed-stem-shorten "
+ "beaming "
+ "break-overshoot "
+ "clip-edges "
+ "concaveness "
+ "damping "
+ "details "
+ "direction "
+ "gap "
+ "gap-count "
+ "grow-direction "
+ "inspect-quants "
+ "knee "
+ "length-fraction "
+ "least-squares-dy "
+ "neutral-direction "
+ "positions "
+ "quant-score "
+ "quantized-positions "
+ "shorten "
+ "stems "
+ "thickness "
+ );
projects / lilypond.git / blobdiff