source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
*/
#include "beam.hh"
-#include "interval-set.hh"
-#include "directional-element-interface.hh"
+
#include "beaming.hh"
-#include "misc.hh"
+#include "directional-element-interface.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
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));
}
-/* 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)
me->suicide ();
return SCM_UNSPECIFIED;
}
- else
+ else
{
- /*
- ugh.
+ Grob *stem = first_visible_stem (me);
- can happen in stem-tremolo case.
- TODO: fixme.
- */
- d = Stem::get_default_dir (stems[0]);
+ /*
+ ugh: stems[0] case happens for chord tremolo.
+ */
+ d = to_dir ((stem ? stem : stems[0])->get_property ("default-direction"));
}
}
-
if (count >= 1)
{
- d = get_default_dir (me);
+ if (!d)
+ d = get_default_dir (me);
+
consider_auto_knees (me);
}
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");
else
{
x0 = stems[0]->relative_coordinate (xcommon, X_AXIS);
- dx = stems.top ()->relative_coordinate (xcommon, X_AXIS) - x0;
+ dx = stems.back ()->relative_coordinate (xcommon, X_AXIS) - x0;
}
SCM posns = me->get_property ("quantized-positions");
Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
Stencil the_beam;
- Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+ Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
- for (int i = 0; i <= stems.size (); i++)
+ for (vsize i = 0; i <= stems.size (); i++)
{
Grob *stem = (i < stems.size ()) ? stems[i] : 0;
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;
+ vector<int> full_beams;
+ vector<int> lfliebertjes;
+ vector<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);
+ full_beams.push_back (b);
else
- lfliebertjes.push (b);
+ lfliebertjes.push_back (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);
+ rfliebertjes.push_back (b);
}
Drul_array<Real> break_overshoot
if (stem)
w += stem_width / 2;
- Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+ Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
Stencil whole = Lookup::beam (slope, w, thick, blot);
Stencil gapped;
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);
+ vector_sort (full_beams, default_compare);
if (stem_dir == UP)
- full_beams.reverse ();
+ reverse (full_beams);
}
int k = 0;
- for (int j = full_beams.size (); j--;)
+ for (vsize j = full_beams.size (); j--;)
{
Stencil b (whole);
Stencil rhalf = Lookup::beam (slope, rw, thick, blot);
Stencil lhalf = Lookup::beam (slope, lw, thick, blot);
- for (int j = lfliebertjes.size (); j--;)
+ for (vsize j = lfliebertjes.size (); j--;)
{
Stencil b (lhalf);
b.translate_axis (last_xposn - x0 - last_stem_width /2,
Y_AXIS);
the_beam.add_stencil (b);
}
- for (int j = rfliebertjes.size (); j--;)
+ for (vsize j = rfliebertjes.size (); j--;)
{
Stencil b (rhalf);
b.translate_axis (xposn - x0 - rw + stem_width / 2, 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->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))
{
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;
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)
{
}
}
- Direction dir = CENTER;
+
+ if (!force_dir)
+ {
+ if (abs (extremes[UP]) > -extremes[DOWN])
+ return DOWN;
+ else if (extremes[UP] < -extremes[DOWN])
+ return UP;
+ }
- if (Direction d = (Direction) sign (count[UP] - count[DOWN]))
+ Direction dir = CENTER;
+ Direction d = CENTER;
+ if ((d = (Direction) sign (count[UP] - count[DOWN])))
dir = d;
- else if (Direction d = (Direction) sign (total[UP] / count[UP] - total[DOWN]/count[DOWN]))
+ else if (count[UP]
+ && count[DOWN]
+ && (d = (Direction) sign (total[UP] / count[UP] - total[DOWN]/count[DOWN])))
dir = d;
- else if (Direction d = (Direction) sign (total[UP] - total[DOWN]))
+ else if ((d = (Direction) sign (total[UP] - total[DOWN])))
dir = d;
else
dir = to_dir (me->get_property ("neutral-direction"));
{
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))
if (count < 1)
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);
+ 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;
}
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));
/*
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);
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);
*/
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))
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))
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.
if (beaming_prop == SCM_EOL
|| index_get_cell (beaming_prop, d) == SCM_EOL)
{
- int b = beaming->infos_.elem (i).beams_i_drul_[d];
+ int b = beaming->infos_.at (i).beams_i_drul_[d];
if (i > 0
&& i < stems.size () -1
&& Stem::is_invisible (stem))
- b = min (b, beaming->infos_.elem (i).beams_i_drul_[-d]);
+ b = min (b, beaming->infos_.at (i).beams_i_drul_[-d]);
Stem::set_beaming (stem, b, d);
}
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];
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?
projects / lilypond.git / blobdiff