/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
#include "line-interface.hh"
#include "warn.hh"
+#include "international.hh"
#include "dimensions.hh"
#include "bezier.hh"
#include "file-path.hh"
Lookup::rotated_box (Real slope, Real width, Real thick, Real blot)
{
vector<Offset> pts;
- Offset rot (1, slope);
+ Offset rot = Offset (1, slope).direction ();
- 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);
Stencil
Lookup::blank (Box b)
{
- return Stencil (b, scm_from_locale_string (""));
+ return Stencil (b, scm_string (SCM_EOL));
}
Stencil
Stencil
Lookup::round_filled_box (Box b, Real blotdiameter)
{
- if (b.x ().length () < blotdiameter)
- blotdiameter = b.x ().length ();
- if (b.y ().length () < blotdiameter)
- blotdiameter = b.y ().length ();
+ Real width = b.x ().delta ();
+ blotdiameter = min (blotdiameter, width);
+ Real height = b.y ().delta ();
+ blotdiameter = min (blotdiameter, height);
+
+ if (blotdiameter < 0.0)
+ {
+ if (!isinf (blotdiameter))
+ warning (_f ("Not drawing a box with negative dimension, %.2f by %.2f.",
+ width, height));
+ return Stencil (b, SCM_EOL);
+ }
SCM at = (scm_list_n (ly_symbol2scm ("round-filled-box"),
scm_from_double (-b[X_AXIS][LEFT]),
const Real epsilon = 0.01;
-#ifndef NDEBUG
+#ifdef DEBUG
/* remove consecutive duplicate points */
for (vsize i = 0; i < points.size (); i++)
{
return Line_interface::make_line (blotdiameter, points[0], points[1]);
/* shrink polygon in size by 0.5 * blotdiameter */
+
+ // first we need to determine the orientation of the polygon in
+ // order to decide whether shrinking means moving the polygon to the
+ // left or to the right of the outline. We do that by calculating
+ // (double) the oriented area of the polygon. We first determine the
+ // center and do the area calculations relative to it.
+ // Mathematically, the result is not affected by this shift, but
+ // numerically a lot of cancellation is going on and this keeps its
+ // effects in check.
+
+ Offset center;
+ for (vsize i = 0; i < points.size (); i++)
+ center += points[i];
+ center /= points.size ();
+
+ Real area = 0.0;
+ Offset last = points.back () - center;
+
+ for (vsize i = 0; i < points.size (); i++)
+ {
+ Offset here = points[i] - center;
+ area += cross_product (last, here);
+ last = here;
+ }
+
+ bool ccw = area >= 0.0; // true if whole shape is counterclockwise oriented
+
vector<Offset> shrunk_points;
shrunk_points.resize (points.size ());
- bool ccw = 1; // true, if three adjacent points are counterclockwise ordered
+
for (vsize i = 0; i < points.size (); i++)
{
int i0 = i;
Offset p0 = points[i0];
Offset p1 = points[i1];
Offset p2 = points[i2];
- Offset p10 = p0 - p1;
+ Offset p01 = p1 - p0;
Offset p12 = p2 - p1;
- if (p10.length () != 0.0)
- {
- // recompute ccw
- Real phi = p10.arg ();
- // rotate (p2 - p0) by (-phi)
- Offset q = complex_multiply (p2 - p0, complex_exp (Offset (1.0, -phi)));
-
- if (q[Y_AXIS] > 0)
- ccw = 1;
- else if (q[Y_AXIS] < 0)
- ccw = 0;
- else {} // keep ccw unchanged
- }
- else {} // keep ccw unchanged
- Offset p10n = (1.0 / p10.length ()) * p10; // normalize length to 1.0
- Offset p12n = (1.0 / p12.length ()) * p12;
- Offset p13n = 0.5 * (p10n + p12n);
- Offset p14n = 0.5 * (p10n - p12n);
- Offset p13;
- Real d = p13n.length () * p14n.length (); // distance p3n to line (p1..p0)
- if (d < epsilon)
- // special case: p0, p1, p2 are on a single line => build
- // vector orthogonal to (p2-p0) of length 0.5 blotdiameter
+ Offset inward0 = Offset(-p01[Y_AXIS], p01[X_AXIS]).direction ();
+ Offset inward2 = Offset(-p12[Y_AXIS], p12[X_AXIS]).direction ();
+
+ if (!ccw)
{
- p13[X_AXIS] = p10[Y_AXIS];
- p13[Y_AXIS] = -p10[X_AXIS];
- p13 = (0.5 * blotdiameter / p13.length ()) * p13;
+ inward0 = -inward0;
+ inward2 = -inward2;
}
- else
- p13 = (0.5 * blotdiameter / d) * p13n;
- shrunk_points[i1] = p1 + ((ccw) ? p13 : -p13);
+
+ Offset middle = 0.5*(inward0 + inward2);
+
+ // "middle" now is a vector in the right direction for the
+ // shrinkage. Its size needs to be large enough that the
+ // projection on either of the inward vectors has a size of 1.
+
+ Real proj = dot_product (middle, inward0);
+
+ // What's the size of proj? Assuming that we have a corner
+ // angle of phi where 0 corresponds to a continuing line, the
+ // length of middle is 0.5 |(1+cos phi, sin phi)| = cos (phi/2),
+ // so its projection has length
+ // cos^2 (phi/2) = 0.5 + 0.5 cos (phi).
+ // We don't really want to move inwards more than 3 blob
+ // diameters corresponding to 6 blob radii. So
+ // cos (phi/2) = 1/6 gives phi ~ 161, meaning that a 20 degree
+ // corner necessitates moving 3 blob diameters from the corner
+ // in order to stay inside the lines. Ruler and circle agree.
+ // 0.03 is close enough to 1/36. Basically we want to keep the
+ // shape from inverting from pulling too far inward.
+ // 3 diameters is pretty much a handwaving guess.
+
+ if (abs (proj) < 0.03)
+ proj = proj < 0 ? -0.03 : 0.03;
+
+ shrunk_points[i1] = p1 + (0.5 * blotdiameter / proj) * middle;
}
/* build scm expression and bounding box */
Lookup::frame (Box b, Real thick, Real blot)
{
Stencil m;
- Direction d = LEFT;
for (Axis a = X_AXIS; a < NO_AXES; a = Axis (a + 1))
{
Axis o = Axis ((a + 1) % NO_AXES);
- do
+ for (LEFT_and_RIGHT (d))
{
Box edges;
edges[a] = b[a][d] + 0.5 * thick * Interval (-1, 1);
m.add_stencil (round_filled_box (edges, blot));
}
- while (flip (&d) != LEFT);
}
return m;
}
Stencil
Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve, Real thickness)
{
- /*
- 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);
- list = scm_cons (ly_offset2scm (bottom_curve.control_[1]), list);
- list = scm_cons (ly_offset2scm (bottom_curve.control_[2]), list);
- list = scm_cons (ly_offset2scm (top_curve.control_[0]), list);
- list = scm_cons (ly_offset2scm (top_curve.control_[3]), list);
- list = scm_cons (ly_offset2scm (top_curve.control_[2]), list);
- list = scm_cons (ly_offset2scm (top_curve.control_[1]), list);
-
- SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"),
- ly_quote_scm (list),
+ SCM commands = scm_list_n (ly_symbol2scm ("moveto"),
+ scm_from_double (top_curve.control_[0][X_AXIS]),
+ scm_from_double (top_curve.control_[0][Y_AXIS]),
+ ly_symbol2scm ("curveto"),
+ scm_from_double (top_curve.control_[1][X_AXIS]),
+ scm_from_double (top_curve.control_[1][Y_AXIS]),
+ scm_from_double (top_curve.control_[2][X_AXIS]),
+ scm_from_double (top_curve.control_[2][Y_AXIS]),
+ scm_from_double (top_curve.control_[3][X_AXIS]),
+ scm_from_double (top_curve.control_[3][Y_AXIS]),
+ ly_symbol2scm ("lineto"),
+ scm_from_double (bottom_curve.control_[3][X_AXIS]),
+ scm_from_double (bottom_curve.control_[3][Y_AXIS]),
+ ly_symbol2scm ("curveto"),
+ scm_from_double (bottom_curve.control_[2][X_AXIS]),
+ scm_from_double (bottom_curve.control_[2][Y_AXIS]),
+ scm_from_double (bottom_curve.control_[1][X_AXIS]),
+ scm_from_double (bottom_curve.control_[1][Y_AXIS]),
+ scm_from_double (bottom_curve.control_[0][X_AXIS]),
+ scm_from_double (bottom_curve.control_[0][Y_AXIS]),
+ ly_symbol2scm ("closepath"),
+ SCM_UNDEFINED);
+
+ SCM horizontal_bend = scm_list_n (ly_symbol2scm ("path"),
scm_from_double (thickness),
+ ly_quote_scm (commands),
+ ly_quote_scm (ly_symbol2scm ("round")),
+ ly_quote_scm (ly_symbol2scm ("round")),
+ SCM_BOOL_T,
SCM_UNDEFINED);
Interval x_extent = top_curve.extent (X_AXIS);
Stencil
Lookup::repeat_slash (Real w, Real s, Real t)
{
-#if 0 /* TODO */
- vector<Offset> points;
- Real blotdiameter = 0.0;
-
- Offset p1 (0, 0);
- Offset p2 (w, w * s);
-
- 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);
+ Real x_width = sqrt ((t * t) + ((t / s) * (t / s)));
+ Real height = w * s;
+
+ SCM controls = scm_list_n (ly_symbol2scm ("moveto"),
+ scm_from_double (0),
+ scm_from_double (0),
+ ly_symbol2scm ("rlineto"),
+ scm_from_double (x_width),
+ scm_from_double (0),
+ ly_symbol2scm ("rlineto"),
+ scm_from_double (w),
+ scm_from_double (height),
+ ly_symbol2scm ("rlineto"),
+ scm_from_double (-x_width),
+ scm_from_double (0),
+ ly_symbol2scm ("closepath"),
+ SCM_UNDEFINED);
+
+ SCM slashnodot = scm_list_n (ly_symbol2scm ("path"),
+ scm_from_double (0),
+ ly_quote_scm (controls),
+ ly_quote_scm (ly_symbol2scm ("round")),
+ ly_quote_scm (ly_symbol2scm ("round")),
+ SCM_BOOL_T,
+ SCM_UNDEFINED);
Box b (Interval (0, w + sqrt (sqr (t / s) + sqr (t))),
Interval (0, w * s));
projects / lilypond.git / blobdiff