SCM up_style = head_up->get_property ("style");
SCM down_style = head_down->get_property ("style");
if (merge_possible
- && (up_style == ly_symbol2scm ("fa") || up_style == ly_symbol2scm ("faThin"))
- && (down_style == ly_symbol2scm ("fa") || down_style == ly_symbol2scm ("faThin")))
+ && (scm_is_eq (up_style, ly_symbol2scm ("fa"))
+ || scm_is_eq (up_style, ly_symbol2scm ("faThin")))
+ && (scm_is_eq (down_style, ly_symbol2scm ("fa"))
+ || scm_is_eq (down_style, ly_symbol2scm ("faThin"))))
{
Offset att = Offset (0.0, -1.0);
head_up->set_property ("stem-attachment", ly_offset2scm (att));
if (dot_wipe_head)
{
- if (Grob *d = Grob::unsmob (dot_wipe_head->get_object ("dot")))
+ if (Grob *d = unsmob<Grob> (dot_wipe_head->get_object ("dot")))
d->suicide ();
}
if (shift_amount < -1e-6
&& Rhythmic_head::dot_count (head_up))
{
- Grob *d = Grob::unsmob (head_up->get_object ("dot"));
+ Grob *d = unsmob<Grob> (head_up->get_object ("dot"));
Grob *parent = d->get_parent (X_AXIS);
- if (Dot_column::has_interface (parent))
+ if (has_interface<Dot_column> (parent))
Side_position_interface::add_support (parent, head_down);
}
else if (Rhythmic_head::dot_count (head_down))
{
- Grob *d = Grob::unsmob (head_down->get_object ("dot"));
+ Grob *d = unsmob<Grob> (head_down->get_object ("dot"));
Grob *parent = d->get_parent (X_AXIS);
- if (Dot_column::has_interface (parent))
+ if (has_interface<Dot_column> (parent))
{
- Grob *stem = Grob::unsmob (head_up->get_object ("stem"));
+ Grob *stem = unsmob<Grob> (head_up->get_object ("stem"));
// Loop over all heads on an up-pointing-stem to see if dots
// need to clear any heads suspended on its right side.
extract_grob_set (stem, "note-heads", heads);
if (shift_amount > 1e-6
&& Rhythmic_head::dot_count (head_down))
{
- Grob *dot_down = Grob::unsmob (head_down->get_object ("dot"));
+ Grob *dot_down = unsmob<Grob> (head_down->get_object ("dot"));
Grob *col_down = dot_down->get_parent (X_AXIS);
Direction dir = UP;
if (Rhythmic_head::dot_count (head_up))
{
- Grob *dot_up = Grob::unsmob (head_up->get_object ("dot"));
+ Grob *dot_up = unsmob<Grob> (head_up->get_object ("dot"));
Grob *col_up = dot_up->get_parent (X_AXIS);
if (col_up == col_down) // let the common DotColumn arrange dots
dir = CENTER;
}
if (dir != CENTER)
{
- Grob *stem = Grob::unsmob (head_down->get_object ("stem"));
+ Grob *stem = unsmob<Grob> (head_down->get_object ("stem"));
extract_grob_set (stem, "note-heads", heads);
for (vsize i = 0; i < heads.size (); i++)
- if (Grob *dot = Grob::unsmob (heads[i]->get_object ("dot")))
+ if (Grob *dot = unsmob<Grob> (heads[i]->get_object ("dot")))
dot->set_property ("direction", scm_from_int (dir));
}
}
SCM
Note_collision_interface::calc_positioning_done (SCM smob)
{
- Grob *me = Grob::unsmob (smob);
+ Grob *me = unsmob<Grob> (smob);
me->set_property ("positioning-done", SCM_BOOL_T);
Drul_array<vector<Grob *> > clash_groups = get_clash_groups (me);
}
vector<Grob *> done;
- Real left_most = 1e6;
+ Real left_most = 0.0;
vector<Real> amounts;
for (; scm_is_pair (hand); hand = scm_cdr (hand))
{
- Grob *s = Grob::unsmob (scm_caar (hand));
+ Grob *s = unsmob<Grob> (scm_caar (hand));
Real amount = scm_to_double (scm_cdar (hand)) * wid;
done.push_back (s);
amounts.push_back (amount);
- if (amount < left_most)
- left_most = amount;
}
for (; scm_is_pair (autos); autos = scm_cdr (autos))
{
- Grob *s = Grob::unsmob (scm_caar (autos));
+ Grob *s = unsmob<Grob> (scm_caar (autos));
Real amount = scm_to_double (scm_cdar (autos)) * wid;
vsize x = find (done, s) - done.begin ();
for (vsize i = 0; i < elements.size (); i++)
{
Grob *se = elements[i];
- if (Note_column::has_interface (se))
+ if (has_interface<Note_column> (se))
{
if (!Note_column::dir (se))
se->programming_error ("note-column has no direction");
if (i == 0)
offset = inner_offset;
- else if (shifts[i] == shifts[i - 1])
- {
- // Match the previous notecolumn offset,
- // but warn if the user did not set these equal shifts explictly
- if (!scm_is_number (sh))
- col->warning (_ ("this Voice needs a \\voiceXx or \\shiftXx setting"));
- }
- else if (extents[d][i][UP] > extents[d][i - 1][DOWN]
- && extents[d][i][DOWN] < extents[d][i - 1][UP])
- offset += 1.0; // fully clear the inner-voice heads
else
{
- // check if we cross the inner voice
- if (d * extents[d][i][-d] >= d * extents[d][i - 1][d])
+ bool explicit_shift = scm_is_number (sh);
+ if (!explicit_shift)
+ col->warning (_ ("this Voice needs a \\voiceXx or \\shiftXx setting"));
+
+ if (explicit_shift && shifts[i] == shifts[i - 1])
+ ; // Match the previous notecolumn offset
+ else if (extents[d][i][UP] > extents[d][i - 1][DOWN]
+ && extents[d][i][DOWN] < extents[d][i - 1][UP])
+ offset += 1.0; // fully clear the previous-notecolumn heads
+ else if (d * extents[d][i][-d] >= d * extents[d][i - 1][d])
offset += Stem::is_valid_stem (stems[d][i - 1])
- ? 1.0 : 0.5;
+ ? 1.0 : 0.5; // we cross the previous notecolumn
else if (Stem::is_valid_stem (stems[d][i]))
offset += 0.5;
+
// check if we cross the opposite-stemmed voices
if (d * extents[d][i][-d] < d * extent_union[-d][d])
offset = max (offset, 0.5);
vector<int> out;
extract_grob_set (me, "elements", elts);
for (vsize i = 0; i < elts.size (); i++)
- if (Grob *stem = Grob::unsmob (elts[i]->get_object ("stem")))
+ if (Grob *stem = unsmob<Grob> (elts[i]->get_object ("stem")))
{
vector<int> nhp = Stem::note_head_positions (stem);
out.insert (out.end (), nhp.begin (), nhp.end ());
projects / lilypond.git / blobdiff