#include "lookup.hh"
#include "output-def.hh"
#include "grob.hh"
+#include "font-interface.hh"
Stencil
Line_interface::make_arrow (Offset begin, Offset end,
}
Stencil
-Line_interface::zigzag_stencil (Grob *me,
- Offset from,
- Offset to)
+Line_interface::make_trill_line (Grob *me,
+ Offset from,
+ Offset to)
+{
+ Offset dz = (to-from);
+ SCM alist_chain = Font_interface::text_font_alist_chain (me);
+ SCM style_alist = scm_list_n (scm_cons (ly_symbol2scm ("font-encoding"),
+ ly_symbol2scm ("fetaMusic")),
+ SCM_UNDEFINED);
+
+ Font_metric *fm = select_font (me->layout (),
+ scm_cons (style_alist,
+ 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)
+ {
+ programming_error ("can't find scripts.trill_element");
+ return Stencil ();
+ }
+
+ Stencil line;
+ Real len = 0.0;
+ do
+ {
+ line.add_at_edge (X_AXIS, RIGHT, elt, 0);
+ len = line.extent (X_AXIS).length ();
+ }
+ while (len + elt_len < dz.length ());
+
+ line.rotate (dz.arg (), Offset (LEFT, CENTER));
+ line.translate (from);
+
+ return line;
+}
+
+
+Stencil
+Line_interface::make_zigzag_line (Grob *me,
+ Offset from,
+ Offset to)
{
Offset dz = to -from;
{
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),
SCM type = me->get_property ("style");
if (type == ly_symbol2scm ("zigzag"))
{
- return zigzag_stencil (me, from, to);
+ return make_zigzag_line (me, from, to);
}
+ else if (type == ly_symbol2scm ("trill"))
+ return make_trill_line (me, from, to);
+
Stencil stil;
- 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)
* robust_scm2double (me->get_property ("dash-period"), 1.0);
- if (period < 0)
+ if (period <= 0)
return Stencil ();
+ Real len = (to-from).length ();
+
+ int n = (int) rint ((len - period * fraction) / period);
+ n = max (0, n);
+ if (n > 0)
+ {
+ /*
+ TODO: figure out something intelligent for really short
+ sections.
+ */
+ period = ((to-from).length () - period * fraction) / n;
+ }
stil = make_dashed_line (thick, from, to, period, fraction);
}
else
}
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 "
+ "Generic line objects. Any object using lines supports this. "
+ "The property @code{style} can be @code{line}, "
+ "@code{dashed-line}, @code{trill}, \n"
+ "@code{dotted-line} or @code{zigzag}.\n"
+ "\n"
+ "For dashed-line, 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 "
+ "produced. If @code{dash-period} is negative, the line is made "
"transparent.",
/* properties */