#include "beaming.hh"
#include "directional-element-interface.hh"
+#include "main.hh"
#include "international.hh"
#include "interval-set.hh"
#include "item.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
}
-/* 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)
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 (vsize i = 0; i <= stems.size (); i++)
{
SCM left = (i > 0) ? scm_cdr (last_beaming) : SCM_EOL;
SCM right = stem ? scm_car (this_beaming) : SCM_EOL;
- std::vector<int> full_beams;
- std::vector<int> lfliebertjes;
- std::vector<int> rfliebertjes;
+ vector<int> full_beams;
+ vector<int> lfliebertjes;
+ vector<int> rfliebertjes;
for (SCM s = left;
scm_is_pair (s); s = scm_cdr (s))
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;
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.
*/
- std::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);
+ 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 = to_dir (s->get_property ("default-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])))
Grob *common = common_refpoint_of_array (stems, me, Y_AXIS);
Real staff_space = Staff_symbol_referencer::staff_space (me);
- std::vector<Interval> head_extents_array;
+ vector<Interval> head_extents_array;
for (vsize i = 0; i < stems.size (); i++)
{
Grob *stem = stems[i];
if (count < 1)
return ly_interval2scm (pos);
- std::vector<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);
}
else
{
- std::vector<Offset> ideals;
+ vector<Offset> ideals;
for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
/*
Code dup.
*/
- std::vector<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);
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);
}