source file of the GNU LilyPond music typesetter
- (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "line-spanner.hh"
-#include <math.h>
#include "spanner.hh"
#include "output-def.hh"
Real staff_space = Staff_symbol_referencer::staff_space (me);
Real w = robust_scm2double (me->get_property ("zigzag-width"), 1) * staff_space;
- int count = (int) ceil (dz.length() / w);
+ int count = (int) ceil (dz.length () / w);
w = dz.length () / count;
Real l = robust_scm2double (me->get_property ("zigzag-length"), 1) * w;
Offset rotation_factor = complex_exp (Offset (0, dz.arg ()));
Offset points[3];
- points[0] = Offset (0, -h/2);
- points[1] = Offset (w/2, h/2);
- points[2] = Offset (w, -h/2);
+ points[0] = Offset (0, -h / 2);
+ points[1] = Offset (w / 2, h / 2);
+ points[2] = Offset (w, -h / 2);
for (int i = 0; i < 3; i++)
points[i] = complex_multiply (points[i], rotation_factor);
-
- Stencil squiggle (Line_interface::make_line (thick,points[0], points[1]));
- squiggle.add_stencil (Line_interface::make_line (thick,points[1], points[2]));
+
+ Stencil squiggle (Line_interface::make_line (thick, points[0], points[1]));
+ squiggle.add_stencil (Line_interface::make_line (thick, points[1], points[2]));
Stencil total;
for (int i = 0; i < count; i++)
/*
Can't do suicide, since this mucks up finding the trend.
*/
- me->set_property ("print-function", SCM_EOL);
+ me->set_property ("transparent", SCM_BOOL_T);
}
return SCM_EOL;
}
SCM type = me->get_property ("style");
Stencil line;
-
+
if (scm_is_symbol (type)
&& (type == ly_symbol2scm ("line")
|| type == ly_symbol2scm ("dashed-line")
ly_symbol2scm ("fetaMusic")),
SCM_UNDEFINED);
- Font_metric *fm = select_font (me->get_layout (),
+ Font_metric *fm = select_font (me->layout (),
scm_cons (style_alist,
alist_chain));
Stencil m = fm->find_by_name ("scripts.trill_element");
if (to_boolean (me->get_property ("arrow")))
line.add_stencil (Line_interface::arrows (me, from, to, false, true));
-
+
return line;
}
*/
int k = broken_spanner_index (me);
- Spanner *parent_sp = dynamic_cast<Spanner *> (me->original_);
+ Spanner *parent_sp = dynamic_cast<Spanner *> (me->original ());
Spanner *next_sp = parent_sp->broken_intos_ [k + 1];
Item *next_bound = next_sp->get_bound (RIGHT);
{
Axis ax = (Axis)a;
dxy[ax]
- = + bound[RIGHT]->extent (common[X_AXIS], ax).center ()
- - bound[LEFT]->extent (common[X_AXIS], ax).center ();
+ = + robust_relative_extent (bound[RIGHT], common[X_AXIS], ax).center ()
+ - robust_relative_extent (bound[LEFT], common[X_AXIS], ax).center ();
my_off[ax] = me->relative_coordinate (common[a], ax);
his_off[ax] = bound[LEFT]->relative_coordinate (common[a], ax);