source file of the GNU LilyPond music typesetter
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "tie.hh"
#include "note-head.hh"
#include "output-def.hh"
#include "paper-column.hh"
+#include "pointer-group-interface.hh"
#include "rhythmic-head.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
bool
-Tie::less (Grob *const &s1,
- Grob *const &s2)
+Tie::less (Grob *const &s1, Grob *const &s2)
{
return Tie::get_position (s1) < Tie::get_position (s2);
}
Direction d = LEFT;
do
{
- Grob *stem = head (me, d) ? Rhythmic_head::get_stem (head (me, d)) : 0;
+ 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);
+
+ Grob *stem = one_head ? Rhythmic_head::get_stem (one_head) : 0;
if (stem)
stem = Stem::is_invisible (stem) ? 0 : stem;
else if (int p = get_position (me))
return Direction (sign (p));
- return UP;
+ return to_dir (me->get_property("neutral-direction"));
}
return controls;
}
-
MAKE_SCHEME_CALLBACK (Tie, calc_control_points, 1);
SCM
Tie::calc_control_points (SCM smob)
Grob *yparent = me->get_parent (Y_AXIS);
if ((Tie_column::has_interface (yparent)
|| Semi_tie_column::has_interface (yparent))
- && unsmob_grob_array (yparent->get_object ("ties"))
- // && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1
- )
+ && unsmob_grob_array (yparent->get_object ("ties")))
{
+ extract_grob_set (yparent, "ties", ties);
+ if (me->original() && ties.size() == 1
+ && !to_dir (me->get_property_data ("direction")))
+ {
+ assert (ties[0] == me);
+ set_grob_direction (me, Tie::get_default_dir (me));
+
+ }
/* trigger positioning. */
(void) yparent->get_property ("positioning-done");
}
Stencil a;
- SCM p = me->get_property ("dash-period");
- SCM f = me->get_property ("dash-fraction");
- if (scm_is_number (p) && scm_is_number (f))
- a = Lookup::dashed_slur (b,
- line_thick,
- robust_scm2double (p, 1.0),
- robust_scm2double (f, 0));
- else
- a = Lookup::slur (b,
- get_grob_direction (me) * base_thick,
- line_thick);
+ SCM dash_definition = me->get_property ("dash-definition");
+ a = Lookup::slur (b,
+ get_grob_direction (me) * base_thick,
+ line_thick,
+ dash_definition);
#if DEBUG_TIE_SCORING
SCM annotation = me->get_property ("annotation");
}
ADD_INTERFACE (Tie,
- "A horizontal curve connecting two noteheads. \n\n"
- ,
+ "A horizontal curve connecting two noteheads.",
-
/* properties */
"annotation "
"avoid-slur " // UGH.
"control-points "
- "dash-fraction "
- "dash-period "
+ "dash-definition "
"details "
"direction "
- "separation-item "
"head-direction "
- "line-thickness "
+ "line-thickness "
+ "neutral-direction "
"quant-score "
+ "separation-item "
"staff-position "
"thickness "
-
);