-/*
- tie-column.cc -- implement Tie_column
-
+/*
+ tie-column.cc -- implement Tie_column
+
source file of the GNU LilyPond music typesetter
-
- (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
-#include "spanner.hh"
+ (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
#include "tie-column.hh"
-#include "group-interface.hh"
+#include "paper-column.hh"
+#include "spanner.hh"
+#include "pointer-group-interface.hh"
#include "tie.hh"
#include "directional-element-interface.hh"
#include "rhythmic-head.hh"
-
-
-
-
-
/*
tie dir depends on what Tie_column does.
*/
-
+/*
+ TODO: this doesn't follow standard pattern. Regularize.
+*/
void
-Tie_column::add_tie (Grob*me,Grob *s)
+Tie_column::add_tie (Grob *me, Grob *tie)
{
- if (! Pointer_group_interface ::count (me, "ties"))
+ if (tie->get_parent (Y_AXIS)
+ && Tie_column::has_interface (tie->get_parent (Y_AXIS)))
+ return;
+
+ if (!Pointer_group_interface::count (me, ly_symbol2scm ("ties")))
{
- dynamic_cast<Spanner*> (me)->set_bound (LEFT, Tie::head (s,LEFT));
- dynamic_cast<Spanner*> (me)->set_bound (RIGHT, Tie::head (s,RIGHT));
+ dynamic_cast<Spanner *> (me)->set_bound (LEFT, Tie::head (tie, LEFT));
+ dynamic_cast<Spanner *> (me)->set_bound (RIGHT, Tie::head (tie, RIGHT));
}
-
- Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), s);
- s->add_dependency (me);
+
+ tie->set_parent (me, Y_AXIS);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), tie);
+ tie->add_dependency (me);
}
+void
+Tie_column::set_directions (Grob *me)
+{
+ werner_directions (me);
+}
int
-tie_compare (Grob* const & s1,
- Grob* const & s2)
+tie_compare (Grob *const &s1,
+ Grob *const &s2)
{
return sign (Tie::get_position (s1) - Tie::get_position (s2));
}
/*
- See [Ross p. 138].
+ Werner:
+
+ . The algorithm to choose the direction of the ties doesn't work
+ properly. I suggest the following for applying ties sequentially
+ from top to bottom:
+ + The topmost tie is always `up'.
- In normal chord cases, the outer ties point outwards, and the
- direction of the rest is determined by their staff position.
+ + If there is a vertical gap to the last note above larger than
+ or equal to a fifth (or sixth?), the tie is `up', otherwise it
+ is `down'.
- Ross forgets about the tie that is *on* the middle staff line. We
- assume it goes UP. (TODO: make me settable) */
+ + The bottommost tie is always `down'.
+*/
void
-Tie_column::set_directions (Grob*me)
+Tie_column::werner_directions (Grob *me)
{
- Link_array<Grob> ties =
- Pointer_group_interface__extract_grobs (me, (Grob*)0, "ties");
-
- for (int i = ties.size (); i--;)
- if (get_grob_direction (ties[i]))
- ties.del (i);
-
-
+ extract_grob_set (me, "ties", ro_ties);
+ Link_array<Grob> ties (ro_ties);
if (!ties.size ())
- return ;
-
+ return;
+
+ ties.sort (tie_compare);
Direction d = get_grob_direction (me);
if (d)
{
for (int i = ties.size (); i--;)
{
- Grob * t = ties[i];
- set_grob_direction (t, d);
+ Grob *t = ties[i];
+ if (!get_grob_direction (t))
+ set_grob_direction (t, d);
}
return;
}
-
+
if (ties.size () == 1)
{
- Grob * t = ties[0];
- set_grob_direction (t,Tie::get_default_dir (t));
+ Grob *t = ties[0];
+ if (t->is_live ()
+ && !get_grob_direction (t))
+ set_grob_direction (t, Tie::get_default_dir (t));
return;
}
-
- ties.sort (tie_compare);
- set_grob_direction (ties[0], DOWN);
- ties.del (0);
-
- set_grob_direction (ties.pop (), UP);
- for (int i=ties.size (); i--;)
+
+ Real last_down_pos = 10000;
+ if (!get_grob_direction (ties[0]))
+ set_grob_direction (ties[0], DOWN);
+
+ /*
+ Go downward.
+ */
+ Grob *last_tie = 0;
+ for (int i = ties.size (); i--;)
{
- Grob * t = ties[i];
+ Grob *t = ties[i];
+
+ Direction d = get_grob_direction (t);
Real p = Tie::get_position (t);
- Direction d = (Direction) sign (p);
if (!d)
- d = UP;
- set_grob_direction (t, d);
+ {
+ if (last_tie
+ && Tie::get_column_rank (t, LEFT)
+ < Tie::get_column_rank (last_tie, LEFT))
+ {
+ d = DOWN;
+ }
+ else if (last_down_pos - p > 5)
+ {
+ d = UP;
+ }
+ else
+ {
+ d = DOWN;
+ }
+
+ set_grob_direction (t, d);
+ }
+
+ if (d == DOWN)
+ last_down_pos = p;
+
+ last_tie = t;
}
-
+
+ return;
}
-MAKE_SCHEME_CALLBACK (Tie_column,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Tie_column, after_line_breaking, 1);
SCM
Tie_column::after_line_breaking (SCM smob)
{
- set_directions (unsmob_grob (smob));
+ werner_directions (unsmob_grob (smob));
return SCM_UNSPECIFIED;
}
+/*
+ Extend the spanner over its Tie constituents.
+*/
+MAKE_SCHEME_CALLBACK (Tie_column, before_line_breaking, 1);
+SCM
+Tie_column::before_line_breaking (SCM smob)
+{
+ Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+ for (SCM s = me->get_property ("ties"); scm_is_pair (s); s = scm_cdr (s))
+ {
+ Spanner *tie = dynamic_cast<Spanner *> (unsmob_grob (scm_car (s)));
+ Direction dir = LEFT;
+ do
+ {
+ if (dir * tie->get_bound (dir)->get_column ()->get_rank ()
+ > dir * me->get_bound (dir)->get_column ()->get_rank ())
+ {
+ me->set_bound (dir, Tie::head (tie, dir));
+ }
+ }
+ while (flip (&dir) != LEFT);
+ }
+ return SCM_UNSPECIFIED;
+}
-
-ADD_INTERFACE (Tie_column,"tie-column-interface",
- "that sets tie directions in a tied chord",
- "direction");
+ADD_INTERFACE (Tie_column, "tie-column-interface",
+ "Object that sets directions of multiple ties in a tied chord",
+ "direction");
projects / lilypond.git / blobdiff