source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "staff-symbol-referencer.hh"
#include "stem.hh"
#include "warn.hh"
+#include "grob-array.hh"
#if DEBUG_BEAM_SCORING
#include "text-interface.hh" // debug output.
return m;
}
+MAKE_SCHEME_CALLBACK (Beam, calc_normal_stems, 1);
+SCM
+Beam::calc_normal_stems (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+
+ extract_grob_set (me, "stems", stems);
+ SCM val = Grob_array::make_array ();
+ Grob_array *ga = unsmob_grob_array (val);
+ for (vsize i = 0; i < stems.size (); i++)
+ if (Stem::is_normal_stem (stems[i]))
+ ga->add (stems[i]);
+
+ return val;
+}
MAKE_SCHEME_CALLBACK (Beam, calc_direction, 1);
SCM
Direction dir = CENTER;
- int count = visible_stem_count (me);
+ int count = normal_stem_count (me);
if (count < 2)
{
extract_grob_set (me, "stems", stems);
}
else
{
- Grob *stem = first_visible_stem (me);
+ Grob *stem = first_normal_stem (me);
/*
ugh: stems[0] case happens for chord tremolo.
return best_start;
}
-MAKE_SCHEME_CALLBACK(Beam, calc_beaming, 1)
+MAKE_SCHEME_CALLBACK (Beam, calc_beaming, 1)
SCM
Beam::calc_beaming (SCM smob)
{
}
else
{
+ /*
+ FIXME: what's this for?
+ */
SCM s = scm_cdr (this_beaming);
for (; scm_is_pair (s); s = scm_cdr (s))
{
{
/* ugh, this has a side-effect that we need to ensure that
Stem #'beaming is correct */
- (void) me_grob->get_property ("quantized-positions");
+ (void) me_grob->get_property ("beaming");
Spanner *me = dynamic_cast<Spanner*> (me_grob);
do
{
bool on_bound = (event_dir == LEFT) ? j == 0 :
- j == segs.size() - 1;
+ j == segs.size () - 1;
bool inside_stem = (event_dir == LEFT)
? segs[j].stem_index_ > 0
- : segs[j].stem_index_ < stems.size () - 1;
+ : segs[j].stem_index_ + 1 < stems.size () ;
bool event = on_bound
|| abs (segs[j].rank_ - segs[j+event_dir].rank_) > 1
&& me->get_bound (event_dir)->break_status_dir ())
{
current.horizontal_[event_dir]
- = (me->get_bound (event_dir)->extent (commonx, X_AXIS)[RIGHT]
+ = (robust_relative_extent (me->get_bound (event_dir), commonx, X_AXIS)[RIGHT]
+ event_dir * break_overshoot[event_dir]);
}
else
{
current.horizontal_[event_dir] += event_dir * segs[j].width_/2;
if (segs[j].gapped_)
- current.horizontal_[event_dir] -= event_dir * gap_length;
+ {
+ current.horizontal_[event_dir] -= event_dir * gap_length;
+
+ if (Stem::is_invisible (segs[j].stem_))
+ {
+ /*
+ Need to do this in case of whole notes. We don't want the
+ heads to collide with the beams.
+ */
+ extract_grob_set (segs[j].stem_, "note-heads", heads);
+
+ for (vsize k = 0; k < heads.size (); k ++)
+ current.horizontal_[event_dir]
+ = event_dir * min (event_dir * current.horizontal_[event_dir],
+ - gap_length/2
+ + event_dir * heads[k]->extent (commonx, X_AXIS)[-event_dir]);
+ }
+ }
}
if (event_dir == RIGHT)
{
segments.push_back (current);
- current = Beam_segment();
+ current = Beam_segment ();
}
}
while (flip (&event_dir) != LEFT);
return segments;
}
-MAKE_SCHEME_CALLBACK(Beam, print, 1);
+MAKE_SCHEME_CALLBACK (Beam, print, 1);
SCM
Beam::print (SCM grob)
{
vector<Beam_segment> segments = get_beam_segments (me, &commonx);
Interval span;
- if (visible_stem_count (me))
+ if (normal_stem_count (me))
{
- span[LEFT] = first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
- span[RIGHT] = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
+ span[LEFT] = first_normal_stem (me)->relative_coordinate (commonx, X_AXIS);
+ span[RIGHT] = last_normal_stem (me)->relative_coordinate (commonx, X_AXIS);
}
else
{
(me->layout ()->self_scm (), properties, quant_score));
if (!score.is_empty ())
- the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0, 0);
+ the_beam.add_at_edge (Y_AXIS, stem_dir, score, 1.0);
}
#endif
gaps.set_full ();
- extract_grob_set (me, "stems", stems);
+ extract_grob_set (me, "normal-stems", stems);
Grob *common = common_refpoint_of_array (stems, me, Y_AXIS);
Real staff_space = Staff_symbol_referencer::staff_space (me);
for (vsize i = 0; i < stems.size (); i++)
{
Grob *stem = stems[i];
- if (Stem::is_invisible (stem))
- continue;
Interval head_extents = Stem::head_positions (stem);
if (!head_extents.is_empty ())
sets stem directions, a constant shift does not have an
influence.
*/
- head_extents += stem->relative_coordinate (common, Y_AXIS);
+ head_extents += stem->pure_relative_y_coordinate (common, 0, INT_MAX);
if (to_dir (stem->get_property_data ("direction")))
{
for (vsize i = 0; i < stems.size (); i++)
{
Grob *stem = stems[i];
- if (Stem::is_invisible (stem))
- continue;
-
Interval head_extents = head_extents_array[j++];
Direction d = (head_extents.center () < max_gap.center ())
-MAKE_SCHEME_CALLBACK(Beam, calc_stem_shorten, 1)
+MAKE_SCHEME_CALLBACK (Beam, calc_stem_shorten, 1)
SCM
Beam::calc_stem_shorten (SCM smob)
{
return scm_from_int (0);
Real forced_fraction = 1.0 * forced_stem_count (me)
- / visible_stem_count (me);
+ / normal_stem_count (me);
int beam_count = get_beam_count (me);
Grob *me = unsmob_grob (smob);
- int count = visible_stem_count (me);
+ int count = normal_stem_count (me);
Interval pos (0,0);
if (count < 1)
return ly_interval2scm (pos);
vector<Real> x_posns;
- extract_grob_set (me, "stems", stems);
+ extract_grob_set (me, "normal-stems", stems);
Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS);
Real my_y = me->relative_coordinate (commony, Y_AXIS);
- Grob *fvs = first_visible_stem (me);
- Grob *lvs = last_visible_stem (me);
+ Grob *fvs = first_normal_stem (me);
+ Grob *lvs = last_normal_stem (me);
Interval ideal (Stem::get_stem_info (fvs).ideal_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);
+ Real x0 = first_normal_stem (me)->relative_coordinate (commonx, X_AXIS);
for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
Real x = s->relative_coordinate (commonx, X_AXIS) - x0;
x_posns.push_back (x);
}
- Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS) - x0;
+ Real dx = last_normal_stem (me)->relative_coordinate (commonx, X_AXIS) - x0;
Real y = 0;
Real slope = 0;
Real ldy = 0.0;
if (!ideal.delta ())
{
- Interval chord (Stem::chord_start_y (first_visible_stem (me)),
- Stem::chord_start_y (last_visible_stem (me)));
+ Interval chord (Stem::chord_start_y (stems[0]),
+ Stem::chord_start_y (stems.back ()));
/* Simple beams (2 stems) on middle line should be allowed to be
slightly sloped.
for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
- if (!Stem::is_normal_stem (s))
- continue;
-
ideals.push_back (Offset (x_posns[i],
Stem::get_stem_info (s).ideal_y_
+ s->relative_coordinate (commony, Y_AXIS)
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);
+ Grob *fvs = first_normal_stem (me);
if (!fvs)
return posns;
x_posns.push_back (x);
}
- Grob *lvs = last_visible_stem (me);
+ Grob *lvs = last_normal_stem (me);
if (!lvs)
return posns;
Real dx = lvs->relative_coordinate (commonx, X_AXIS) - x0;
Drul_array<Real> pos = ly_scm2interval (posns);
-
scale_drul (&pos, Staff_symbol_referencer::staff_space (me));
Grob *me = unsmob_grob (smob);
Drul_array<Real> pos = ly_scm2interval (posns);
- if (visible_stem_count (me) <= 1)
+ if (normal_stem_count (me) <= 1)
return posns;
Real dy = pos[RIGHT] - pos[LEFT];
- Grob *fvs = first_visible_stem (me);
- Grob *lvs = last_visible_stem (me);
+ Grob *fvs = first_normal_stem (me);
+ Grob *lvs = last_normal_stem (me);
Grob *commonx = fvs->common_refpoint (lvs, X_AXIS);
- Real dx = last_visible_stem (me)->relative_coordinate (commonx, X_AXIS)
- - first_visible_stem (me)->relative_coordinate (commonx, X_AXIS);
+ Real dx = last_normal_stem (me)->relative_coordinate (commonx, X_AXIS)
+ - first_normal_stem (me)->relative_coordinate (commonx, X_AXIS);
Real slope = dy && dx ? dy / dx : 0;
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. */
-MAKE_SCHEME_CALLBACK(Beam, set_stem_lengths, 1);
+MAKE_SCHEME_CALLBACK (Beam, set_stem_lengths, 1);
SCM
Beam::set_stem_lengths (SCM smob)
{
thick = get_thickness (me);
}
- Grob *fvs = first_visible_stem (me);
- Grob *lvs = last_visible_stem (me);
+ Grob *fvs = first_normal_stem (me);
+ Grob *lvs = last_normal_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;
{
int count = beaming->beamlet_count (i, d);
if (i > 0
- && i < stems.size () -1
+ && i + 1 < stems.size ()
&& Stem::is_invisible (stem))
count = min (count, beaming->beamlet_count (i,-d));
int
Beam::forced_stem_count (Grob *me)
{
- extract_grob_set (me, "stems", stems);
+ extract_grob_set (me, "normal-stems", stems);
int f = 0;
for (vsize i = 0; i < stems.size (); i++)
{
Grob *s = stems[i];
- if (Stem::is_invisible (s))
- continue;
-
/* 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"));
}
int
-Beam::visible_stem_count (Grob *me)
+Beam::normal_stem_count (Grob *me)
{
- extract_grob_set (me, "stems", stems);
- int c = 0;
- for (vsize i = stems.size (); i--;)
- {
- if (!Stem::is_invisible (stems[i]))
- c++;
- }
- return c;
+ extract_grob_set (me, "normal-stems", stems);
+ return stems.size ();
}
Grob *
-Beam::first_visible_stem (Grob *me)
+Beam::first_normal_stem (Grob *me)
{
- extract_grob_set (me, "stems", stems);
-
- for (vsize i = 0; i < stems.size (); i++)
- {
- if (Stem::is_normal_stem (stems[i]))
- return stems[i];
- }
- return 0;
+ extract_grob_set (me, "normal-stems", stems);
+ return stems.size () ? stems[0] : 0;
}
Grob *
-Beam::last_visible_stem (Grob *me)
+Beam::last_normal_stem (Grob *me)
{
- extract_grob_set (me, "stems", stems);
-
- for (vsize i = stems.size (); i--;)
- {
- if (Stem::is_normal_stem (stems[i]))
- return stems[i];
- }
- return 0;
+ extract_grob_set (me, "normal-stems", stems);
+ return stems.size () ? stems.back () : 0;
}
/*
rest -> stem -> beam -> interpolate_y_position ()
*/
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, rest_collision_callback, 2, 1, "");
SCM
Beam::rest_collision_callback (SCM smob, SCM prev_offset)
{
Grob *beam = unsmob_grob (stem->get_object ("beam"));
if (!beam
|| !Beam::has_interface (beam)
- || !Beam::visible_stem_count (beam))
+ || !Beam::normal_stem_count (beam))
return scm_from_double (0.0);
Drul_array<Real> pos (robust_scm2drul (beam->get_property ("positions"),
Real dy = pos[RIGHT] - pos[LEFT];
- Drul_array<Grob*> visible_stems (first_visible_stem (beam),
- last_visible_stem (beam));
+ Drul_array<Grob*> visible_stems (first_normal_stem (beam),
+ last_normal_stem (beam));
extract_grob_set (beam, "stems", stems);
Grob *common = common_refpoint_of_array (stems, beam, X_AXIS);
return knee;
}
+bool
+Beam::is_cross_staff (Grob *me)
+{
+ extract_grob_set (me, "stems", stems);
+ Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (me);
+ for (vsize i = 0; i < stems.size (); i++)
+ if (Staff_symbol_referencer::get_staff_symbol (stems[i]) != staff_symbol)
+ return true;
+ return false;
+}
+
+MAKE_SCHEME_CALLBACK (Beam, calc_cross_staff, 1)
+SCM
+Beam::calc_cross_staff (SCM smob)
+{
+ return scm_from_bool (is_cross_staff (unsmob_grob (smob)));
+}
+
int
Beam::get_direction_beam_count (Grob *me, Direction d)
{
"length-fraction "
"least-squares-dy "
"neutral-direction "
+ "normal-stems "
"positions "
"quant-score "
"quantized-positions "
projects / lilypond.git / blobdiff