s->add_dependency (me);
- assert (!Stem::beam_l (s));
+ assert (!Stem::get_beam (s));
s->set_grob_property ("beam", me->self_scm ());
add_bound_item (dynamic_cast<Spanner*> (me), dynamic_cast<Item*> (s));
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)));
+ SCM s = gh_call2 (func, me->self_scm (), scm_int2num (get_beam_count (me)));
return gh_scm2double (s);
}
Grob *me = unsmob_grob (smob);
Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real line = me->paper_l ()->get_var ("linethickness");
+ Real line = me->get_paper ()->get_var ("linethickness");
Real thickness = gh_scm2double (me->get_grob_property ("thickness"))
* staff_space;
{
me->warning (_ ("Beam has less than two stems. Removing beam."));
- unsmob_grob (gh_car (stems))->remove_grob_property ("beam");
+ unsmob_grob (gh_car (stems))->set_grob_property ("beam", SCM_EOL);
me->suicide ();
return SCM_UNSPECIFIED;
{
Direction d = get_default_dir (me);
- consider_auto_knees (me, d);
+ consider_auto_knees (me);
set_stem_directions (me, d);
connect_beams (me);
}
+/*
+ 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));
+
+ int best_count = 0;
+ int best_start = 0;
+ for (int i = lslice[-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 k = - right_dir * gh_scm2int (gh_car (s)) + i;
+ if (scm_memq (scm_int2num (k), left_beaming) != SCM_BOOL_F)
+ count ++;
+ }
+
+ if (count >= best_count)
+ {
+ best_count = count;
+ best_start = i;
+ }
+ }
+
+ return best_start;
+}
void
Beam::connect_beams (Grob *me)
Slice last_int;
last_int.set_empty();
+ SCM last_beaming = SCM_EOL;
+ Direction last_dir = CENTER;
for (int i = 0; i< stems.size(); i++)
{
Grob *this_stem = stems[i];
Direction this_dir = Directional_element_interface::get(this_stem);
if (i > 0)
{
- int start_point = last_int [this_dir];
+ int start_point = position_with_maximal_common_beams
+ (last_beaming, this_beaming,
+ last_dir, this_dir);
Direction d = LEFT;
Slice new_slice ;
start_point - this_dir * gh_scm2int (gh_car (s));
new_slice.add_point (new_beam_pos);
- gh_set_car_x (s, gh_int2scm (new_beam_pos));
+ gh_set_car_x (s, scm_int2num (new_beam_pos));
}
+
+
}
while (flip (&d) != LEFT);
for (; gh_pair_p (s); s = gh_cdr (s))
{
int np = - this_dir * gh_scm2int (gh_car(s));
- gh_set_car_x (s, gh_int2scm (np));
+ gh_set_car_x (s, scm_int2num (np));
last_int.add_point (np);
}
}
if (i == stems.size () -1)
{
- gh_set_cdr_x ( this_beaming, SCM_EOL);
+ gh_set_cdr_x (this_beaming, SCM_EOL);
+ }
+
+ if (scm_ilength (gh_cdr (this_beaming)) > 0)
+ {
+ last_beaming = this_beaming;
+ last_dir = this_dir;
}
}
}
SCM gap = me->get_grob_property ("gap");
Molecule the_beam;
- Real lt = me->paper_l ()->get_var ("linethickness");
+ Real lt = me->get_paper ()->get_var ("linethickness");
for (int i = 0; i< stems.size(); i++)
{
Grob * st =stems[i];
int t = Stem::duration_log (st);
SCM proc = me->get_grob_property ("flag-width-function");
- SCM result = gh_call1 (proc, gh_int2scm (t));
+ SCM result = gh_call1 (proc, scm_int2num (t));
nw_f = gh_scm2double (result);
}
String str;
if (1)
{
- str += to_str (gh_scm2int (me->get_grob_property ("best-idx")));
+ str += to_string (gh_scm2int (me->get_grob_property ("best-idx")));
str += ":";
}
- str += to_str (gh_scm2double (me->get_grob_property ("quant-score")),
+ str += to_string (gh_scm2double (me->get_grob_property ("quant-score")),
"%.2f");
SCM properties = Font_interface::font_alist_chain (me);
- Molecule tm = Text_item::text2molecule (me, ly_str02scm (str.ch_C ()), properties);
+ Molecule tm = Text_item::text2molecule (me, scm_makfrom0str (str.to_str0 ()), properties);
the_beam.add_at_edge (Y_AXIS, UP, tm, 5.0);
}
#endif
count[UP] = count[DOWN] = 0;
Direction d = DOWN;
- Link_array<Item> stems=
- Pointer_group_interface__extract_grobs (me, (Item*)0, "stems");
+ Link_array<Grob> stems=
+ Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
for (int i=0; i <stems.size (); i++)
do {
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])));
+ gh_cons (scm_int2num (count[UP]),
+ scm_int2num (count[DOWN])),
+ gh_cons (scm_int2num (total[UP]),
+ scm_int2num (total[DOWN])));
if (gh_number_p (s) && gh_scm2int (s))
return to_dir (s);
void
Beam::set_stem_directions (Grob *me, Direction d)
{
- Link_array<Item> stems
- =Pointer_group_interface__extract_grobs (me, (Item*) 0, "stems");
+ Link_array<Grob> stems
+ =Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
for (int 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. */
- 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);
- }
+
+ SCM forcedir = s->get_grob_property ("direction");
+ if (!to_dir (forcedir))
+ Directional_element_interface::set (s, d);
}
-}
+}
-/* Simplistic auto-knees; only consider vertical gap between two
- adjacent chords.
+/*
+ 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();
+ }
- This may decide for a knee that's impossible to fit sane scoring
- criteria (eg, stem lengths). We may need something smarter. */
+ 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() && before.length () > 0.0)
+ {
+ allowed_regions_.insert (before, i);
+ i++;
+ }
+ allowed_regions_.del (i);
+ if (!after.empty_b () && after.length () > 0.0)
+ {
+ allowed_regions_.insert (after, i);
+ i++;
+ }
+ }
+ else
+ i++;
+ }
+ }
+};
+
+
+/*
+ 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.
+ */
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;
-
- bool knee_b = false;
+ return ;
+
+ Real threshold = gh_scm2double (scm);
- Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real gap = gh_scm2double (scm) / staff_space;
+ Int_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);
-
- int l = 0;
- for (int r=1; r < stems.size (); r++)
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
+
+ Array<Interval> hps_array;
+ for (int i=0; i < stems.size (); i++)
{
- if (!Stem::invisible_b (stems[r-1]))
- l = r - 1;
- Grob *right = stems[r];
- Grob *left = stems[l];
- if (Stem::invisible_b (left))
+ Grob* stem = stems[i];
+ if (Stem::invisible_b (stem))
continue;
- if (Stem::invisible_b (right))
- continue;
-
- Real left_y = Stem::extremal_heads (left)[d]
- ->relative_coordinate (common, Y_AXIS);
- Real right_y = Stem::extremal_heads (right)[-d]
- ->relative_coordinate (common, Y_AXIS);
- Real dy = right_y - left_y;
-
- if (abs (dy) >= gap)
+ Interval hps = Stem::head_positions (stem);
+ if(!hps.empty_b())
{
- knee_b = true;
- Direction knee_dir = (right_y > left_y ? UP : DOWN);
- if (!Stem::invisible_b (left)
- && left->get_grob_property ("dir-forced") != SCM_BOOL_T)
- {
- Directional_element_interface::set (left, knee_dir);
- left->set_grob_property ("dir-forced", SCM_BOOL_T);
+ hps[LEFT] += -1;
+ hps[RIGHT] += 1;
+ hps *= staff_space * 0.5 ;
- }
- if (!Stem::invisible_b (right)
- && stems[r]->get_grob_property ("dir-forced") != SCM_BOOL_T)
+ /*
+ We could subtract beam Y position, but this routine only
+ sets stem directions, a constant shift does not have an
+ influence.
+
+ */
+ hps += stem->relative_coordinate (common, Y_AXIS);
+
+ if (to_dir (stem->get_grob_property ("direction")))
{
- Directional_element_interface::set (right, -knee_dir);
- right->set_grob_property ("dir-forced", SCM_BOOL_T);
+ Direction stemdir = to_dir (stem->get_grob_property ("direction"));
+ hps[-stemdir] = - stemdir * infinity_f;
}
}
+ hps_array.push (hps);
+
+ gaps.remove_interval (hps);
}
- if (knee_b)
+ Interval max_gap;
+ Real max_gap_len =0.0;
+
+ for (int i = gaps.allowed_regions_.size() -1; i >= 0 ; i--)
{
- me->set_grob_property ("knee", SCM_BOOL_T);
-
- for (int i=0; i < stems.size (); i++)
- stems[i]->set_grob_property ("stem-info", SCM_EOL);
+ Interval gap = gaps.allowed_regions_[i];
+
+ /*
+ the outer gaps are not knees.
+ */
+ if (isinf (gap[LEFT]) || isinf(gap[RIGHT]))
+ continue;
+
+ if (gap.length () >= max_gap_len)
+ {
+ max_gap_len = gap.length();
+ max_gap = gap;
+ }
+ }
+
+ if (max_gap_len > threshold)
+ {
+ int j = 0;
+ for (int i = 0; i < stems.size(); i++)
+ {
+ Grob* stem = stems[i];
+ if (Stem::invisible_b (stem))
+ continue;
+
+ Interval hps = hps_array[j++];
+
+
+ Direction d = (hps.center () < max_gap.center()) ?
+ UP : DOWN ;
+
+ stem->set_grob_property ("direction", scm_int2num (d));
+
+ hps.intersect (max_gap);
+ assert (hps.empty_b () || hps.length () < 1e-6 );
+ }
}
}
+
+
/* Set stem's shorten property if unset.
TODO:
int beam_count = get_beam_count (me);
- SCM shorten = me->get_grob_property ("beamed-stem-shorten");
- if (shorten == SCM_EOL)
+ SCM shorten_list = me->get_grob_property ("beamed-stem-shorten");
+ if (shorten_list == 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)));
+
+ SCM shorten_elt =
+ robust_list_ref (beam_count -1, shorten_list);
Real shorten_f = gh_scm2double (shorten_elt) * staff_space;
/* your similar cute comment here */
return SCM_UNSPECIFIED;
}
+/*
+ Report slice containing the numbers that are both in (car BEAMING)
+ and (cdr BEAMING)
+ */
Slice
where_are_the_whole_beams(SCM beaming)
{
}
bool
-Beam::knee_b (Grob*me)
+Beam::knee_b (Grob* me)
{
SCM k = me->get_grob_property ("knee");
if (gh_boolean_p (k))
bool knee = false;
int d = 0;
for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
- if (d != Directional_element_interface::get (unsmob_grob (ly_car (s))))
- {
- knee = true;
- break;
- }
+ {
+ Direction dir = Directional_element_interface::get
+ (unsmob_grob (ly_car (s)));
+ if (d && d != dir)
+ {
+ knee = true;
+ break;
+ }
+ d = dir;
+ }
me->set_grob_property ("knee", gh_bool2scm (knee));
return knee;
}
+int
+Beam::get_direction_beam_count (Grob *me, Direction d )
+{
+ Link_array<Grob>stems =
+ Pointer_group_interface__extract_grobs (me, (Grob*) 0, "stems");
+ int bc = 0;
+
+ for (int i = stems.size (); i--;)
+ {
+ /*
+ Should we take invisible stems into account?
+ */
+ if (Stem::get_direction (stems[i]) == d)
+ bc = bc >? (Stem::beam_multiplicity (stems[i]).length () + 1);
+ }
+
+ return bc;
+}
+
ADD_INTERFACE (Beam, "beam-interface",
"A beam.
projects / lilypond.git / blobdiff