source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
-
*/
/*
TODO:
-
- * Junk stem_info.
-
- * 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?
+ Problematic issue is user tweaks (user tweaks are in staff-coordinates.)
+
Notes:
-
- Stems run to the Y-center of the beam.
- - beam_space is the offset between Y centers of the beam.
+ - beam_translation is the offset between Y centers of the beam.
*/
#include <math.h> // tanh.
-#include "align-interface.hh"
-#include "molecule.hh"
+#include "stencil.hh"
#include "directional-element-interface.hh"
#include "beaming.hh"
#include "beam.hh"
#include "spanner.hh"
#include "warn.hh"
-
-#define DEBUG_QUANTING 0
+bool debug_beam_quanting_flag;
#if DEBUG_QUANTING
#endif
-const int INTER_QUANT_PENALTY = 1000;
-const int SECONDARY_BEAM_DEMERIT = 15;
-const int STEM_LENGTH_DEMERIT_FACTOR = 5;
-// possibly ridiculous, but too short stems just won't do
-const int STEM_LENGTH_LIMIT_PENALTY = 5000;
-const int DAMPING_DIRECTIION_PENALTY = 800;
-const int MUSICAL_DIRECTION_FACTOR = 400;
-const int IDEAL_SLOPE_FACTOR = 10;
-const int REGION_SIZE = 2;
-
-
-static Real
-shrink_extra_weight (Real x)
-{
- return fabs (x) * ((x < 0) ? 1.5 : 1.0);
-}
-
void
Beam::add_stem (Grob *me, Grob *s)
{
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));
}
+
+Real
+Beam::get_thickness (Grob * me)
+{
+ return robust_scm2double (me->get_grob_property ("thickness"), 0)
+ * Staff_symbol_referencer::staff_space (me);
+}
+
+/* Return the translation between 2 adjoining beams. */
Real
-Beam::get_beam_space (Grob *me)
+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);
+
+ if (gh_procedure_p (func))
+ {
+ SCM s = gh_call2 (func, me->self_scm (), scm_int2num (get_beam_count (me)));
+ return gh_scm2double (s);
+ }
+ else
+ {
+ return 0.81;
+ }
}
-/*
- Maximum beam_count.
- */
+/* Maximum beam_count. */
int
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))
{
- Grob *sc = unsmob_grob (ly_car (s));
-
- m = m >? (Stem::beam_multiplicity (sc).length () + 1);
+ Grob *stem = unsmob_grob (ly_car (s));
+ m = 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 = me->paper_l ()->get_var ("linethickness");
- Real thickness = gh_scm2double (me->get_grob_property ("thickness"))
- * staff_space;
+ Real line = Staff_symbol_referencer::line_thickness (me);
+ Real thickness = get_thickness (me);
- Real beam_space = gh_scm2int (beam_count) < 4
+ 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_space);
+ return gh_double2scm (beam_translation);
}
{
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];
SCM this_beaming = this_stem->get_grob_property ("beaming");
- Direction this_dir = Directional_element_interface::get(this_stem);
- if (i > 0)
+ Direction this_dir = get_grob_direction (this_stem);
+ if (gh_pair_p (last_beaming) && gh_pair_p (this_beaming))
{
- 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);
- if (!new_slice.empty_b())
+ 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))
{
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);
+ }
+
+ if (scm_ilength (gh_cdr (this_beaming)) > 0)
+ {
+ last_beaming = this_beaming;
+ last_dir = this_dir;
+ }
}
-}
+ }
-MAKE_SCHEME_CALLBACK (Beam, brew_molecule, 1);
+
+/*
+ TODO: should not make beams per stem, but per Y-level.
+ */
+MAKE_SCHEME_CALLBACK (Beam, print, 1);
SCM
-Beam::brew_molecule (SCM grob)
+Beam::print (SCM grob)
{
Grob *me = unsmob_grob (grob);
+ position_beam (me);
+
Link_array<Grob> stems=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
Grob* xcommon = common_refpoint_of_array (stems, me, X_AXIS);
}
SCM posns = me->get_grob_property ("positions");
- Interval pos;
- if (!ly_number_pair_p (posns))
+ Drul_array<Real> pos;
+ if (!is_number_pair (posns))
{
programming_error ("No beam posns");
pos = Interval (0,0);
}
else
- pos= ly_scm2interval (posns);
+ pos= ly_scm2realdrul (posns);
- Real dy = pos.delta ();
- Real dydx = dy && dx ? dy/dx : 0;
+ scale_drul ( &pos, Staff_symbol_referencer::staff_space (me));
+
+ Real dy = pos[RIGHT] - pos[LEFT];
+ Real dydx = (dy && dx) ? dy/dx : 0;
- Real thick = gh_scm2double (me->get_grob_property ("thickness"));
- Real bdy = get_beam_space (me);
+ Real thick = get_thickness (me);
+ Real bdy = get_beam_translation (me);
- SCM last_beaming = SCM_EOL;;
+ SCM last_beaming = SCM_EOL;
Real last_xposn = -1;
- Real last_width = -1 ;
-
+ Real last_stem_width = -1 ;
- SCM gap = me->get_grob_property ("gap");
- Molecule the_beam;
- Real lt = me->paper_l ()->get_var ("linethickness");
- for (int i = 0; i< stems.size(); i++)
+ Real gap_length =robust_scm2double ( me->get_grob_property ("gap"), 0.0);
+
+ Stencil the_beam;
+ Real lt = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+
+ for (int i = 0; i<= stems.size(); i++)
{
- Grob * st =stems[i];
+ Grob * st = (i < stems.size()) ? stems[i] : 0;
- 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;
-
- if (i > 0)
- {
- SCM left = gh_cdr (last_beaming);
- SCM right = gh_car (this_beaming);
+ SCM this_beaming = st ? st->get_grob_property ("beaming") : SCM_EOL;
+ Real xposn = st ? st->relative_coordinate (xcommon, X_AXIS) : 0.0;
+ Real stem_width = st ? robust_scm2double (st->get_grob_property ("thickness"), 1.0) *lt : 0 ;
+ Direction stem_dir = st ? to_dir (st->get_grob_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) ? gh_cdr (last_beaming) : SCM_EOL;
+ SCM right = st ? gh_car (this_beaming) : SCM_EOL;
- Array<int> fullbeams;
- Array<int> lfliebertjes;
- Array<int> rfliebertjes;
+ Array<int> full_beams;
+ Array<int> lfliebertjes;
+ Array<int> rfliebertjes;
- for (SCM s = left;
- gh_pair_p (s); s =gh_cdr (s))
+ 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)
{
- int b = gh_scm2int (gh_car (s));
- if (scm_memq (gh_car(s), right) != SCM_BOOL_F)
- {
- fullbeams.push (b);
- }
- else
- {
- lfliebertjes.push (b);
- }
+ full_beams.push (b);
}
- for (SCM s = right;
- gh_pair_p (s); s =gh_cdr (s))
+ else
{
- int b = gh_scm2int (gh_car (s));
- if (scm_memq (gh_car(s), left) == SCM_BOOL_F)
- {
- rfliebertjes.push (b);
- }
+ lfliebertjes.push (b);
}
-
-
- Real w = xposn - last_xposn;
- Real stem_offset = 0.0;
- Real width_corr = 0.0;
- if (i == 1)
+ }
+ for (SCM s = right;
+ gh_pair_p (s); s =gh_cdr (s))
+ {
+ int b = gh_scm2int (gh_car (s));
+ if (scm_memq (gh_car(s), left) == SCM_BOOL_F)
{
- stem_offset -= last_width/2;
- width_corr += last_width/2;
+ rfliebertjes.push (b);
}
+ }
+
+ /*
+ how much to stick out for beams across linebreaks
+ */
+ Real break_overshoot = 3.0;
+ Real w = (i > 0 && st) ? xposn - last_xposn : break_overshoot;
+
+ Real stem_offset =0.0;
+ if (i > 0)
+ {
+ w += last_stem_width / 2;
+ stem_offset = -last_stem_width / 2;
+ }
+
+ if (st)
+ w += stem_width/ 2 ;
+
+
+ Real blot = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter"));
+ Stencil whole = Lookup::beam (dydx, w, thick, blot);
+ Stencil gapped;
+
+ int gap_count = 0;
+ if (gh_number_p (me->get_grob_property ("gap-count")))
+ {
+ gap_count = gh_scm2int (me->get_grob_property ("gap-count"));
+ gapped = Lookup::beam (dydx, 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 (i == stems.size() -1)
+ if (k++ < gap_count)
{
- width_corr += stem_width/2;
+ b = gapped;
+ b.translate_axis (gap_length, X_AXIS);
}
+ b.translate_axis (last_xposn - x0 + stem_offset, X_AXIS);
+ b.translate_axis (dydx * (last_xposn - x0) + bdy * full_beams[j], Y_AXIS);
- if (gh_number_p (gap))
- {
- Real g = gh_scm2double (gap);
- stem_offset += g;
- width_corr -= 2*g;
- }
+ the_beam.add_stencil (b);
+ }
+
+
- 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);
- }
+ if (lfliebertjes.size() || rfliebertjes.size())
+ {
+ Real nw_f;
- if (lfliebertjes.size() || rfliebertjes.size())
+ if (st)
{
+ int t = Stem::duration_log (st);
- Real nw_f;
- if (!Stem::first_head (st))
- nw_f = 0;
- else
- {
- int t = Stem::duration_log (st);
-
- 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 */
+ SCM proc = me->get_grob_property ("flag-width-function");
+ SCM result = gh_call1 (proc, scm_int2num (t));
+ nw_f = gh_scm2double (result);
+ }
+ else
+ nw_f = break_overshoot;
- Real w = xposn - last_xposn;
- w = w/2 <? nw_f;
+ /* Half beam should be one note-width,
+ but let's make sure two half-beams never touch */
+ Real w = (i>0 && st) ? (xposn - last_xposn) : break_overshoot;
+ w = w/2 <? nw_f;
- Molecule half = Lookup::beam (dydx, w, thick);
- for (int j = lfliebertjes.size(); j--;)
- {
- 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);
- }
- for (int j = rfliebertjes.size(); j--;)
- {
- 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);
- }
+ Stencil half = Lookup::beam (dydx, w, thick, blot);
+ for (int j = lfliebertjes.size(); j--;)
+ {
+ Stencil 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_stencil (b);
+ }
+ for (int j = rfliebertjes.size(); j--;)
+ {
+ Stencil 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_stencil (b);
}
- }
+ }
+
last_xposn = xposn;
- last_width = stem_width;
+ last_stem_width = stem_width;
last_beaming = this_beaming;
}
the_beam.translate_axis (pos[LEFT], Y_AXIS);
#if (DEBUG_QUANTING)
+ SCM quant_score = me->get_grob_property ("quant-score");
+ if (debug_beam_quanting_flag
+ && gh_string_p (quant_score))
{
+
/*
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_str (gh_scm2int (me->get_grob_property ("best-idx")));
- str += ":";
- }
- str += to_str (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);
- the_beam.add_at_edge (Y_AXIS, UP, tm, 5.0);
+ Stencil tm = *unsmob_stencil (Text_item::interpret_markup
+ (me->get_paper ()->self_scm (), properties, quant_score));
+ the_beam.add_at_edge (Y_AXIS, UP, tm, 5.0, 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 {
Grob *s = stems[i];
- Direction sd = Directional_element_interface::get (s);
+ Direction sd = get_grob_direction (s);
int center_distance = int(- d * Stem::head_positions (s) [-d]) >? 0;
int current = sd ? (1 + d * sd)/2 : center_distance;
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];
- 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))
+ set_grob_direction (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.is_empty ())
+ {
+ Interval before = allowed_regions_[i];
+ Interval after = allowed_regions_[i];
+
+ before[RIGHT] = s[LEFT];
+ after[LEFT] = s[RIGHT];
+
+ if (!before.is_empty () && before.length () > 0.0)
+ {
+ allowed_regions_.insert (before, i);
+ i++;
+ }
+ allowed_regions_.del (i);
+ if (!after.is_empty () && after.length () > 0.0)
+ {
+ allowed_regions_.insert (after, i);
+ i++;
+ }
+ }
+ else
+ i++;
+ }
+ }
+};
-/* Simplistic auto-knees; only consider vertical gap between two
- adjacent chords.
- `Forced' stem directions are ignored. If you don't want auto-knees,
- don't set, or unset auto-knee-gap. */
+/*
+ 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 ;
- if (gh_number_p (scm))
- {
- bool knee_b = false;
- Real knee_y = 0;
- Real staff_space = Staff_symbol_referencer::staff_space (me);
- Real gap = gh_scm2double (scm) / staff_space;
+ Real threshold = gh_scm2double (scm);
+
+ Int_set gaps;
+ gaps.set_full ();
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
+ 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 i=1; i < stems.size (); i++)
- {
- if (!Stem::invisible_b (stems[i-1]))
- l = i - 1;
- if (Stem::invisible_b (stems[l]))
- continue;
- if (Stem::invisible_b (stems[i]))
- continue;
-
- Real left = Stem::extremal_heads (stems[l])[d]
- ->relative_coordinate (common, Y_AXIS);
- Real right = Stem::extremal_heads (stems[i])[-d]
- ->relative_coordinate (common, Y_AXIS);
+ 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++)
+ {
+ Grob* stem = stems[i];
+ if (Stem::invisible_b (stem))
+ continue;
- Real dy = right - left;
+ Interval hps = Stem::head_positions (stem);
+ if(!hps.is_empty ())
+ {
+ hps[LEFT] += -1;
+ hps[RIGHT] += 1;
+ hps *= staff_space * 0.5 ;
- if (abs (dy) >= gap)
+ /*
+ 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")))
{
- knee_y = (right + left) / 2;
- knee_b = true;
- break;
+ Direction stemdir = to_dir (stem->get_grob_property ("direction"));
+ hps[-stemdir] = - stemdir * infinity_f;
}
}
+ hps_array.push (hps);
+
+ gaps.remove_interval (hps);
+ }
+
+ Interval max_gap;
+ Real max_gap_len =0.0;
+
+ for (int i = gaps.allowed_regions_.size() -1; i >= 0 ; i--)
+ {
+ Interval gap = gaps.allowed_regions_[i];
+
+ /*
+ the outer gaps are not knees.
+ */
+ if (isinf (gap[LEFT]) || isinf(gap[RIGHT]))
+ continue;
- if (knee_b)
+ if (gap.length () >= max_gap_len)
{
- for (int i=0; i < stems.size (); i++)
- {
- Grob *s = stems[i];
- if (Stem::invisible_b (s) ||
- s->get_grob_property ("dir-forced") == SCM_BOOL_T)
- continue;
- Real y = Stem::extremal_heads (stems[i])[d]
- ->relative_coordinate (common, Y_AXIS);
+ max_gap_len = gap.length();
+ max_gap = gap;
+ }
+ }
- Directional_element_interface::set (s, y < knee_y ? UP : DOWN);
- s->set_grob_property ("dir-forced", SCM_BOOL_T);
- }
+ 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.is_empty () || hps.length () < 1e-6 );
}
}
}
+
+
/* Set stem's shorten property if unset.
TODO:
take some y-position (chord/beam/nearest?) into account
scmify forced-fraction
-
- TODO:
-
- why is shorten stored in beam, and not directly in stem?
+
+ This is done in beam because the shorten has to be uniform over the
+ entire beam.
*/
void
-Beam::set_stem_shorten (Grob *m)
+Beam::set_stem_shorten (Grob *me)
{
- Spanner*me = dynamic_cast<Spanner*> (m);
-
- Real forced_fraction = forced_stem_count (me) / visible_stem_count (me);
+ /*
+ shortening looks silly for x staff beams
+ */
+ if (knee_b(me))
+ return ;
+
+ Real forced_fraction = 1.0 * 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)
+ 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 */
Beam::after_line_breaking (SCM smob)
{
Grob *me = unsmob_grob (smob);
-
+
+ position_beam (me);
+ return SCM_UNSPECIFIED;
+}
+
+void
+Beam::position_beam (Grob *me)
+{
+ if (to_boolean (me->get_grob_property ("positioning-done")))
+ return ;
+
+ me->set_grob_property ("positioning-done", SCM_BOOL_T);
+
/* Copy to mutable list. */
SCM s = ly_deep_copy (me->get_grob_property ("positions"));
me->set_grob_property ("positions", s);
if (ly_car (s) == SCM_BOOL_F)
{
-
// 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);
+ gh_call1 (ly_car (i), me->self_scm ());
}
set_stem_lengths (me);
- return SCM_UNSPECIFIED;
}
-struct Quant_score
-{
- Real yl;
- Real yr;
- Real demerits;
-};
-
/*
- TODO:
-
- - Make all demerits customisable
-
- - One sensible check per demerit (what's this --hwn)
-
- - Add demerits for quants per se, as to forbid a specific quant
- entirely
-
-*/
-MAKE_SCHEME_CALLBACK (Beam, quanting, 1);
-SCM
-Beam::quanting (SCM smob)
-{
- Grob *me = unsmob_grob (smob);
-
- SCM s = me->get_grob_property ("positions");
- Real yl = gh_scm2double (gh_car (s));
- Real yr = gh_scm2double (gh_cdr (s));
-
- Real ss = Staff_symbol_referencer::staff_space (me);
- Real thickness = gh_scm2double (me->get_grob_property ("thickness")) / ss;
- Real slt = me->paper_l ()->get_var ("linethickness") / ss;
-
-
- SCM sdy = me->get_grob_property ("least-squares-dy");
- Real dy_mus = gh_number_p (sdy) ? gh_scm2double (sdy) : 0.0;
-
- Real straddle = 0.0;
- Real sit = (thickness - slt) / 2;
- Real inter = 0.5;
- Real hang = 1.0 - (thickness - slt) / 2;
- Real quants [] = {straddle, sit, inter, hang };
-
- int num_quants = int (sizeof (quants)/sizeof (Real));
- Array<Real> quantsl;
- Array<Real> quantsr;
-
- /*
- going to REGION_SIZE == 2, yields another 0.6 second with
- wtk1-fugue2.
-
-
- (result indexes between 70 and 575) ? --hwn.
-
- */
-
-
-
- /*
- Do stem computations. These depend on YL and YR linearly, so we can
- precompute for every stem 2 factors.
- */
- Link_array<Grob> stems=
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
- Array<Stem_info> stem_infos;
- Array<Real> lbase_lengths;
- Array<Real> rbase_lengths;
-
- Drul_array<bool> dirs_found(0,0);
- Grob *common_y = common_refpoint_of_array (stems, me, Y_AXIS);
-
- bool french = to_boolean (me->get_grob_property ("french-beaming"));
- for (int i= 0; i < stems.size(); i++)
- {
- Grob*s = stems[i];
- stem_infos.push (Stem::calc_stem_info (s));
- dirs_found[stem_infos.top ().dir_] = true;
-
- Real b = calc_stem_y (me, s, common_y , Interval (1,0), french && i > 0&& (i < stems.size () -1));
- lbase_lengths.push (b);
-
- Real a = calc_stem_y (me, s, common_y , Interval (0,1), french && i > 0&& (i < stems.size () -1));
- rbase_lengths.push (a);
- }
-
- Direction ldir = Direction (stem_infos[0].dir_);
- Direction rdir = Direction (stem_infos.top ().dir_);
- bool knee_b = dirs_found[LEFT] && dirs_found[RIGHT];
-
-
- int region_size = REGION_SIZE;
- /*
- Knees are harder, lets try some more possibilities for knees.
- */
- if (knee_b)
- region_size += 2;
-
- for (int i = -region_size ; i < region_size; i++)
- for (int j = 0; j < num_quants; j++)
- {
- quantsl.push (i + quants[j] + int (yl));
- quantsr.push (i + quants[j] + int (yr));
- }
-
- Array<Quant_score> qscores;
-
- for (int l =0; l < quantsl.size (); l++)
- for (int r =0; r < quantsr.size (); r++)
- {
- Quant_score qs;
- qs.yl = quantsl[l];
- qs.yr = quantsr[r];
- qs.demerits = 0.0;
-
- qscores.push (qs);
- }
-
-
- /*
- This is a longish function, but we don't separate this out into
- neat modular separate subfunctions, as the subfunctions would be
- called for many values of YL, YR. By precomputing various
- parameters outside of the loop, we can save a lot of time.
-
- */
-
-
- Grob *fvs = first_visible_stem (me);
- Grob *lvs = last_visible_stem (me);
-
- Grob *commony = fvs->common_refpoint (lvs, Y_AXIS);
- bool xstaff= (Align_interface::has_interface (commony));
-
- for (int i = qscores.size (); i--;)
- if (qscores[i].demerits < 100)
- {
- qscores[i].demerits
- += score_slopes_dy (me, qscores[i].yl, qscores[i].yr,
- dy_mus, yr- yl, xstaff);
- }
-
- Real rad = Staff_symbol_referencer::staff_radius (me);
- int beam_count = get_beam_count (me);
- Real beam_space = beam_count < 4
- ? (2*ss + slt - thickness) / 2.0
- : (3*ss + slt - thickness) / 3.0;
-
- for (int i = qscores.size (); i--;)
- if (qscores[i].demerits < 100)
- {
- qscores[i].demerits
- += score_forbidden_quants (me, qscores[i].yl, qscores[i].yr,
- rad, slt, thickness, beam_space,
- beam_count, ldir, rdir);
- }
-
-
- for (int i = qscores.size (); i--;)
- if (qscores[i].demerits < 100)
- {
- qscores[i].demerits
- += score_stem_lengths (stems, stem_infos,
- lbase_lengths, rbase_lengths,
- knee_b,
- me, qscores[i].yl, qscores[i].yr);
- }
-
-
- Real best = 1e6;
- int best_idx = -1;
- for (int i = qscores.size (); i--;)
- {
- if (qscores[i].demerits < best)
- {
- best = qscores [i].demerits ;
- best_idx = i;
- }
- }
-
-
- me->set_grob_property ("positions",
- gh_cons (gh_double2scm (qscores[best_idx].yl),
- gh_double2scm (qscores[best_idx].yr))
- );
-
-#if DEBUG_QUANTING
-
- // debug quanting
- me->set_grob_property ("quant-score",
- gh_double2scm (qscores[best_idx].demerits));
- me->set_grob_property ("best-idx", gh_int2scm (best_idx));
-#endif
-
- return SCM_UNSPECIFIED;
-}
-
-Real
-Beam::score_stem_lengths (Link_array<Grob>stems,
- Array<Stem_info> stem_infos,
- Array<Real> left_factor,
- Array<Real> right_factor,
- bool knee,
- Grob*me,
- Real yl, Real yr)
-{
- Real demerit_score = 0.0 ;
- Real pen = STEM_LENGTH_LIMIT_PENALTY;
-
- for (int i=0; i < stems.size (); i++)
- {
- Grob* s = stems[i];
- if (Stem::invisible_b (s))
- continue;
-
- Real current_y =
- yl * left_factor[i] + right_factor[i]* yr;
-
- Stem_info info = stem_infos[i];
- Direction d = info.dir_;
-
- demerit_score += pen
- * ( 0 >? (info.dir_ * (info.shortest_y_ - current_y)));
-
- demerit_score += STEM_LENGTH_DEMERIT_FACTOR
- * shrink_extra_weight (d * current_y - info.dir_ * info.ideal_y_);
- }
-
- demerit_score *= 2.0 / stems.size ();
-
- return demerit_score;
-}
-
-Real
-Beam::score_slopes_dy (Grob *me,
- Real yl, Real yr,
- Real dy_mus, Real dy_damp,
- bool xstaff)
-{
- Real dy = yr - yl;
-
- Real dem = 0.0;
- if (sign (dy_damp) != sign (dy))
- {
- dem += DAMPING_DIRECTIION_PENALTY;
- }
-
- dem += MUSICAL_DIRECTION_FACTOR * (0 >? (fabs (dy) - fabs (dy_mus)));
-
-
- Real slope_penalty = IDEAL_SLOPE_FACTOR;
-
- /*
- Xstaff beams tend to use extreme slopes to get short stems. We
- put in a penalty here.
- */
- if (xstaff)
- slope_penalty *= 10;
-
- dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy))* slope_penalty;
- return dem;
-}
-
-static Real
-my_modf (Real x)
-{
- return x - floor (x);
-}
-
-Real
-Beam::score_forbidden_quants (Grob*me,
- Real yl, Real yr,
- Real rad,
- Real slt,
- Real thickness, Real beam_space,
- int beam_count,
- Direction ldir, Direction rdir)
-{
- Real dy = yr - yl;
-
- Real dem = 0.0;
- if (fabs (yl) < rad && fabs ( my_modf (yl) - 0.5) < 1e-3)
- dem += INTER_QUANT_PENALTY;
- if (fabs (yr) < rad && fabs ( my_modf (yr) - 0.5) < 1e-3)
- dem += INTER_QUANT_PENALTY;
-
- // todo: use beam_count of outer stems.
- if (beam_count >= 2)
- {
-
- Real straddle = 0.0;
- Real sit = (thickness - slt) / 2;
- Real inter = 0.5;
- Real hang = 1.0 - (thickness - slt) / 2;
-
-
- if (fabs (yl - ldir * beam_space) < rad
- && fabs (my_modf (yl) - inter) < 1e-3)
- dem += SECONDARY_BEAM_DEMERIT;
- if (fabs (yr - rdir * beam_space) < rad
- && fabs (my_modf (yr) - inter) < 1e-3)
- dem += SECONDARY_BEAM_DEMERIT;
-
- Real eps = 1e-3;
-
- /*
- Can't we simply compute the distance between the nearest
- staffline and the secondary beam? That would get rid of the
- silly case analysis here (which is probably not when we have
- different beam-thicknesses.)
-
- --hwn
- */
-
-
- // hmm, without Interval/Drul_array, you get ~ 4x same code...
- if (fabs (yl - ldir * beam_space) < rad + inter)
- {
- if (ldir == UP && dy <= eps
- && fabs (my_modf (yl) - sit) < eps)
- dem += SECONDARY_BEAM_DEMERIT;
-
- if (ldir == DOWN && dy >= eps
- && fabs (my_modf (yl) - hang) < eps)
- dem += SECONDARY_BEAM_DEMERIT;
- }
-
- if (fabs (yr - rdir * beam_space) < rad + inter)
- {
- if (rdir == UP && dy >= eps
- && fabs (my_modf (yr) - sit) < eps)
- dem += SECONDARY_BEAM_DEMERIT;
-
- if (rdir == DOWN && dy <= eps
- && fabs (my_modf (yr) - hang) < eps)
- dem += SECONDARY_BEAM_DEMERIT;
- }
-
- if (beam_count >= 3)
- {
- if (fabs (yl - 2 * ldir * beam_space) < rad + inter)
- {
- if (ldir == UP && dy <= eps
- && fabs (my_modf (yl) - straddle) < eps)
- dem += SECONDARY_BEAM_DEMERIT;
-
- if (ldir == DOWN && dy >= eps
- && fabs (my_modf (yl) - straddle) < eps)
- dem += SECONDARY_BEAM_DEMERIT;
- }
-
- if (fabs (yr - 2 * rdir * beam_space) < rad + inter)
- {
- if (rdir == UP && dy >= eps
- && fabs (my_modf (yr) - straddle) < eps)
- dem += SECONDARY_BEAM_DEMERIT;
-
- if (rdir == DOWN && dy <= eps
- && fabs (my_modf (yr) - straddle) < eps)
- dem += SECONDARY_BEAM_DEMERIT;
- }
- }
- }
-
- return dem;
-}
-
-
-
+ Compute a first approximation to the beam slope.
+ */
MAKE_SCHEME_CALLBACK (Beam, least_squares, 1);
SCM
Beam::least_squares (SCM smob)
int count = visible_stem_count (me);
Interval pos (0, 0);
- if (count <= 1)
+ if (count < 1)
{
me->set_grob_property ("positions", ly_interval2scm (pos));
return SCM_UNSPECIFIED;
Grob *fvs = first_visible_stem (me);
Grob *lvs = last_visible_stem (me);
- Interval ideal (Stem::calc_stem_info (fvs).ideal_y_
+ Interval ideal (Stem::get_stem_info (fvs).ideal_y_
+ fvs->relative_coordinate (commony, Y_AXIS) -my_y,
- Stem::calc_stem_info (lvs).ideal_y_
+ Stem::get_stem_info (lvs).ideal_y_
+ lvs->relative_coordinate (commony, Y_AXIS) - my_y);
Real x0 = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
}
Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0;
+
Real y =0;
Real dydx = 0;
Real dy = 0;
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.
+
+ However, if both stems reach middle line,
+ ideal[LEFT] == ideal[RIGHT] and ideal.delta () == 0.
- /*
- TODO -- use scoring for this.
-
- 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] = get_thickness (me) / 2;
pos[-d] = - pos[d];
}
else
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.
+ */
+ me->set_grob_property ("least-squares-dy",
+ gh_double2scm (pos[RIGHT] - pos[LEFT]));
}
else
{
if (Stem::invisible_b (s))
continue;
ideals.push (Offset (x_posns[i],
- Stem::calc_stem_info (s).ideal_y_
+ Stem::get_stem_info (s).ideal_y_
+ s->relative_coordinate (commony, Y_AXIS)
- my_y));
}
+
minimise_least_squares (&dydx, &y, ideals);
dy = dydx * dx;
pos = Interval (y, (y+dy));
}
+ /*
+ "position" is relative to the staff.
+ */
+ scale_drul (&pos, 1/ Staff_symbol_referencer::staff_space (me));
+
me->set_grob_property ("positions", ly_interval2scm (pos));
return SCM_UNSPECIFIED;
/*
We can't combine with previous function, since check concave and
slope damping comes first.
+
+TODO: we should use the concaveness to control the amount of damping
+applied.
+
*/
MAKE_SCHEME_CALLBACK (Beam, shift_region_to_valid, 1);
SCM
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 ( me->get_grob_property ("positions"));
+
+ scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
+
+ Real dy = pos[RIGHT] - pos[LEFT];
Real y = pos[LEFT];
Real dydx =dy/dx;
Direction d = Stem::get_direction (s);
Real left_y =
- Stem::calc_stem_info (s).shortest_y_
+ Stem::get_stem_info (s).shortest_y_
- dydx * x_posns [i];
/*
feasible_left_point.intersect (flp);
}
- if (feasible_left_point.empty_b())
+ if (feasible_left_point.is_empty ())
{
warning (_("Not sure that we can find a nice beam slope (no viable initial configuration found)."));
}
- else if (!feasible_left_point.elem_b(y))
+ else if (!feasible_left_point.contains (y))
{
if (isinf (feasible_left_point[DOWN]))
y = feasible_left_point[UP] - REGION_SIZE;
else
y = feasible_left_point.center ();
}
- pos = Interval (y, (y+dy));
+
+ pos = Drul_array<Real> (y, (y+dy));
+ scale_drul (&pos, 1/ Staff_symbol_referencer::staff_space (me));
+
me->set_grob_property ("positions", ly_interval2scm (pos));
return SCM_UNSPECIFIED;
}
concave *= dir;
concaveness2 = concave / (stems.size () - 2);
- /* ugh: this is the a kludge to get
- input/regression/beam-concave.ly to behave as
- baerenreiter. */
+ /*
+
+ 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
/* 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)));
+ Drul_array<Real> pos = ly_scm2interval (me->get_grob_property ("positions"));
+ Real r = linear_combination (pos, 0);
+
+ r /= Staff_symbol_referencer::staff_space (me);
+ me->set_grob_property ("positions", ly_interval2scm (Drul_array<Real> (r, r)));
me->set_grob_property ("least-squares-dy", gh_double2scm (0));
}
if (damping)
{
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
- Real dy = pos.delta ();
+ Drul_array<Real> pos = ly_scm2interval (me->get_grob_property ("positions"));
+ scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
+
+ Real dy = pos[RIGHT] - pos[LEFT];
Grob *fvs = first_visible_stem (me);
Grob *lvs = last_visible_stem (me);
Real damped_dy = dydx * dx;
pos[LEFT] += (dy - damped_dy) / 2;
pos[RIGHT] -= (dy - damped_dy) / 2;
+
+ scale_drul (&pos, 1/Staff_symbol_referencer::staff_space (me));
me->set_grob_property ("positions", ly_interval2scm (pos));
}
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)
{
return l;
}
-/*
- Calculate the Y position of the stem-end, given the Y-left, Y-right
- in POS, and for stem 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_y, Interval pos, bool french)
+Beam::calc_stem_y (Grob *me, Grob* s, Grob ** common,
+ Real xl, Real xr,
+ Drul_array<Real> pos, bool french)
{
- Real beam_space = get_beam_space (me);
+ Real beam_translation = get_beam_translation (me);
- // ugh -> use commonx
- Grob * fvs = first_visible_stem (me);
- Grob *lvs = last_visible_stem (me);
- Real x0 = fvs ? fvs->relative_coordinate (0, X_AXIS) : 0.0;
- Real dx = fvs ? lvs->relative_coordinate (0, X_AXIS) - x0 : 0.0;
- Real r = s->relative_coordinate (0, X_AXIS) - x0;
- Real dy = pos.delta ();
+ Real r = s->relative_coordinate (common[X_AXIS], X_AXIS) - xl;
+ Real dy = pos[RIGHT] - pos[LEFT];
+ Real dx = xr - xl;
Real stem_y_beam0 = (dy && dx
? r / dx
* dy
: 0) + pos[LEFT];
-
-
- Direction my_dir = Directional_element_interface::get (s);
+ Direction my_dir = get_grob_direction (s);
SCM beaming = s->get_grob_property ("beaming");
Real stem_y = stem_y_beam0;
if (french)
{
Slice bm = where_are_the_whole_beams (beaming);
- if (!bm.empty_b())
- stem_y += beam_space * bm[-my_dir];
+ 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_space;
+ if (!bm.is_empty ())
+ stem_y +=bm[my_dir] * beam_translation;
}
- Real id = me->relative_coordinate (common_y, Y_AXIS)
- - s->relative_coordinate (common_y, Y_AXIS);
+ Real id = me->relative_coordinate (common[Y_AXIS], Y_AXIS)
+ - s->relative_coordinate (common[Y_AXIS], Y_AXIS);
return stem_y + id;
}
Link_array<Grob> stems=
Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems");
- if (stems.size () <= 1)
+ if (!stems.size ())
return;
- Grob *common = common_refpoint_of_array (stems, me, Y_AXIS);
- Interval pos = ly_scm2interval (me->get_grob_property ("positions"));
+ 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_grob_property ("positions"));
Real staff_space = Staff_symbol_referencer::staff_space (me);
+ scale_drul (&pos, staff_space);
- bool french = to_boolean (me->get_grob_property ("french-beaming"));
-
+ bool gap = false;
+ Real thick =0.0;
+ if (gh_number_p (me->get_grob_property ("gap-count"))
+ &&gh_scm2int (me->get_grob_property ("gap-count")))
+ {
+ 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++)
{
Grob* s = stems[i];
if (Stem::invisible_b (s))
continue;
- Real stem_y = calc_stem_y (me, s, common , pos, french && i > 0&& (i < stems.size () -1));
+ bool french = to_boolean (s->get_grob_property ("french-beaming"));
+ Real stem_y = calc_stem_y (me, s, common,
+ xl, xr,
+ 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_y += thick * 0.5 * get_grob_direction (s);
- Stem::set_stemend (s, 2* stem_y / staff_space);
+ Stem::set_stemend (s, 2* stem_y / staff_space);
}
}
||(d == RIGHT && i == stems.size () -1))
continue;
-
- SCM beaming_prop = stems[i]->get_grob_property ("beaming");
+ Grob *st = stems[i];
+ SCM beaming_prop = st->get_grob_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);
+ if (i>0
+ && i < stems.size() -1
+ && Stem::invisible_b (st))
+ b = b <? beaming->infos_.elem(i).beams_i_drul_[-d];
+
+ Stem::set_beaming (st, b, d);
}
}
while (flip (&d) != LEFT);
if (Stem::invisible_b (s))
continue;
- if (((int)Stem::chord_start_y (s))
+ /* I can imagine counting those boundaries as a half forced stem,
+ but let's count them full for now. */
+ if (abs (Stem::chord_start_y (s)) > 0.1
&& (Stem::get_direction (s) != Stem::get_default_dir (s)))
f++;
}
{
Grob *rest = unsmob_grob (element_smob);
Axis a = (Axis) gh_scm2int (axis);
+
+ if (gh_number_p (rest->get_grob_property ("staff-position")))
+ return gh_int2scm (0);
assert (a == Y_AXIS);
|| !Beam::visible_stem_count (beam))
return gh_double2scm (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);
+ Drul_array<Real> pos (0, 0);
SCM s = beam->get_grob_property ("positions");
if (gh_pair_p (s) && gh_number_p (ly_car (s)))
pos = ly_scm2interval (s);
+ Real staff_space = Staff_symbol_referencer::staff_space (rest);
- Real dy = pos.delta ();
+ scale_drul (&pos, staff_space);
+
+
+ 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;
Real dydx = dy && dx ? dy/dx : 0;
Direction d = Stem::get_direction (stem);
- Real beamy = (stem->relative_coordinate (0, X_AXIS) - x0) * dydx + pos[LEFT];
-
- Real staff_space = Staff_symbol_referencer::staff_space (rest);
-
+ Real stem_y = pos[LEFT] + (stem->relative_coordinate (0, X_AXIS) - x0) * dydx;
- Real rest_dim = rest->extent (rest, Y_AXIS)[d]*2.0 / staff_space; // refp??
+ Real beam_translation = get_beam_translation (beam);
+ Real beam_thickness = Beam::get_thickness (beam);
+
+ int beam_count = get_direction_beam_count (beam, d);
+ Real height_of_my_beams = beam_thickness / 2
+ + (beam_count - 1) * beam_translation;
+ Real beam_y = stem_y - d * height_of_my_beams;
- Real minimum_dist
- = gh_scm2double (rest->get_grob_property ("minimum-beam-collision-distance"));
- Real dist =
- minimum_dist + -d * (beamy - rest_dim) >? 0;
+ Grob *common_y = rest->common_refpoint (beam, Y_AXIS);
- int stafflines = Staff_symbol_referencer::line_count (rest);
+ Real rest_dim = rest->extent (common_y, Y_AXIS)[d];
+ Real minimum_distance =
+ staff_space * robust_scm2double (rest->get_grob_property ("minimum-distance"), 0.0);
- // move discretely by half spaces.
- int discrete_dist = int (ceil (dist));
+ Real shift = d * (((beam_y - d * minimum_distance) - rest_dim) * d <? 0.0);
- // move by whole spaces inside the staff.
- if (discrete_dist < stafflines+1)
- discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0);
-
- return gh_double2scm (-d * discrete_dist);
-}
+ shift /= staff_space;
+ Real rad = Staff_symbol_referencer::line_count (rest) * staff_space / 2;
+ /* Always move discretely by half spaces */
+ shift = ceil (fabs (shift * 2.0)) / 2.0 * sign (shift);
+ /* Inside staff, move by whole spaces*/
+ if ((rest->extent (common_y, Y_AXIS)[d] + staff_space * shift) * d
+ < rad
+ || (rest->extent (common_y, Y_AXIS)[-d] + staff_space * shift) * -d
+ < rad)
+ shift = ceil (fabs (shift)) *sign (shift);
+ return gh_double2scm (staff_space * shift);
+}
-ADD_INTERFACE (Beam, "beam-interface",
- "A beam.
+bool
+Beam::knee_b (Grob* me)
+{
+ SCM k = me->get_grob_property ("knee");
+ if (gh_boolean_p (k))
+ return gh_scm2bool (k);
-#'thickness= weight of beams, in staffspace
+ bool knee = false;
+ int d = 0;
+ for (SCM s = me->get_grob_property ("stems"); gh_pair_p (s); s = ly_cdr (s))
+ {
+ Direction dir = get_grob_direction (unsmob_grob (ly_car (s)));
+ if (d && d != dir)
+ {
+ knee = true;
+ break;
+ }
+ d = dir;
+ }
+
+ me->set_grob_property ("knee", gh_bool2scm (knee));
+ return knee;
+}
-We take the least squares line through the ideal-length stems, and
-then damp that using
+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);
+ }
- damped = tanh (slope)
+ return bc;
+}
-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.
-",
- "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");
+ADD_INTERFACE (Beam, "beam-interface",
+ "A beam. \n\n"
+" "
+"#'thickness= weight of beams, in staffspace "
+" "
+" "
+"We take the least squares line through the ideal-length stems, and "
+"then damp that using "
+" \n"
+" damped = tanh (slope) \n"
+" \n"
+"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. "
+,
+ "knee positioning-done position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap gap-count chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness");
projects / lilypond.git / blobdiff