source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include <math.h>
-#include <ctype.h>
+
+#include "lookup.hh"
+
+#include <cmath>
+#include <cctype>
+using namespace std;
#include "line-interface.hh"
#include "warn.hh"
#include "dimensions.hh"
#include "bezier.hh"
-#include "string-convert.hh"
#include "file-path.hh"
#include "main.hh"
#include "lily-guile.hh"
-#include "stencil.hh"
-#include "lookup.hh"
-#include "font-metric.hh"
-#include "interval.hh"
Stencil
Lookup::dot (Offset p, Real radius)
{
SCM at = (scm_list_n (ly_symbol2scm ("dot"),
- scm_make_real (p[X_AXIS]),
- scm_make_real (p[Y_AXIS]),
- scm_make_real (radius),
+ scm_from_double (p[X_AXIS]),
+ scm_from_double (p[Y_AXIS]),
+ scm_from_double (radius),
SCM_UNDEFINED));
Box box;
box.add_point (p - Offset (radius, radius));
return Stencil (box, at);
}
+Stencil
+Lookup::beam (Real slope, Real width, Real thick, Real blot)
+{
+ Box b;
+ Offset p;
-/*
- * Horizontal Slope:
- *
- * /| ^
- * / | |
- * / | | height
- * / | |
- * / | v
- * | /
- * | /
- * (0,0) x /slope=dy/dx
- * | /
- * |/
- *
- * <----->
- * width
- */
-Stencil
-Lookup::beam (Real slope, Real width, Real thick, Real blot)
-{
- Real height = slope * width;
- Real min_y = (0 <? height) - thick/2;
- Real max_y = (0 >? height) + thick/2;
-
- Box b (Interval (0, width),
- Interval (min_y, max_y));
-
- SCM at = scm_list_n (ly_symbol2scm ("beam"),
- scm_make_real (width),
- scm_make_real (slope),
- scm_make_real (thick),
- scm_make_real (blot),
- SCM_UNDEFINED);
- return Stencil (b, at);
+ p = Offset (0, thick / 2);
+ b.add_point (p);
+ p += Offset (1, -1) * (blot / 2);
+
+ SCM points = SCM_EOL;
+
+ points = scm_cons (scm_from_double (p[X_AXIS]),
+ scm_cons (scm_from_double (p[Y_AXIS]),
+ points));
+
+ p = Offset (0, -thick / 2);
+ b.add_point (p);
+ p += Offset (1, 1) * (blot / 2);
+
+ points = scm_cons (scm_from_double (p[X_AXIS]),
+ scm_cons (scm_from_double (p[Y_AXIS]),
+ points));
+
+ p = Offset (width, width * slope - thick / 2);
+ b.add_point (p);
+ p += Offset (-1, 1) * (blot / 2);
+
+ points = scm_cons (scm_from_double (p[X_AXIS]),
+ scm_cons (scm_from_double (p[Y_AXIS]),
+ points));
+
+ p = Offset (width, width * slope + thick / 2);
+ b.add_point (p);
+ p += Offset (-1, -1) * (blot / 2);
+
+ points = scm_cons (scm_from_double (p[X_AXIS]),
+ scm_cons (scm_from_double (p[Y_AXIS]),
+ points));
+
+ SCM expr = scm_list_n (ly_symbol2scm ("polygon"),
+ ly_quote_scm (points),
+ scm_from_double (blot),
+ SCM_BOOL_T,
+ SCM_UNDEFINED);
+
+ return Stencil (b, expr);
}
Stencil
-Lookup::dashed_slur (Bezier b, Real thick, Real dash)
+Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction)
{
SCM l = SCM_EOL;
- for (int i= 4; i -- ;)
- {
- l = scm_cons (ly_offset2scm (b.control_[i]), l);
- }
+ Real on = dash_fraction * dash_period;
+ Real off = dash_period - on;
+
+ for (int i = 4; i--;)
+ l = scm_cons (ly_offset2scm (b.control_[i]), l);
SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"),
- scm_make_real (thick),
- scm_make_real (dash),
- ly_quote_scm (l),
- SCM_UNDEFINED));
+ scm_from_double (thick),
+ scm_from_double (on),
+ scm_from_double (off),
+ ly_quote_scm (l),
+ SCM_UNDEFINED));
- Box box (Interval (0,0),Interval (0,0));
- return Stencil (box, at);
+ Box box (b.extent (X_AXIS), b.extent (Y_AXIS));
+ return Stencil (box, at);
}
-
+Stencil
+Lookup::rotated_box (Real slope, Real width, Real thick, Real blot)
+{
+ vector<Offset> pts;
+ Offset rot (1, slope);
+
+ thick -= 2*blot;
+ width -= 2*blot;
+ rot /= sqrt (1 + slope*slope);
+ pts.push_back (Offset (0, -thick / 2) * rot);
+ pts.push_back (Offset (width, -thick / 2) * rot);
+ pts.push_back (Offset (width, thick / 2) * rot);
+ pts.push_back (Offset (0, thick / 2) * rot);
+ return Lookup::round_filled_polygon (pts, blot);
+}
Stencil
Lookup::horizontal_line (Interval w, Real th)
{
- SCM at = scm_list_n (ly_symbol2scm ("horizontal-line"),
- scm_make_real (w[LEFT]),
- scm_make_real (w[RIGHT]),
- scm_make_real (th),
+ SCM at = scm_list_n (ly_symbol2scm ("draw-line"),
+ scm_from_double (th),
+ scm_from_double (w[LEFT]),
+ scm_from_double (0),
+ scm_from_double (w[RIGHT]),
+ scm_from_double (0),
SCM_UNDEFINED);
-
- Box box ;
+ Box box;
box[X_AXIS] = w;
- box[Y_AXIS] = Interval (-th/2,th/2);
+ box[Y_AXIS] = Interval (-th / 2, th / 2);
return Stencil (box, at);
}
-
Stencil
-Lookup::blank (Box b)
+Lookup::blank (Box b)
{
- return Stencil (b, scm_makfrom0str (""));
+ return Stencil (b, scm_from_locale_string (""));
}
Stencil
-Lookup::filled_box (Box b)
+Lookup::filled_box (Box b)
{
- SCM at = (scm_list_n (ly_symbol2scm ("filledbox"),
- scm_make_real (-b[X_AXIS][LEFT]),
- scm_make_real (b[X_AXIS][RIGHT]),
- scm_make_real (-b[Y_AXIS][DOWN]),
- scm_make_real (b[Y_AXIS][UP]),
- SCM_UNDEFINED));
-
- return Stencil (b,at);
+ return round_filled_box (b, 0.0);
}
/*
* | | | | |
* | | |
* x\_____/______________\_____/|_____v
- * |(0,0) |
+ * |(0, 0) |
* | |
* | |
* |<-------------------------->|
Lookup::round_filled_box (Box b, Real blotdiameter)
{
if (b.x ().length () < blotdiameter)
- {
- blotdiameter = b.x ().length ();
- }
+ blotdiameter = b.x ().length ();
if (b.y ().length () < blotdiameter)
- {
- blotdiameter = b.y ().length ();
- }
+ blotdiameter = b.y ().length ();
SCM at = (scm_list_n (ly_symbol2scm ("round-filled-box"),
- scm_make_real (-b[X_AXIS][LEFT]),
- scm_make_real (b[X_AXIS][RIGHT]),
- scm_make_real (-b[Y_AXIS][DOWN]),
- scm_make_real (b[Y_AXIS][UP]),
- scm_make_real (blotdiameter),
+ scm_from_double (-b[X_AXIS][LEFT]),
+ scm_from_double (b[X_AXIS][RIGHT]),
+ scm_from_double (-b[Y_AXIS][DOWN]),
+ scm_from_double (b[Y_AXIS][UP]),
+ scm_from_double (blotdiameter),
SCM_UNDEFINED));
- return Stencil (b,at);
+ return Stencil (b, at);
}
-
-
/*
* Create Stencil that represents a filled polygon with round edges.
*
* shrinked polygon). --jr
*/
Stencil
-Lookup::round_filled_polygon (Array<Offset> points, Real blotdiameter)
+Lookup::round_filled_polygon (vector<Offset> const &points,
+ Real blotdiameter)
{
/* TODO: Maybe print a warning if one of the above limitations
applies to the given polygon. However, this is quite complicated
to check. */
- /* remove consecutive duplicate points */
const Real epsilon = 0.01;
- for (int i = 0; i < points.size ();)
+
+#ifndef NDEBUG
+ /* remove consecutive duplicate points */
+ for (vsize i = 0; i < points.size (); i++)
{
- int next_i = (i + 1) % points.size ();
- Real d = (points[i] - points[next_i]).length ();
+ int next = (i + 1) % points.size ();
+ Real d = (points[i] - points[next]).length ();
if (d < epsilon)
- points.del (next_i);
- else
- i++;
+ programming_error ("Polygon should not have duplicate points");
}
+#endif
/* special cases: degenerated polygons */
if (points.size () == 0)
return Line_interface::make_line (blotdiameter, points[0], points[1]);
/* shrink polygon in size by 0.5 * blotdiameter */
- Array<Offset> shrinked_points;
- shrinked_points.set_size (points.size ());
+ vector<Offset> shrunk_points;
+ shrunk_points.resize (points.size ());
bool ccw = 1; // true, if three adjacent points are counterclockwise ordered
- for (int i = 0; i < points.size (); i++)
+ for (vsize i = 0; i < points.size (); i++)
{
int i0 = i;
int i1 = (i + 1) % points.size ();
}
else
p13 = (0.5 * blotdiameter / d) * p13n;
- shrinked_points[i1] = p1 + ((ccw) ? p13 : -p13);
+ shrunk_points[i1] = p1 + ((ccw) ? p13 : -p13);
}
/* build scm expression and bounding box */
- SCM shrinked_points_scm = SCM_EOL;
+ SCM shrunk_points_scm = SCM_EOL;
Box box;
- for (int i = 0; i < shrinked_points.size (); i++)
+ for (vsize i = 0; i < shrunk_points.size (); i++)
{
- SCM x = scm_make_real (shrinked_points[i][X_AXIS]);
- SCM y = scm_make_real (shrinked_points[i][Y_AXIS]);
- shrinked_points_scm = scm_cons (x, scm_cons (y, shrinked_points_scm));
+ SCM x = scm_from_double (shrunk_points[i][X_AXIS]);
+ SCM y = scm_from_double (shrunk_points[i][Y_AXIS]);
+ shrunk_points_scm = scm_cons (x, scm_cons (y, shrunk_points_scm));
box.add_point (points[i]);
}
SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"),
- ly_quote_scm (shrinked_points_scm),
- scm_make_real (blotdiameter),
+ ly_quote_scm (shrunk_points_scm),
+ scm_from_double (blotdiameter),
+ SCM_BOOL_T,
SCM_UNDEFINED);
Stencil polygon = Stencil (box, polygon_scm);
- shrinked_points.clear ();
+ shrunk_points.clear ();
return polygon;
}
-
/*
TODO: deprecate?
- */
+*/
Stencil
Lookup::frame (Box b, Real thick, Real blot)
{
Direction d = LEFT;
for (Axis a = X_AXIS; a < NO_AXES; a = Axis (a + 1))
{
- Axis o = Axis ((a+1)%NO_AXES);
+ Axis o = Axis ((a + 1)%NO_AXES);
do
{
Box edges;
edges[a] = b[a][d] + 0.5 * thick * Interval (-1, 1);
- edges[o][DOWN] = b[o][DOWN] - thick/2;
- edges[o][UP] = b[o][UP] + thick/2;
-
+ edges[o][DOWN] = b[o][DOWN] - thick / 2;
+ edges[o][UP] = b[o][UP] + thick / 2;
+
m.add_stencil (round_filled_box (edges, blot));
}
while (flip (&d) != LEFT);
}
/*
- Make a smooth curve along the points
- */
+ Make a smooth curve along the points
+*/
Stencil
-Lookup::slur (Bezier curve, Real curvethick, Real linethick)
+Lookup::slur (Bezier curve, Real curvethick, Real linethick)
{
Real alpha = (curve.control_[3] - curve.control_[0]).arg ();
Bezier back = curve;
- Offset perp = curvethick * complex_exp (Offset (0, alpha + M_PI/2)) * 0.5;
+ Offset perp = curvethick * complex_exp (Offset (0, alpha + M_PI / 2)) * 0.5;
back.reverse ();
back.control_[1] += perp;
back.control_[2] += perp;
curve.control_[1] -= perp;
curve.control_[2] -= perp;
-
+
SCM scontrols[8];
- for (int i=4; i--;)
- scontrols[ i ] = ly_offset2scm (back.control_[i]);
- for (int i=4 ; i--;)
- scontrols[i+4] = ly_offset2scm (curve.control_[i]);
+ for (int i = 0; i < 4; i++)
+ scontrols[i] = ly_offset2scm (back.control_[i]);
+ for (int i = 0; i < 4; i++)
+ scontrols[i + 4] = ly_offset2scm (curve.control_[i]);
/*
- Need the weird order b.o. the way PS want its arguments
- */
- int indices[]= {5, 6, 7, 4, 1, 2, 3, 0};
+ Need the weird order b.o. the way PS want its arguments
+ */
+ int indices[] = {5, 6, 7, 4, 1, 2, 3, 0};
SCM list = SCM_EOL;
- for (int i= 8; i--;)
- {
- list = scm_cons (scontrols[indices[i]], list);
- }
-
-
+ for (int i = 8; i--;)
+ list = scm_cons (scontrols[indices[i]], list);
+
SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"),
- ly_quote_scm (list),
- scm_make_real (linethick),
- SCM_UNDEFINED));
+ ly_quote_scm (list),
+ scm_from_double (linethick),
+ SCM_UNDEFINED));
Box b (curve.extent (X_AXIS),
- curve.extent (Y_AXIS));
+ curve.extent (Y_AXIS));
b[X_AXIS].unite (back.extent (X_AXIS));
b[Y_AXIS].unite (back.extent (Y_AXIS));
+ b.widen (0.5 * linethick, 0.5 * linethick);
return Stencil (b, at);
}
Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve)
{
/*
- Need the weird order b.o. the way PS want its arguments
- */
+ Need the weird order b.o. the way PS want its arguments
+ */
SCM list = SCM_EOL;
list = scm_cons (ly_offset2scm (bottom_curve.control_[3]), list);
list = scm_cons (ly_offset2scm (bottom_curve.control_[0]), list);
SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"),
ly_quote_scm (list),
- scm_make_real (0.0),
+ scm_from_double (0.0),
SCM_UNDEFINED);
Interval x_extent = top_curve.extent (X_AXIS);
return Stencil (b, horizontal_bend);
}
-/*
- TODO: junk me.
- */
Stencil
-Lookup::accordion (SCM s, Real staff_space, Font_metric *fm)
+Lookup::repeat_slash (Real w, Real s, Real t)
{
- Stencil m;
- String sym = ly_scm2string (scm_car (s));
- String reg = ly_scm2string (scm_car (scm_cdr (s)));
+#if 0 /* TODO */
+ vector<Offset> points;
+ Real blotdiameter = 0.0;
- if (sym == "Discant")
- {
- Stencil r = fm->find_by_name ("accordion-accDiscant");
- m.add_stencil (r);
- if (reg.left_string (1) == "F")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- int eflag = 0x00;
- if (reg.left_string (3) == "EEE")
- {
- eflag = 0x07;
- reg = reg.right_string (reg.length ()-3);
- }
- else if (reg.left_string (2) == "EE")
- {
- eflag = 0x05;
- reg = reg.right_string (reg.length ()-2);
- }
- else if (reg.left_string (2) == "Eh")
- {
- eflag = 0x04;
- reg = reg.right_string (reg.length ()-2);
- }
- else if (reg.left_string (1) == "E")
- {
- eflag = 0x02;
- reg = reg.right_string (reg.length ()-1);
- }
- if (eflag & 0x02)
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- m.add_stencil (d);
- }
- if (eflag & 0x04)
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- d.translate_axis (0.8 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- }
- if (eflag & 0x01)
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- d.translate_axis (-0.8 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- }
- if (reg.left_string (2) == "SS")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (0.5 * staff_space PT, Y_AXIS);
- d.translate_axis (0.4 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- d.translate_axis (-0.8 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-2);
- }
- if (reg.left_string (1) == "S")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (0.5 * staff_space PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- }
- else if (sym == "Freebase")
- {
- Stencil r = fm->find_by_name ("accordion-accFreebase");
- m.add_stencil (r);
- if (reg.left_string (1) == "F")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- if (reg == "E")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
- m.add_stencil (d);
- }
- }
- else if (sym == "Bayanbase")
- {
- Stencil r = fm->find_by_name ("accordion-accBayanbase");
- m.add_stencil (r);
- if (reg.left_string (1) == "T")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- /* include 4' reed just for completeness. You don't want to use this. */
- if (reg.left_string (1) == "F")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- if (reg.left_string (2) == "EE")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
- d.translate_axis (0.4 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- d.translate_axis (-0.8 * staff_space PT, X_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-2);
- }
- if (reg.left_string (1) == "E")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- }
- else if (sym == "Stdbase")
- {
- Stencil r = fm->find_by_name ("accordion-accStdbase");
- m.add_stencil (r);
- if (reg.left_string (1) == "T")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 3.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- if (reg.left_string (1) == "F")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 2.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- if (reg.left_string (1) == "M")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 2 PT, Y_AXIS);
- d.translate_axis (staff_space PT, X_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- if (reg.left_string (1) == "E")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 1.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- if (reg.left_string (1) == "S")
- {
- Stencil d = fm->find_by_name ("accordion-accDot");
- d.translate_axis (staff_space * 0.5 PT, Y_AXIS);
- m.add_stencil (d);
- reg = reg.right_string (reg.length ()-1);
- }
- }
- /* ugh maybe try to use regular font for S.B. and B.B and only use one font
- for the rectangle */
- else if (sym == "SB")
- {
- Stencil r = fm->find_by_name ("accordion-accSB");
- m.add_stencil (r);
- }
- else if (sym == "BB")
- {
- Stencil r = fm->find_by_name ("accordion-accBB");
- m.add_stencil (r);
- }
- else if (sym == "OldEE")
- {
- Stencil r = fm->find_by_name ("accordion-accOldEE");
- m.add_stencil (r);
- }
- else if (sym == "OldEES")
- {
- Stencil r = fm->find_by_name ("accordion-accOldEES");
- m.add_stencil (r);
- }
- return m;
-}
+ Offset p1 (0, 0);
+ Offset p2 (w, w * s);
-Stencil
-Lookup::repeat_slash (Real w, Real s, Real t)
-{
- SCM wid = scm_make_real (w);
- SCM sl = scm_make_real (s);
- SCM thick = scm_make_real (t);
+ return Lookup::round_filled_polygon (points, blotdiameter);
+#endif
+
+ SCM wid = scm_from_double (w);
+ SCM sl = scm_from_double (s);
+ SCM thick = scm_from_double (t);
SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"),
wid, sl, thick, SCM_UNDEFINED);
- Box b (Interval (0, w + sqrt (sqr (t/s) + sqr (t))),
+ Box b (Interval (0, w + sqrt (sqr (t / s) + sqr (t))),
Interval (0, w * s));
return Stencil (b, slashnodot); // http://slashnodot.org
}
-
Stencil
-Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot)
+Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot)
{
Box b;
- Axis other = Axis ((a+1)%2);
+ Axis other = Axis ((a + 1)%2);
b[a] = iv;
b[other] = Interval (-1, 1) * thick * 0.5;
-
+
Stencil m = round_filled_box (b, blot);
b[a] = Interval (iv[UP] - thick, iv[UP]);
- Interval oi = Interval (-thick/2, thick/2 + fabs (protude));
- oi *= sign (protude);
+ Interval oi = Interval (-thick / 2, thick / 2 + fabs (protrude));
+ oi *= sign (protrude);
b[other] = oi;
m.add_stencil (round_filled_box (b, blot));
b[a] = Interval (iv[DOWN], iv[DOWN] + thick);
- m.add_stencil (round_filled_box (b,blot));
+ m.add_stencil (round_filled_box (b, blot));
return m;
}
Stencil
-Lookup::triangle (Interval iv, Real thick, Real protude)
+Lookup::triangle (Interval iv, Real thick, Real protrude)
{
- Box b ;
- b[X_AXIS] = Interval (0, iv.length());
- b[Y_AXIS] = Interval (0 <? protude , 0 >? protude);
+ Box b;
+ b[X_AXIS] = Interval (0, iv.length ());
+ b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude));
+ vector<Offset> points;
+ points.push_back (Offset (iv[LEFT], 0));
+ points.push_back (Offset (iv[RIGHT], 0));
+ points.push_back (Offset (iv.center (), protrude));
- Offset z1(iv[LEFT], 0);
- Offset z2(iv[RIGHT], 0);
- Offset z3((z1 + z2)[X_AXIS]/2, protude);
+ return points_to_line_stencil (thick, points);
- /*
- TODO: move Triangle to Line_interface ?
- */
- Stencil tri = Line_interface::make_line (thick, z1, z2);
- tri.add_stencil (Line_interface::make_line (thick, z2, z3));
- tri.add_stencil (Line_interface::make_line (thick, z3, z1));
-
- return tri;
}
-LY_DEFINE (ly_bracket ,"ly:bracket",
- 4, 0, 0,
- (SCM a, SCM iv, SCM t, SCM p),
- "Make a bracket in direction @var{a}. The extent of the bracket is "
- "given by @var{iv}. The wings protude by an amount of @var{p}, which "
- "may be negative. The thickness is given by @var{t}.")
-{
- SCM_ASSERT_TYPE (is_axis (a), a, SCM_ARG1, __FUNCTION__, "axis") ;
- SCM_ASSERT_TYPE (is_number_pair (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ;
- SCM_ASSERT_TYPE (scm_is_number (t), a, SCM_ARG3, __FUNCTION__, "number") ;
- SCM_ASSERT_TYPE (scm_is_number (p), a, SCM_ARG4, __FUNCTION__, "number") ;
-
-
- return Lookup::bracket ((Axis)scm_to_int (a), ly_scm2interval (iv),
- scm_to_double (t),
- scm_to_double (p),
- 0.95 * scm_to_double (t)).smobbed_copy ();
-}
-
-
-LY_DEFINE (ly_filled_box ,"ly:round-filled-box",
- 3, 0, 0,
- (SCM xext, SCM yext, SCM blot),
- "Make a @code{Stencil} "
- "that prints a black box of dimensions @var{xext}, "
- "@var{yext} and roundness @var{blot}."
- )
+Stencil
+Lookup::points_to_line_stencil (Real thick, vector<Offset> const &points)
{
- SCM_ASSERT_TYPE (is_number_pair (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ;
- SCM_ASSERT_TYPE (is_number_pair (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ;
- SCM_ASSERT_TYPE (scm_is_number (blot), blot, SCM_ARG3, __FUNCTION__, "number") ;
-
- return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)),
- scm_to_double (blot)).smobbed_copy ();
+ Stencil ret;
+ for (vsize i = 1; i < points.size (); i++)
+ {
+ if (points[i-1].is_sane () && points[i].is_sane ())
+ {
+ Stencil line
+ = Line_interface::make_line (thick, points[i-1], points[i]);
+ ret.add_stencil (line);
+ }
+ }
+ return ret;
}
-
projects / lilypond.git / blobdiff