/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "paper-column.hh"
#include "pointer-group-interface.hh"
#include "rhythmic-head.hh"
+#include "semi-tie.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
#include "stem.hh"
#include "semi-tie-column.hh"
bool
-Tie::less (Grob *const &s1, Grob *const &s2)
+Tie::less (Grob *g1, Grob *g2)
{
- return Tie::get_position (s1) < Tie::get_position (s2);
+ Spanner *s1 = dynamic_cast<Spanner *> (g1);
+ if (!s1)
+ {
+ g1->programming_error ("grob is not a tie");
+ return false;
+ }
+
+ Spanner *s2 = dynamic_cast<Spanner *> (g2);
+ if (!s2)
+ {
+ g2->programming_error ("grob is not a tie");
+ return true;
+ }
+
+ return get_position (s1) < get_position (s2);
}
void
-Tie::set_head (Grob *me, Direction d, Grob *h)
+Tie::set_head (Spanner *me, Direction d, Grob *h)
{
- dynamic_cast<Spanner *> (me)->set_bound (d, h);
+ me->set_bound (d, h);
}
-Grob *
-Tie::head (Grob *me, Direction d)
+Item *
+Tie::head (Spanner *me, Direction d)
{
- if (is_direction (me->get_property ("head-direction")))
- {
- Direction hd = to_dir (me->get_property ("head-direction"));
-
- return (hd == d)
- ? Grob::unsmob (me->get_object ("note-head"))
- : 0;
- }
-
- Item *it = dynamic_cast<Spanner *> (me)->get_bound (d);
- if (Note_head::has_interface (it))
- return it;
- else
- return 0;
+ Item *it = me->get_bound (d);
+ return has_interface<Note_head> (it) ? it : 0;
}
int
-Tie::get_column_rank (Grob *me, Direction d)
+Tie::get_column_rank (Spanner *me, Direction d)
{
- Grob *col = 0;
- Spanner *span = dynamic_cast<Spanner *> (me);
- if (!span)
- col = dynamic_cast<Item *> (me)->get_column ();
- else
- {
- Grob *h = head (me, d);
- if (!h)
- h = span->get_bound (d);
-
- col = dynamic_cast<Item *> (h)->get_column ();
- }
- return Paper_column::get_rank (col);
+ return Paper_column::get_rank (me->get_bound (d)->get_column ());
}
int
-Tie::get_position (Grob *me)
+Tie::get_position (Spanner *me)
{
for (LEFT_and_RIGHT (d))
{
(what about linebreaks? )
*/
Direction
-Tie::get_default_dir (Grob *me)
+Tie::get_default_dir (Spanner *me)
{
Drul_array<Grob *> stems;
for (LEFT_and_RIGHT (d))
{
Grob *one_head = head (me, d);
- if (!one_head && dynamic_cast<Spanner *> (me))
- one_head = Tie::head (dynamic_cast<Spanner *> (me)->broken_neighbor (d), d);
+ if (!one_head)
+ one_head = head (me->broken_neighbor (d), d);
Grob *stem = one_head ? Rhythmic_head::get_stem (one_head) : 0;
- if (stem)
- stem = Stem::is_invisible (stem) ? 0 : stem;
-
- stems[d] = stem;
+ stems[d] = (stem && !Stem::is_invisible (stem)) ? stem : 0;
}
if (stems[LEFT] && stems[RIGHT])
if (get_grob_direction (stems[LEFT]) == UP
&& get_grob_direction (stems[RIGHT]) == UP)
return DOWN;
+
+ // And why not return UP if both stems are DOWN?
+
+ // And when stems conflict, why fall directly through to using
+ // neutral-direction without considering get_position (me)?
}
- else if (stems[LEFT] || stems[RIGHT])
- {
- Grob *s = stems[LEFT] ? stems[LEFT] : stems[RIGHT];
- return -get_grob_direction (s);
- }
+ else if (stems[LEFT])
+ return -get_grob_direction (stems[LEFT]);
+ else if (stems[RIGHT])
+ return -get_grob_direction (stems[RIGHT]);
else if (int p = get_position (me))
return Direction (sign (p));
SCM
Tie::calc_direction (SCM smob)
{
- Grob *me = Grob::unsmob (smob);
+ // In this method, Tie and Semi_tie require the same logic with different
+ // types. It might be clearer to use a template.
+ Grob *me = unsmob<Grob> (smob);
Grob *yparent = me->get_parent (Y_AXIS);
- if ((Tie_column::has_interface (yparent)
- || Semi_tie_column::has_interface (yparent))
- && Grob_array::is_smob (yparent->get_object ("ties"))
- // && Grob_array::unsmob (yparent->get_object ("ties"))->size () > 1
+ if ((has_interface<Tie_column> (yparent)
+ || has_interface<Semi_tie_column> (yparent))
+ && unsmob<Grob_array> (yparent->get_object ("ties"))
+ // && unsmob<Grob_array> (yparent->get_object ("ties"))->size () > 1
)
{
/* trigger positioning. */
return me->get_property_data ("direction");
}
- else
- return scm_from_int (Tie::get_default_dir (me));
+
+ programming_error ("no Tie_column or Semi_tie_column. Killing grob.");
+ me->suicide ();
+ return scm_from_int (CENTER);
}
SCM
-Tie::get_default_control_points (Grob *me_grob)
+Tie::get_default_control_points (Spanner *me)
{
- Spanner *me = dynamic_cast<Spanner *> (me_grob);
Grob *common = me;
common = me->get_bound (LEFT)->common_refpoint (common, X_AXIS);
common = me->get_bound (RIGHT)->common_refpoint (common, X_AXIS);
SCM
Tie::calc_control_points (SCM smob)
{
- Grob *me = Grob::unsmob (smob);
+ Spanner *me = LY_ASSERT_SMOB(Spanner, smob, 1);
Grob *yparent = me->get_parent (Y_AXIS);
- if ((Tie_column::has_interface (yparent)
- || Semi_tie_column::has_interface (yparent))
- && Grob_array::is_smob (yparent->get_object ("ties")))
+ if ((has_interface<Tie_column> (yparent)
+ || has_interface<Semi_tie_column> (yparent))
+ && unsmob<Grob_array> (yparent->get_object ("ties")))
{
extract_grob_set (yparent, "ties", ties);
if (me->original () && ties.size () == 1
SCM
Tie::print (SCM smob)
{
- Grob *me = Grob::unsmob (smob);
+ Grob *me = unsmob<Grob> (smob);
SCM cp = me->get_property ("control-points");
string str;
SCM properties = Font_interface::text_font_alist_chain (me);
- Stencil tm = *Stencil::unsmob (Text_interface::interpret_markup
+ Stencil tm = *unsmob<Stencil> (Text_interface::interpret_markup
(me->layout ()->self_scm (), properties,
annotation));
tm.translate (Offset (b.control_[3][X_AXIS] + 0.5,
projects / lilypond.git / blobdiff