source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
*/
#include "beam.hh"
-#include "interval-set.hh"
+
+#include "beaming-pattern.hh"
#include "directional-element-interface.hh"
-#include "beaming.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 "output-def.hh"
#include "lookup.hh"
+#include "misc.hh"
+#include "output-def.hh"
#include "pointer-group-interface.hh"
-#include "staff-symbol-referencer.hh"
-#include "item.hh"
#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
#include "warn.hh"
-#if DEBUG_QUANTING
+#if DEBUG_BEAM_SCORING
#include "text-interface.hh" // debug output.
#include "font-interface.hh" // debug output.
#endif
+#include <map>
+
+
+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)
{
Real
Beam::get_beam_translation (Grob *me)
{
- SCM func = me->get_property ("space-function");
+ 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;
- if (ly_is_procedure (func))
- {
- SCM s = scm_call_2 (func, me->self_scm (), scm_from_int (get_beam_count (me)));
- return scm_to_double (s);
- }
- else
- return 0.81;
+ return fract * beam_translation;
}
/* Maximum beam_count. */
int m = 0;
extract_grob_set (me, "stems", stems);
- for (int i = 0; i < stems.size (); i++)
+ for (vsize i = 0; i < stems.size (); i++)
{
Grob *stem = stems[i];
m = max (m, (Stem::beam_multiplicity (stem).length () + 1));
return m;
}
-/*
- Space return space between beams.
-*/
-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 = Staff_symbol_referencer::line_thickness (me);
- Real thickness = get_thickness (me);
-
- Real beam_translation = scm_to_int (beam_count) < 4
- ? (2 * staff_space + line - thickness) / 2.0
- : (3 * staff_space + line - thickness) / 3.0;
-
- return scm_from_double (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, calc_direction, 1);
SCM
Beam::calc_direction (SCM smob)
/* Beams with less than 2 two stems don't make much sense, but could happen
when you do
- [r8 c8 r8].
+ r8[ c8 r8]
- For a beam that only has one stem, we try to do some disappearance magic:
- we revert the flag, and move on to The Eternal Engraving Fields. */
+ */
+
+ Direction dir = CENTER;
int count = visible_stem_count (me);
if (count < 2)
{
extract_grob_set (me, "stems", stems);
- if (stems.size () == 1)
+ if (stems.size () == 0)
{
- me->warning (_ ("removing beam with less than two stems"));
-
- stems[0]->set_object ("beam", SCM_EOL);
+ me->warning (_ ("removing beam with no stems"));
me->suicide ();
return SCM_UNSPECIFIED;
}
- else if (stems.size () == 0)
+ 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"));
}
}
- Direction d = CENTER;
-
if (count >= 1)
{
- d = get_default_dir (me);
+ if (!dir)
+ dir = get_default_dir (me);
+
consider_auto_knees (me);
- set_stem_directions (me, d);
-
- connect_beams (me);
-
- set_stem_shorten (me);
}
- return scm_from_int (d);
+ 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
return best_start;
}
-void
-Beam::connect_beams (Grob *me)
+MAKE_SCHEME_CALLBACK(Beam, calc_beaming, 1)
+SCM
+Beam::calc_beaming (SCM smob)
{
+ Grob *me = unsmob_grob (smob);
+
extract_grob_set (me, "stems", stems);
Slice last_int;
last_int.set_empty ();
- // SCM last_beaming = SCM_EOL;
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_property ("beaming");
last_dir = this_dir;
}
}
+
+ return SCM_EOL;
}
-/*
- I really enjoy spaghetti, but spaghetti should be kept on a plate
- with a little garlic and olive oil. This is too much.
+bool
+operator <(Beam_stem_segment const &a,
+ Beam_stem_segment const &b)
+{
+ return a.rank_ < b.rank_;
+}
- rewrite-me
-*/
-MAKE_SCHEME_CALLBACK (Beam, print, 1);
-SCM
-Beam::print (SCM grob)
+typedef map<int, vector<Beam_stem_segment> > Position_stem_segments_map;
+
+vector<Beam_segment>
+Beam::get_beam_segments (Grob *me_grob, Grob **common)
{
- Spanner *me = unsmob_spanner (grob);
+ Spanner *me = dynamic_cast<Spanner*> (me_grob);
extract_grob_set (me, "stems", stems);
- Grob *xcommon = common_refpoint_of_array (stems, me, X_AXIS);
+ 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;
+
+ int gap_count = robust_scm2int (me->get_property ("gap-count"), 0);
+ Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
+
+ Position_stem_segments_map stem_segments;
+ Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
+
+ Slice ranks;
+
+ for (vsize i = 0; i < stems.size (); i++)
+ {
+ Grob *stem = stems[i];
+ 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))
+ {
+ 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);
+ }
+
+ Drul_array<Real> break_overshoot
+ = robust_scm2drul (me->get_property ("break-overshoot"),
+ Drul_array<Real> (-0.5, 0.0));
- xcommon = me->get_bound (LEFT)->common_refpoint (xcommon, X_AXIS);
- xcommon = me->get_bound (RIGHT)->common_refpoint (xcommon, X_AXIS);
+ 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, default_compare);
+
+ Beam_segment current;
- Real x0, dx;
+ 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_);
+
+ if (!event)
+ continue;
+
+ 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
+ {
+ current.horizontal_[event_dir] += event_dir * segs[j].width_/2;
+ if (segs[j].gapped_)
+ current.horizontal_[event_dir] -= event_dir * gap_length;
+ }
+
+ if (event_dir == RIGHT)
+ {
+ 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))
{
- // ugh -> use commonx
- x0 = first_visible_stem (me)->relative_coordinate (xcommon, X_AXIS);
- dx = last_visible_stem (me)->relative_coordinate (xcommon, X_AXIS) - x0;
+ span[LEFT] = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
+ span[RIGHT] = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
}
else
{
- x0 = stems[0]->relative_coordinate (xcommon, X_AXIS);
- dx = stems.top ()->relative_coordinate (xcommon, X_AXIS) - x0;
+ extract_grob_set (me, "stems", stems);
+ span[LEFT] = stems[0]->relative_coordinate (commonx, X_AXIS);
+ span[RIGHT] = stems.back ()->relative_coordinate (commonx, X_AXIS);
}
- SCM posns = me->get_property ("positions");
- Drul_array<Real> pos;
+ 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?");
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
Real dy = pos[RIGHT] - pos[LEFT];
- Real slope = (dy && dx) ? dy / dx : 0;
+ Real slope = (dy && span.length ()) ? dy / span.length () : 0;
Real thick = get_thickness (me);
- Real bdy = get_beam_translation (me);
-
- SCM last_beaming = SCM_EOL;
- Real last_xposn = -1;
- Real last_stem_width = -1;
-
- Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
+ Real beam_dy = get_beam_translation (me);
+ Direction feather_dir = to_dir (me->get_property ("grow-direction"));
+
Stencil the_beam;
- Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
-
- for (int i = 0; i <= stems.size (); i++)
+ for (vsize i = 0; i < segments.size (); i ++)
{
- Grob *stem = (i < stems.size ()) ? stems[i] : 0;
-
- SCM this_beaming = stem ? stem->get_property ("beaming") : SCM_EOL;
- Real xposn = stem ? stem->relative_coordinate (xcommon, X_AXIS) : 0.0;
- Real stem_width = stem ? robust_scm2double (stem->get_property ("thickness"), 1.0) * lt : 0;
- Direction stem_dir = stem ? to_dir (stem->get_property ("direction")) : CENTER;
- /*
- We do the space left of ST, with lfliebertjes pointing to the
- right from the left stem, and rfliebertjes pointing left from
- right stem.
- */
- SCM left = (i > 0) ? scm_cdr (last_beaming) : SCM_EOL;
- SCM right = stem ? scm_car (this_beaming) : SCM_EOL;
-
- Array<int> full_beams;
- Array<int> lfliebertjes;
- Array<int> rfliebertjes;
-
- for (SCM s = left;
- scm_is_pair (s); s = scm_cdr (s))
- {
- int b = scm_to_int (scm_car (s));
- if (scm_c_memq (scm_car (s), right) != SCM_BOOL_F)
- full_beams.push (b);
- else
- lfliebertjes.push (b);
- }
- for (SCM s = right;
- scm_is_pair (s); s = scm_cdr (s))
- {
- int b = scm_to_int (scm_car (s));
- if (scm_c_memq (scm_car (s), left) == SCM_BOOL_F)
- rfliebertjes.push (b);
- }
-
- Drul_array<Real> break_overshoot
- = robust_scm2drul (me->get_property ("break-overshoot"),
- Drul_array<Real> (-0.5, 0.0));
-
- Real w = (i > 0 && stem)
- ? (xposn - last_xposn)
- : break_overshoot[ (i == 0) ? LEFT : RIGHT];
-
- Real stem_offset = 0.0;
- if (i > 0)
+ Real local_slope = slope;
+ if (feather_dir)
{
- w += last_stem_width / 2;
- stem_offset = -last_stem_width / 2;
- }
-
- if (stem)
- w += stem_width / 2;
-
- Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
- Stencil whole = Lookup::beam (slope, w, thick, blot);
- Stencil gapped;
-
- int gap_count = 0;
- if (scm_is_number (me->get_property ("gap-count")))
- {
- gap_count = scm_to_int (me->get_property ("gap-count"));
- gapped = Lookup::beam (slope, w - 2 * gap_length, thick, blot);
-
- full_beams.sort (default_compare);
- if (stem_dir == UP)
- full_beams.reverse ();
- }
-
- int k = 0;
- for (int j = full_beams.size (); j--;)
- {
- Stencil b (whole);
-
- if (k++ < gap_count)
- {
- b = gapped;
- b.translate_axis (gap_length, X_AXIS);
- }
- b.translate_axis (last_xposn - x0 + stem_offset, X_AXIS);
- b.translate_axis (slope * (last_xposn - x0) + bdy * full_beams[j], Y_AXIS);
-
- the_beam.add_stencil (b);
- }
-
- if (lfliebertjes.size () || rfliebertjes.size ())
- {
- Real nw_f;
-
- if (stem)
- {
- int t = Stem::duration_log (stem);
-
- SCM proc = me->get_property ("flag-width-function");
- SCM result = scm_call_1 (proc, scm_from_int (t));
- nw_f = scm_to_double (result);
- }
- else
- nw_f = break_overshoot[RIGHT] / 2;
-
- /* Half beam should be one note-width,
- but let's make sure two half-beams never touch */
- Real lw = nw_f;
- Real rw = nw_f;
- if (i > 0)
- rw = min (nw_f, ((xposn - last_xposn) / 2));
- else
- {
- if (me->get_bound (LEFT)->break_status_dir ())
- rw = xposn - me->get_bound (LEFT)->extent (xcommon, X_AXIS)[RIGHT]
- + break_overshoot[LEFT];
- else
- rw = 1.0; // ugh.
- }
-
- if (stem)
- lw = min (nw_f, ((xposn - last_xposn) / 2));
- else
- {
- lw = me->get_bound (RIGHT)->relative_coordinate (xcommon, X_AXIS)
- - last_xposn
- + break_overshoot[RIGHT];
- }
- rw += stem_width / 2;
- lw += last_stem_width / 2;
-
- Stencil rhalf = Lookup::beam (slope, rw, thick, blot);
- Stencil lhalf = Lookup::beam (slope, lw, thick, blot);
- for (int j = lfliebertjes.size (); j--;)
- {
- Stencil b (lhalf);
- b.translate_axis (last_xposn - x0 - last_stem_width /2,
- X_AXIS);
- b.translate_axis (slope * (last_xposn - x0)
- + bdy * lfliebertjes[j],
- Y_AXIS);
- the_beam.add_stencil (b);
- }
- for (int j = rfliebertjes.size (); j--;)
- {
- Stencil b (rhalf);
- b.translate_axis (xposn - x0 - rw + stem_width / 2, X_AXIS);
- b.translate_axis (slope * (xposn - x0 - rw)
- + bdy * rfliebertjes[j], Y_AXIS);
- the_beam.add_stencil (b);
- }
+ local_slope += feather_dir * segments[i].vertical_count_ * beam_dy / span.length ();
}
+
+ Stencil b = Lookup::beam (local_slope, segments[i].horizontal_.length (), thick, blot);
- last_xposn = xposn;
- last_stem_width = stem_width;
- last_beaming = this_beaming;
+ b.translate_axis (segments[i].horizontal_[LEFT], X_AXIS);
+
+ b.translate_axis (local_slope
+ * (segments[i].horizontal_[LEFT] - span.linear_combination (feather_dir))
+ + pos.linear_combination (feather_dir)
+ + beam_dy * segments[i].vertical_count_, Y_AXIS);
+ the_beam.add_stencil (b);
}
-
- the_beam.translate_axis (x0 - me->relative_coordinate (xcommon, X_AXIS),
- X_AXIS);
- the_beam.translate_axis (pos[LEFT], Y_AXIS);
-
-#if (DEBUG_QUANTING)
+
+#if (DEBUG_BEAM_SCORING)
SCM quant_score = me->get_property ("quant-score");
- SCM debug = me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"));
+ 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;
+ string str;
SCM properties = Font_interface::text_font_alist_chain (me);
Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP;
- Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
- (me->get_layout ()->self_scm (), properties, quant_score));
- the_beam.add_at_edge (Y_AXIS, stem_dir, tm, 1.0, 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
+ the_beam.translate_axis (-me->relative_coordinate (commonx, X_AXIS), X_AXIS);
return the_beam.smobbed_copy ();
}
-
+
Direction
Beam::get_default_dir (Grob *me)
{
- Drul_array<int> total;
- total[UP] = total[DOWN] = 0;
- Drul_array<int> count;
- count[UP] = count[DOWN] = 0;
-
extract_grob_set (me, "stems", stems);
- for (int i = 0; i < stems.size (); i++)
+ 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);
+
+ bool force_dir = false;
+ for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
Direction stem_dir = CENTER;
SCM stem_dir_scm = s->get_property_data (ly_symbol2scm ("direction"));
if (is_direction (stem_dir_scm))
- stem_dir = to_dir (stem_dir_scm);
+ {
+ stem_dir = to_dir (stem_dir_scm);
+ force_dir = true;
+ }
else
- stem_dir = Stem::get_default_dir (s);
+ stem_dir = to_dir (s->get_property ("default-direction"));
+
+ if (!stem_dir)
+ stem_dir = to_dir (s->get_property ("neutral-direction"));
if (stem_dir)
{
}
}
- SCM func = me->get_property ("dir-function");
- SCM s = scm_call_2 (func,
- scm_cons (scm_from_int (count[UP]),
- scm_from_int (count[DOWN])),
- scm_cons (scm_from_int (total[UP]),
- scm_from_int (total[DOWN])));
-
- if (scm_is_number (s) && scm_to_int (s))
- return to_dir (s);
- /* If dir is not determined: get default */
- return to_dir (me->get_property ("neutral-direction"));
+ if (!force_dir)
+ {
+ if (abs (extremes[UP]) > -extremes[DOWN])
+ return DOWN;
+ else if (extremes[UP] < -extremes[DOWN])
+ return UP;
+ }
+
+ Direction dir = CENTER;
+ Direction d = CENTER;
+ if ((d = (Direction) sign (count[UP] - count[DOWN])))
+ dir = d;
+ else 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"));
+
+ return dir;
}
/* Set all stems with non-forced direction to beam direction.
{
extract_grob_set (me, "stems", stems);
- for (int i = 0; i < stems.size (); i++)
+ for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
Grob *common = common_refpoint_of_array (stems, me, Y_AXIS);
Real staff_space = Staff_symbol_referencer::staff_space (me);
- Array<Interval> head_extents_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::is_invisible (stem))
head_extents[-stemdir] = -stemdir * infinity_f;
}
}
- head_extents_array.push (head_extents);
+ head_extents_array.push_back (head_extents);
gaps.remove_interval (head_extents);
}
Interval max_gap;
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];
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::is_invisible (stem))
This is done in beam because the shorten has to be uniform over the
entire beam.
*/
+
+
+
void
-Beam::set_stem_shorten (Grob *me)
+set_minimum_dy (Grob *me, Real *dy)
+{
+ if (*dy)
+ {
+ /*
+ If dy is smaller than the smallest quant, we
+ get absurd direction-sign penalties.
+ */
+
+ 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;
+
+ *dy = sign (*dy) * max (fabs (*dy),
+ min (min (sit, inter), hang));
+ }
+}
+
+
+
+MAKE_SCHEME_CALLBACK(Beam, calc_stem_shorten, 1)
+SCM
+Beam::calc_stem_shorten (SCM smob)
{
+ Grob *me = unsmob_grob (smob);
+
/*
shortening looks silly for x staff beams
*/
if (is_knee (me))
- return;
+ return scm_from_int (0);
Real forced_fraction = 1.0 * forced_stem_count (me)
/ visible_stem_count (me);
SCM shorten_list = me->get_property ("beamed-stem-shorten");
if (shorten_list == SCM_EOL)
- return;
+ return scm_from_int (0);
Real staff_space = Staff_symbol_referencer::staff_space (me);
shorten *= forced_fraction;
- if (shorten)
- me->set_property ("shorten", scm_from_double (shorten));
-}
-
-MAKE_SCHEME_CALLBACK (Beam, calc_positions, 1);
-SCM
-Beam::calc_positions (SCM smob)
-{
- Grob *me = unsmob_grob (smob);
- if (!me->is_live ())
- return SCM_EOL;
-
- (void) me->get_property ("direction");
- SCM posns = scm_cons (SCM_BOOL_F, SCM_BOOL_F);
- me->set_property ("positions", posns);
-
- SCM callbacks = me->get_property ("position-callbacks");
- for (SCM i = callbacks; scm_is_pair (i); i = scm_cdr (i))
- scm_call_1 (scm_car (i), me->self_scm ());
+ if (shorten)
+ return scm_from_double (shorten);
- /*
- TODO: move this in separate calc function.
- */
- set_stem_lengths (me);
- return SCM_UNSPECIFIED;
+ return scm_from_double (0.0);
}
-void
-set_minimum_dy (Grob *me, Real *dy)
-{
- if (*dy)
- {
- /*
- If dy is smaller than the smallest quant, we
- get absurd direction-sign penalties.
- */
-
- 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;
-
- *dy = sign (*dy) * max (fabs (*dy),
- min (min (sit, inter), hang));
- }
-}
/*
- Compute a first approximation to the beam slope.
+ Compute a first approximation to the beam slope.
*/
-MAKE_SCHEME_CALLBACK (Beam, least_squares, 1);
+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);
-
+ Interval pos (0,0);
if (count < 1)
- {
- me->set_property ("positions", ly_interval2scm (pos));
- return SCM_UNSPECIFIED;
- }
+ return ly_interval2scm (pos);
- Array<Real> x_posns;
+ 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 *lvs = last_visible_stem (me);
Interval ideal (Stem::get_stem_info (fvs).ideal_y_
- + fvs->relative_coordinate (commony, Y_AXIS) -my_y,
+ + fvs->relative_coordinate (commony, Y_AXIS) - my_y,
Stem::get_stem_info (lvs).ideal_y_
+ lvs->relative_coordinate (commony, Y_AXIS) - my_y);
Real x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
- for (int i = 0; i < stems.size (); i++)
+ for (vsize i = 0; i < stems.size (); 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 slope = 0;
Real dy = 0;
-
+ Real ldy = 0.0;
if (!ideal.delta ())
{
Interval chord (Stem::chord_start_y (first_visible_stem (me)),
slope esp. of the first part of a broken beam should predict
where the second part goes.
*/
- me->set_property ("least-squares-dy",
- scm_from_double (pos[RIGHT] - pos[LEFT]));
+ 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::is_invisible (s))
continue;
- ideals.push (Offset (x_posns[i],
+ ideals.push_back (Offset (x_posns[i],
Stem::get_stem_info (s).ideal_y_
+ s->relative_coordinate (commony, Y_AXIS)
- my_y));
dy = slope * dx;
set_minimum_dy (me, &dy);
- me->set_property ("least-squares-dy", scm_from_double (dy));
+
+ ldy = dy;
pos = Interval (y, (y + dy));
}
*/
scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me));
- me->set_property ("positions", ly_interval2scm (pos));
-
- return SCM_UNSPECIFIED;
+ me->set_property ("least-squares-dy", scm_from_double (ldy));
+ return ly_interval2scm (pos);
}
/*
TODO: we should use the concaveness to control the amount of damping
applied.
*/
-MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 1);
+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;
+ 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 *fvs = first_visible_stem (me);
if (!fvs)
- return SCM_UNSPECIFIED;
+ return posns;
Real x0 = fvs->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];
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;
- Drul_array<Real> pos = ly_scm2interval (me->get_property ("positions"));
+ Drul_array<Real> pos = ly_scm2interval (posns);
+
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
*/
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::is_invisible (s))
pos = Drul_array<Real> (y, (y + dy));
scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me));
- me->set_property ("positions", ly_interval2scm (pos));
- 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;
+ 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)
{
- Drul_array<Real> pos = ly_scm2interval (me->get_property ("positions"));
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
Real dy = pos[RIGHT] - pos[LEFT];
Real slope = dy && dx ? dy / dx : 0;
- Real concaveness = robust_scm2double (me->get_property ("concaveness"), 0.0);
-
slope = 0.6 * tanh (slope) / (damping + concaveness);
Real damped_dy = slope * dx;
pos[RIGHT] -= (dy - damped_dy) / 2;
scale_drul (&pos, 1 / Staff_symbol_referencer::staff_space (me));
-
- me->set_property ("positions", ly_interval2scm (pos));
}
- return SCM_UNSPECIFIED;
+
+ return ly_interval2scm (pos);
}
/*
/* 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,
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 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
* dy
: 0) + pos[LEFT];
- Direction my_dir = get_grob_direction (s);
- SCM beaming = s->get_property ("beaming");
+ Direction my_dir = get_grob_direction (stem);
+ SCM beaming = stem->get_property ("beaming");
Real stem_y = stem_y_beam0;
if (french)
}
else
{
- Slice bm = Stem::beam_multiplicity (s);
+ 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)
{
+ Grob *me = unsmob_grob (smob);
+
+ /* 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;
+ return posns;
Grob *common[2];
for (int a = 2; a--;)
common[a] = common_refpoint_of_array (stems, me, Axis (a));
- Drul_array<Real> pos = ly_scm2realdrul (me->get_property ("positions"));
+ 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 (scm_is_number (me->get_property ("gap-count"))
- &&scm_to_int (me->get_property ("gap-count")))
+ if (robust_scm2int (me->get_property ("gap-count"), 0))
{
gap = true;
thick = get_thickness (me);
}
- // ugh -> use commonx
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::is_invisible (s))
Stem::set_stemend (s, 2 * stem_y / staff_space);
}
+
+ return posns;
}
void
-Beam::set_beaming (Grob *me, Beaming_info_list const *beaming)
+Beam::set_beaming (Grob *me, Beaming_pattern const *beaming)
{
extract_grob_set (me, "stems", stems);
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
{
Grob *stem = stems[i];
if (beaming_prop == SCM_EOL
|| index_get_cell (beaming_prop, d) == SCM_EOL)
{
- int b = beaming->infos_.elem (i).beams_i_drul_[d];
+ int count = beaming->beamlet_count (i, d);
if (i > 0
&& i < stems.size () -1
&& Stem::is_invisible (stem))
- b = min (b, beaming->infos_.elem (i).beams_i_drul_[-d]);
+ count = min (count, beaming->beamlet_count (i,-d));
- Stem::set_beaming (stem, b, d);
+ if ( ((i == 0 && d == LEFT)
+ || (i == stems.size ()-1 && d == RIGHT))
+ && stems.size () > 1
+ && to_boolean (me->get_property ("clip-edges")))
+ count = 0;
+
+ Stem::set_beaming (stem, count, d);
}
}
while (flip (&d) != LEFT);
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];
/* 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
- && (get_grob_direction (s) != Stem::get_default_dir (s)))
+ && defdir
+ && get_grob_direction (s) != defdir)
f++;
}
return f;
{
extract_grob_set (me, "stems", stems);
int c = 0;
- for (int i = stems.size (); i--;)
+ for (vsize i = stems.size (); i--;)
{
if (!Stem::is_invisible (stems[i]))
c++;
{
extract_grob_set (me, "stems", stems);
- for (int i = 0; i < stems.size (); i++)
+ for (vsize i = 0; i < stems.size (); i++)
{
if (!Stem::is_invisible (stems[i]))
return stems[i];
{
extract_grob_set (me, "stems", stems);
- for (int i = stems.size (); i--;)
+ for (vsize i = stems.size (); i--;)
{
if (!Stem::is_invisible (stems[i]))
return stems[i];
*/
MAKE_SCHEME_CALLBACK (Beam, rest_collision_callback, 2);
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);
- (void) axis;
-
+ Grob *rest = unsmob_grob (smob);
if (scm_is_number (rest->get_property ("staff-position")))
return scm_from_int (0);
- assert (scm_to_int (axis) == Y_AXIS);
-
+ Real offset = robust_scm2double (prev_offset, 0.0);
+
Grob *st = unsmob_grob (rest->get_object ("stem"));
Grob *stem = st;
if (!stem)
Real dy = pos[RIGHT] - pos[LEFT];
- // 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;
+ Drul_array<Grob*> visible_stems (first_visible_stem (beam),
+ last_visible_stem (beam));
+ extract_grob_set (beam, "stems", stems);
+
+ Grob *common = common_refpoint_of_array (stems, beam, X_AXIS);
+
+ Real x0 = visible_stems[LEFT]->relative_coordinate (common, X_AXIS);
+ Real dx = visible_stems[RIGHT]->relative_coordinate (common, X_AXIS) - x0;
Real slope = dy && dx ? dy / dx : 0;
Direction d = get_grob_direction (stem);
- Real stem_y = pos[LEFT] + (stem->relative_coordinate (0, X_AXIS) - x0) * slope;
+ 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);
Real beam_y = stem_y - d * height_of_my_beams;
Grob *common_y = rest->common_refpoint (beam, Y_AXIS);
-
- Real rest_dim = rest->extent (common_y, Y_AXIS)[d];
+ Interval rest_extent = rest->extent (common_y, Y_AXIS);
+ rest_extent.translate (offset);
+
+ 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));
+ = staff_space * (robust_scm2double (stem->get_property ("stemlet-length"), 0.0)
+ + robust_scm2double (rest->get_property ("minimum-distance"), 0.0));
Real shift = d * min (((beam_y - d * minimum_distance) - rest_dim) * d, 0.0);
shift = ceil (fabs (shift * 2.0)) / 2.0 * sign (shift);
/* Inside staff, move by whole spaces*/
- if ((rest->extent (common_y, Y_AXIS)[d] + staff_space * shift) * d
+ if ((rest_extent[d] + staff_space * shift) * d
< rad
- || (rest->extent (common_y, Y_AXIS)[-d] + staff_space * shift) * -d
+ || (rest_extent[-d] + staff_space * shift) * -d
< rad)
shift = ceil (fabs (shift)) * sign (shift);
bool knee = false;
int d = 0;
extract_grob_set (me, "stems", stems);
- for (int i = stems.size (); i--;)
+ for (vsize i = stems.size (); i--;)
{
Direction dir = get_grob_direction (stems[i]);
if (d && d != dir)
extract_grob_set (me, "stems", stems);
int bc = 0;
- for (int i = stems.size (); i--;)
+ for (vsize i = stems.size (); i--;)
{
/*
Should we take invisible stems into account?
"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 "
+ "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 "
- "chord-tremolo "
+ "clip-edges "
"concaveness "
"damping "
"details "
"direction "
- "dir-function "
- "flag-width-function "
"gap "
"gap-count "
+ "grow-direction "
"inspect-quants "
"knee "
+ "length-fraction "
"least-squares-dy "
"neutral-direction "
- "position-callbacks "
"positions "
"quant-score "
+ "quantized-positions "
"shorten "
- "space-function "
+ "stems "
"thickness "
);
projects / lilypond.git / blobdiff