X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=4f9d0bbbdefaa78d1766c4fea4345dbe8d80964b;hb=2e154f8809028363759520bb19633c830cabdbdf;hp=f37d98c0e3d9e83a8bccb49d227e7b22ae295afc;hpb=1ce92ec5c984dfc05c3431a9f4185b453b457656;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index f37d98c0e3..4f9d0bbbde 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen @@ -27,6 +27,7 @@ using namespace std; #include "line-interface.hh" #include "warn.hh" +#include "international.hh" #include "dimensions.hh" #include "bezier.hh" #include "file-path.hh" @@ -87,11 +88,8 @@ Stencil Lookup::rotated_box (Real slope, Real width, Real thick, Real blot) { vector 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); @@ -120,7 +118,7 @@ Lookup::horizontal_line (Interval w, Real th) Stencil Lookup::blank (Box b) { - return Stencil (b, scm_from_locale_string ("")); + return Stencil (b, scm_string (SCM_EOL)); } Stencil @@ -169,13 +167,18 @@ Lookup::filled_box (Box b) 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 (isinf (b.x ().delta ()) || isinf (b.y ().delta ())) - return Stencil (b, SCM_EOL); + 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]), @@ -238,7 +241,7 @@ Lookup::round_filled_polygon (vector const &points, const Real epsilon = 0.01; -#ifndef NDEBUG +#ifdef DEBUG /* remove consecutive duplicate points */ for (vsize i = 0; i < points.size (); i++) { @@ -262,9 +265,36 @@ Lookup::round_filled_polygon (vector const &points, 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 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; @@ -273,39 +303,43 @@ Lookup::round_filled_polygon (vector const &points, 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 */ @@ -460,6 +494,9 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve, Real thickness) 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]),