alist_chain));
Stencil elt = fm->find_by_name ("scripts.trill_element");
-
+ elt.align_to (Y_AXIS, CENTER);
Real elt_len = elt.extent (X_AXIS).length ();
if (elt_len <= 0.0)
{
}
while (len + elt_len < dz.length ());
- line.rotate (dz.arg (), Offset (0,0));
+ line.rotate (dz.arg (), Offset (LEFT, CENTER));
line.translate (from);
return line;
{
dash_fraction = min (max (dash_fraction, 0.0), 1.0);
Real on = dash_fraction * dash_period + thick;
- Real off = dash_period - on;
+ Real off = max (0.0, dash_period - on);
SCM at = scm_list_n (ly_symbol2scm ("dashed-line"),
scm_from_double (thick),
else if (type == ly_symbol2scm ("trill"))
return make_trill_line (me, from, to);
- Stencil stil;
+ Stencil stencil;
- SCM dash_fraction = me->get_property ("dash-fraction");
- if (scm_is_number (dash_fraction) || type == ly_symbol2scm ("dotted-line"))
+ if (type == ly_symbol2scm ("dashed-line") || type == ly_symbol2scm ("dotted-line"))
{
Real fraction
= type == ly_symbol2scm ("dotted-line")
? 0.0
- : robust_scm2double (dash_fraction, 0.4);
+ : robust_scm2double (me->get_property ("dash-fraction"), 0.4);
fraction = min (max (fraction, 0.0), 1.0);
Real period = Staff_symbol_referencer::staff_space (me)
if (period <= 0)
return Stencil ();
- Real len = (to-from).length();
+ Real len = (to-from).length ();
int n = (int) rint ((len - period * fraction) / period);
- period = ((to-from).length() - period * fraction) / n;
-
- stil = make_dashed_line (thick, from, to, period, fraction);
+ n = max (0, n);
+ if (n > 0)
+ {
+ /*
+ TODO: figure out something intelligent for really short
+ sections.
+ */
+ period = ((to-from).length () - period * fraction) / n;
+ }
+ stencil = make_dashed_line (thick, from, to, period, fraction);
}
else
- stil = make_line (thick, from, to);
+ stencil = make_line (thick, from, to);
- return stil;
+ return stencil;
}
ADD_INTERFACE (Line_interface,
- "Generic line objects. Any object using lines supports this. Normally, "
- "you get a straight line. If @code{dash-period} is defined, a dashed line is "
- "produced; the length of the dashes is tuned with "
- "@code{dash-fraction}. If the latter is set to 0, a dotted line is "
- "produced. If @code{dash-fraction} is negative, the line is made "
- "transparent.",
+ "Generic line objects. Any object using lines supports this."
+ " The property @code{style} can be @code{line},"
+ " @code{dashed-line}, @code{trill}, @code{dotted-line} or"
+ " @code{zigzag}.\n"
+ "\n"
+ "For @code{dashed-line}, the length of the dashes is tuned"
+ " with @code{dash-fraction}. If the latter is set to@tie{}0, a"
+ " dotted line is produced. If @code{dash-period} is negative,"
+ " the line is made transparent.",
/* properties */
"dash-period "