X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=3e592516c588bc765cdfe451931bd56da2122e8b;hb=5c7507115ca03b8f2f2b46e34d670ed50074b00d;hp=91660d329b4cdb26e7eb3e2426898f9d19bec4c1;hpb=8568bb8e96d0924c4835141cbfabaa529495ba1b;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 91660d329b..3e592516c5 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -1,124 +1,139 @@ /* - lookup.cc -- implement simple Lookup methods. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2003 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen - TODO - Glissando + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include -#include +#include "lookup.hh" + +#include +#include +using namespace std; + +#include "line-interface.hh" #include "warn.hh" +#include "international.hh" #include "dimensions.hh" #include "bezier.hh" -#include "string-convert.hh" #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" -#include "molecule.hh" -#include "lookup.hh" -#include "font-metric.hh" -#include "interval.hh" -Molecule -Lookup::dot (Offset p, Real radius) +Stencil +Lookup::beam (Real slope, Real width, Real thick, Real blot) { - SCM at = (scm_list_n (ly_symbol2scm ("dot"), - gh_double2scm (p[X_AXIS]), - gh_double2scm (p[Y_AXIS]), - gh_double2scm (radius), - SCM_UNDEFINED)); - Box box; - box.add_point (p - Offset (radius, radius)); - box.add_point (p + Offset (radius, radius)); - return Molecule (box, at); -} + Box b; -Molecule -Lookup::beam (Real slope, Real width, Real thick) -{ - Real height = slope * width; - Real min_y = (0 ? height) + thick/2; - - - - Box b (Interval (0, width), - Interval (min_y, max_y)); - - - SCM at = scm_list_n (ly_symbol2scm ("beam"), - gh_double2scm (width), - gh_double2scm (slope), - gh_double2scm (thick), - SCM_UNDEFINED); - return Molecule (b, at); -} + Offset p; -Molecule -Lookup::dashed_slur (Bezier b, Real thick, Real dash) -{ - SCM l = SCM_EOL; + p = Offset (0, thick / 2); + b.add_point (p); + p += Offset (1, -1) * (blot / 2); - for (int i= 4; i -- ;) - { - l = gh_cons (ly_offset2scm (b.control_[i]), l); - } + 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)); - SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"), - gh_double2scm (thick), - gh_double2scm (dash), - ly_quote_scm (l), - SCM_UNDEFINED)); + p = Offset (width, width * slope - thick / 2); + b.add_point (p); + p += Offset (-1, 1) * (blot / 2); - Box box (Interval (0,0),Interval (0,0)); - return Molecule (box, at); + 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_4 (ly_symbol2scm ("polygon"), + ly_quote_scm (points), + scm_from_double (blot), + SCM_BOOL_T); + + return Stencil (b, expr); } -Molecule -Lookup::line (Real th, Offset f, Offset t) +Stencil +Lookup::rotated_box (Real slope, Real width, Real thick, Real blot) { - SCM at = (scm_list_n (ly_symbol2scm ("draw-line"), - gh_double2scm (th), - gh_double2scm (f[X_AXIS]), - gh_double2scm (f[Y_AXIS]), - gh_double2scm (t[X_AXIS]), - gh_double2scm (t[Y_AXIS]), - SCM_UNDEFINED)); + vector pts; + Offset rot = Offset (1, slope).direction (); + + 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); +} - Box box; - box.add_point (f); - box.add_point (t); +Stencil +Lookup::horizontal_line (Interval w, 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[X_AXIS].widen (th/2); - box[Y_AXIS].widen (th/2); + Box box; + box[X_AXIS] = w; + box[Y_AXIS] = Interval (-th / 2, th / 2); - return Molecule (box, at); + return Stencil (box, at); } +Stencil +Lookup::blank (Box b) +{ + return Stencil (b, scm_string (SCM_EOL)); +} -Molecule -Lookup::blank (Box b) +Stencil +Lookup::circle (Real rad, Real thick, bool filled) { - return Molecule (b, scm_makfrom0str ("")); + Box b (Interval (-rad, rad), Interval (-rad, rad)); + return Stencil (b, scm_list_4 (ly_symbol2scm ("circle"), + scm_from_double (rad), + scm_from_double (thick), + scm_from_bool (filled))); } -Molecule -Lookup::filledbox (Box b) +Stencil +Lookup::filled_box (Box b) { - SCM at = (scm_list_n (ly_symbol2scm ("filledbox"), - gh_double2scm (-b[X_AXIS][LEFT]), - gh_double2scm (b[X_AXIS][RIGHT]), - gh_double2scm (-b[Y_AXIS][DOWN]), - gh_double2scm (b[Y_AXIS][UP]), - SCM_UNDEFINED)); - - return Molecule (b,at); + return round_filled_box (b, 0.0); } /* @@ -142,59 +157,41 @@ Lookup::filledbox (Box b) * | | | | | * | | | * x\_____/______________\_____/|_____v - * |(0,0) | + * |(0, 0) | * | | * | | * |<-------------------------->| - * Box extent(X_AXIS) + * Box extent (X_AXIS) */ -Molecule -Lookup::roundfilledbox (Box b, Real blotdiameter) +Stencil +Lookup::round_filled_box (Box b, Real blotdiameter) { - if (b.x ().length () < blotdiameter) - { - programming_error (_f ("round filled box horizontal extent smaller than blot; decreasing blot")); - blotdiameter = b.x ().length (); - } - if (b.y ().length () < blotdiameter) + Real width = b.x ().delta (); + blotdiameter = min (blotdiameter, width); + Real height = b.y ().delta (); + blotdiameter = min (blotdiameter, height); + + if (blotdiameter < 0.0) { - programming_error (_f ("round filled box vertical extent smaller than blot; decreasing blot")); - blotdiameter = b.y ().length (); + 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 ("roundfilledbox"), - gh_double2scm (-b[X_AXIS][LEFT]), - gh_double2scm (b[X_AXIS][RIGHT]), - gh_double2scm (-b[Y_AXIS][DOWN]), - gh_double2scm (b[Y_AXIS][UP]), - gh_double2scm (blotdiameter), - SCM_UNDEFINED)); - - return Molecule (b,at); -} + SCM at = (scm_list_n (ly_symbol2scm ("round-filled-box"), + 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)); -LY_DEFINE(ly_round_filled_box, "ly:round-filled-box", - 2, 0,0, - (SCM b, SCM blot), - "Make a box with rounded corners. B is a pair of number-pairs, and BLOT a number") -{ - SCM_ASSERT_TYPE(gh_number_p (blot), blot, SCM_ARG2, __FUNCTION__, "number") ; - SCM_ASSERT_TYPE(gh_pair_p (b), b, SCM_ARG4, __FUNCTION__, "pair") ; - - SCM_ASSERT_TYPE(ly_number_pair_p (gh_car (b)), gh_car (b), SCM_ARG1, __FUNCTION__, "number-pair") ; - SCM_ASSERT_TYPE(ly_number_pair_p (gh_cdr (b)), gh_cdr (b), SCM_ARG1, __FUNCTION__, "number-pair") ; - - Interval x (ly_scm2interval (gh_car (b))); - Interval y (ly_scm2interval (gh_cdr (b))); - - return Lookup::roundfilledbox (Box (x,y), - gh_scm2double (blot)).smobbed_copy(); - + return Stencil (b, at); } - /* - * Create Molecule that represents a filled polygon with round edges. + * Create Stencil that represents a filled polygon with round edges. * * LIMITATIONS: * @@ -207,12 +204,12 @@ LY_DEFINE(ly_round_filled_box, "ly:round-filled-box", * touch each other will in general not work as expected for non-null * blotdiameter. * - * (c) Given a polygon ((x0, y0), (x1, y1), ... , (x(n-1), y(n-1))), + * (c) Given a polygon ((x0, y0), (x1, y1), ... , (x (n-1), y (n-1))), * if there is a natural number k such that blotdiameter is greater - * than the maximum of { | (x(k mod n), y(k mod n)) - (x((k+1) mod n), - * y((k+1) mod n)) |, | (x(k mod n), y(k mod n)) - (x((k+2) mod n), - * y((k+2) mod n)) |, | (x((k+1) mod n), y((k+1) mod n)) - (x((k+2) - * mod n), y((k+2) mod n)) | }, then the outline of the rounded + * than the maximum of { | (x (k mod n), y (k mod n)) - (x ((k+1) mod n), + * y ((k+1) mod n)) |, | (x (k mod n), y (k mod n)) - (x ((k+2) mod n), + * y ((k+2) mod n)) |, | (x ((k+1) mod n), y ((k+1) mod n)) - (x ((k+2) + * mod n), y ((k+2) mod n)) | }, then the outline of the rounded * polygon will exceed the outline of the core polygon. In other * words: Do not draw rounded polygons that have a leg smaller or * thinner than blotdiameter (or set blotdiameter to a sufficiently @@ -223,7 +220,7 @@ LY_DEFINE(ly_round_filled_box, "ly:round-filled-box", * to a core filled polygon. For details of these two different * approaches, see the thread upon the ledger lines patch that started * on March 25, 2002 on the devel mailing list. The below version of - * round_filled_polygon() sticks to the moulding model, which the + * round_filled_polygon () sticks to the moulding model, which the * majority of the list participants finally voted for. This, * however, results in the above limitations and a much increased * complexity of the algorithm, since it has to compute a shrinked @@ -232,168 +229,251 @@ LY_DEFINE(ly_round_filled_box, "ly:round-filled-box", * blotdiameter along all edges of the polygon (which is what the * postscript routine in the backend effectively does, but on the * shrinked polygon). --jr + * + * An extra parameter "extroversion" has been added since staying just + * inside of a polygon will reduce its visual size when tracing a + * rounded path. If extroversion is zero, the polygon is just traced + * as-is. If it is -1 (the default) the drawing will stay just within + * the given polygon. If it is 1, the traced line will stay just + * outside of the given polygon. */ -Molecule -Lookup::round_filled_polygon (Array points, Real blotdiameter) +Stencil +Lookup::round_filled_polygon (vector const &points, + Real blotdiameter, + Real extroversion) { /* 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 */ +#ifdef DEBUG const Real epsilon = 0.01; - for (int i = 0; i < points.size ();) + + /* 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 Molecule (); + return Stencil (); if (points.size () == 1) - return dot (points[0], 0.5 * blotdiameter); + { + Stencil circ = circle (0.5 * (1.0 + extroversion) * blotdiameter, 0, true); + circ.translate (points[0]); + return circ; + } if (points.size () == 2) - return line (blotdiameter, points[0], points[1]); + return Line_interface::make_line ((1.0 + extroversion) * blotdiameter, points[0], points[1]); + + vector shrunk_points; - /* shrink polygon in size by 0.5 * blotdiameter */ - Array shrinked_points; - shrinked_points.set_size (points.size ()); - bool ccw = 1; // true, if three adjacent points are counterclockwise ordered - for (int i = 0; i < points.size (); i++) + if (extroversion == 0.0) { - int i0 = i; - int i1 = (i + 1) % points.size (); - int i2 = (i + 2) % points.size (); - Offset p0 = points[i0]; - Offset p1 = points[i1]; - Offset p2 = points[i2]; - Offset p10 = p0 - p1; - 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 - { - p13[X_AXIS] = p10[Y_AXIS]; - p13[Y_AXIS] = -p10[X_AXIS]; - p13 = (0.5 * blotdiameter / p13.length ()) * p13; - } - else - p13 = (0.5 * blotdiameter / d) * p13n; - shrinked_points[i1] = p1 + ((ccw) ? p13 : -p13); + shrunk_points = points; + } + else + { + /* 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 + + shrunk_points.resize (points.size ()); + + for (vsize i = 0; i < points.size (); i++) + { + int i0 = i; + int i1 = (i + 1) % points.size (); + int i2 = (i + 2) % points.size (); + Offset p0 = points[i0]; + Offset p1 = points[i1]; + Offset p2 = points[i2]; + Offset p01 = p1 - p0; + Offset p12 = p2 - p1; + Offset inward0 = Offset(-p01[Y_AXIS], p01[X_AXIS]).direction (); + Offset inward2 = Offset(-p12[Y_AXIS], p12[X_AXIS]).direction (); + + if (!ccw) + { + inward0 = -inward0; + inward2 = -inward2; + } + + 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 + * extroversion; + } } /* 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++) + Box shrunk_box; + for (vsize i = 0; i < shrunk_points.size (); i++) { - SCM x = gh_double2scm (shrinked_points[i][X_AXIS]); - SCM y = gh_double2scm (shrinked_points[i][Y_AXIS]); - shrinked_points_scm = gh_cons (x, gh_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]); + shrunk_box.add_point (shrunk_points[i]); } - SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"), - ly_quote_scm (shrinked_points_scm), - gh_double2scm (blotdiameter), - SCM_UNDEFINED); - - Molecule polygon = Molecule (box, polygon_scm); - shrinked_points.clear (); + shrunk_box.widen (0.5*blotdiameter, 0.5*blotdiameter); + box.unite (shrunk_box); + SCM polygon_scm = scm_list_4 (ly_symbol2scm ("polygon"), + ly_quote_scm (shrunk_points_scm), + scm_from_double (blotdiameter), + SCM_BOOL_T); + + Stencil polygon = Stencil (box, polygon_scm); return polygon; } -Molecule -Lookup::frame (Box b, Real thick) +/* + TODO: deprecate? +*/ +Stencil +Lookup::frame (Box b, Real thick, Real blot) { - Molecule m; - Direction d = LEFT; + Stencil m; for (Axis a = X_AXIS; a < NO_AXES; a = Axis (a + 1)) { - 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; - - m.add_molecule (filledbox (edges)); - } - while (flip (&d) != LEFT); + Axis o = Axis ((a + 1) % NO_AXES); + for (LEFT_and_RIGHT (d)) + { + 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; + + m.add_stencil (round_filled_box (edges, blot)); + } } return m; - } /* - Make a smooth curve along the points - */ -Molecule -Lookup::slur (Bezier curve, Real curvethick, Real linethick) + Make a smooth curve along the points +*/ +Stencil +Lookup::slur (Bezier curve, Real curvethick, Real linethick, + SCM dash_details) { + Stencil return_value; + + /* + calculate the offset for the two beziers that make the sandwich + for the slur + */ 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; - back.reverse (); + Offset perp = curvethick * complex_exp (Offset (0, alpha + M_PI / 2)) * 0.5; 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]); - - /* - 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--;) + if (!scm_is_pair (dash_details)) + { + /* solid slur */ + return_value = bezier_sandwich (back, curve, linethick); + } + else { - list = gh_cons (scontrols[indices[i]], list); + /* dashed or combination slur */ + int num_segments = scm_to_int (scm_length (dash_details)); + for (int i = 0; i < num_segments; i++) + { + SCM dash_pattern = scm_list_ref (dash_details, scm_from_int (i)); + Real t_min = robust_scm2double (scm_car (dash_pattern), 0); + Real t_max = robust_scm2double (scm_cadr (dash_pattern), 1.0); + Real dash_fraction + = robust_scm2double (scm_caddr (dash_pattern), 1.0); + Real dash_period + = robust_scm2double (scm_cadddr (dash_pattern), 0.75); + Bezier back_segment = back.extract (t_min, t_max); + Bezier curve_segment = curve.extract (t_min, t_max); + if (dash_fraction == 1.0) + return_value.add_stencil (bezier_sandwich (back_segment, + curve_segment, + linethick)); + else + { + Bezier back_dash, curve_dash; + Real seg_length = (back_segment.control_[3] + - back_segment.control_[0]).length (); + int pattern_count = (int) (seg_length / dash_period); + Real pattern_length = 1.0 / (pattern_count + dash_fraction); + Real start_t, end_t; + for (int p = 0; p <= pattern_count; p++) + { + start_t = p * pattern_length; + end_t = (p + dash_fraction) * pattern_length; + back_dash + = back_segment.extract (start_t, end_t); + curve_dash + = curve_segment.extract (start_t, end_t); + return_value.add_stencil (bezier_sandwich (back_dash, + curve_dash, + linethick)); + } + } + } } - - - SCM at = (scm_list_n (ly_symbol2scm ("bezier-bow"), - ly_quote_scm (list), - gh_double2scm (linethick), - SCM_UNDEFINED)); - Box b(curve.extent (X_AXIS), - curve.extent (Y_AXIS)); - - b[X_AXIS].unite (back.extent (X_AXIS)); - b[Y_AXIS].unite (back.extent (Y_AXIS)); - - return Molecule (b, at); + return return_value; } /* @@ -419,26 +499,39 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) * | * */ -Molecule -Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) +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 = gh_cons (ly_offset2scm (bottom_curve.control_[3]), list); - list = gh_cons (ly_offset2scm (bottom_curve.control_[0]), list); - list = gh_cons (ly_offset2scm (bottom_curve.control_[1]), list); - list = gh_cons (ly_offset2scm (bottom_curve.control_[2]), list); - list = gh_cons (ly_offset2scm (top_curve.control_[0]), list); - list = gh_cons (ly_offset2scm (top_curve.control_[3]), list); - list = gh_cons (ly_offset2scm (top_curve.control_[2]), list); - list = gh_cons (ly_offset2scm (top_curve.control_[1]), list); - - SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"), - ly_quote_scm (list), - gh_double2scm (0.0), - SCM_UNDEFINED); + 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); x_extent.unite (bottom_curve.extent (X_AXIS)); @@ -446,311 +539,96 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) y_extent.unite (bottom_curve.extent (Y_AXIS)); Box b (x_extent, y_extent); - return Molecule (b, horizontal_bend); -} - -/* - * Horizontal Slope: - * - * /| ^ - * / | | - * / | | height - * / | | - * / | v - * | / - * | / - * (0,0) x /slope=dy/dx - * | / - * |/ - * - * <-----> - * width - */ -Molecule -Lookup::horizontal_slope (Real width, Real slope, Real height) -{ - SCM width_scm = gh_double2scm (width); - SCM slope_scm = gh_double2scm (slope); - SCM height_scm = gh_double2scm (height); - SCM horizontal_slope = scm_list_n (ly_symbol2scm ("beam"), - width_scm, slope_scm, - height_scm, SCM_UNDEFINED); - Box b (Interval (0, width), - Interval (-height/2, height/2 + width*slope)); - return Molecule (b, horizontal_slope); -} - -/* - TODO: junk me. - */ -Molecule -Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) -{ - Molecule m; - String sym = ly_scm2string (ly_car (s)); - String reg = ly_scm2string (ly_car (ly_cdr (s))); - - if (sym == "Discant") - { - Molecule r = fm->find_by_name ("accordion-accDiscant"); - m.add_molecule (r); - if (reg.left_string (1) == "F") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_molecule (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) - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_molecule (d); - } - if (eflag & 0x04) - { - Molecule 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_molecule (d); - } - if (eflag & 0x01) - { - Molecule 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_molecule (d); - } - if (reg.left_string (2) == "SS") - { - Molecule 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_molecule (d); - d.translate_axis (-0.8 * staff_space PT, X_AXIS); - m.add_molecule (d); - reg = reg.right_string (reg.length ()-2); - } - if (reg.left_string (1) == "S") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (0.5 * staff_space PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_string (reg.length ()-1); - } - } - else if (sym == "Freebase") - { - Molecule r = fm->find_by_name ("accordion-accFreebase"); - m.add_molecule (r); - if (reg.left_string (1) == "F") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_string (reg.length ()-1); - } - if (reg == "E") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - m.add_molecule (d); - } - } - else if (sym == "Bayanbase") - { - Molecule r = fm->find_by_name ("accordion-accBayanbase"); - m.add_molecule (r); - if (reg.left_string (1) == "T") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_molecule (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") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_string (reg.length ()-1); - } - if (reg.left_string (2) == "EE") - { - Molecule 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_molecule (d); - d.translate_axis (-0.8 * staff_space PT, X_AXIS); - m.add_molecule (d); - reg = reg.right_string (reg.length ()-2); - } - if (reg.left_string (1) == "E") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_string (reg.length ()-1); - } - } - else if (sym == "Stdbase") - { - Molecule r = fm->find_by_name ("accordion-accStdbase"); - m.add_molecule (r); - if (reg.left_string (1) == "T") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 3.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_string (reg.length ()-1); - } - if (reg.left_string (1) == "F") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_string (reg.length ()-1); - } - if (reg.left_string (1) == "M") - { - Molecule 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_molecule (d); - reg = reg.right_string (reg.length ()-1); - } - if (reg.left_string (1) == "E") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_string (reg.length ()-1); - } - if (reg.left_string (1) == "S") - { - Molecule d = fm->find_by_name ("accordion-accDot"); - d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - m.add_molecule (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") - { - Molecule r = fm->find_by_name ("accordion-accSB"); - m.add_molecule (r); - } - else if (sym == "BB") - { - Molecule r = fm->find_by_name ("accordion-accBB"); - m.add_molecule (r); - } - else if (sym == "OldEE") - { - Molecule r = fm->find_by_name ("accordion-accOldEE"); - m.add_molecule (r); - } - else if (sym == "OldEES") - { - Molecule r = fm->find_by_name ("accordion-accOldEES"); - m.add_molecule (r); - } - return m; + b.widen (0.5 * thickness, 0.5 * thickness); + return Stencil (b, horizontal_bend); } -Molecule +Stencil Lookup::repeat_slash (Real w, Real s, Real t) { - SCM wid = gh_double2scm (w); - SCM sl = gh_double2scm (s); - SCM thick = gh_double2scm (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))), - Interval (0, w * s)); - return Molecule (b, slashnodot); // http://slashnodot.org + Real x_width = hypot (t, 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 + x_width), + Interval (0, height)); + + return Stencil (b, slashnodot); // http://slashnodot.org } -Molecule -Lookup::bracket (Axis a, Interval iv, Real thick, Real protude) +Stencil +Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot) { Box b; - Axis other = Axis((a+1)%2); + Axis other = other_axis (a); b[a] = iv; - b[other] = Interval(-1, 1) * thick * 0.5; - - Molecule m = filledbox (b); + 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_molecule (filledbox (b)); - b[a] = Interval (iv[DOWN], iv[DOWN] +thick); - m.add_molecule (filledbox(b)); + m.add_stencil (round_filled_box (b, blot)); + b[a] = Interval (iv[DOWN], iv[DOWN] + thick); + m.add_stencil (round_filled_box (b, blot)); return m; } -Molecule -Lookup::triangle (Interval iv, Real thick, Real protude) +Stencil +Lookup::triangle (Interval iv, Real thick, Real protrude) { - Box b ; - b[X_AXIS] = iv; - b[Y_AXIS] = Interval (0 ? protude); + Box b; + b[X_AXIS] = Interval (0, iv.length ()); + b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude)); - SCM s = scm_list_n (ly_symbol2scm ("symmetric-x-triangle"), - gh_double2scm (thick), - gh_double2scm (iv.length()), - gh_double2scm (protude), SCM_UNDEFINED); + vector points; + points.push_back (Offset (iv[LEFT], 0)); + points.push_back (Offset (iv[RIGHT], 0)); + points.push_back (Offset (iv.center (), protrude)); + points.push_back (Offset (iv[LEFT], 0)); // close triangle - return Molecule (b, s); -} + return points_to_line_stencil (thick, points); +} -/* - TODO: use rounded boxes. - */ -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}.") +Stencil +Lookup::points_to_line_stencil (Real thick, vector const &points) { - SCM_ASSERT_TYPE(ly_axis_p (a), a, SCM_ARG1, __FUNCTION__, "axis") ; - SCM_ASSERT_TYPE(ly_number_pair_p (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ; - SCM_ASSERT_TYPE(gh_number_p (t), a, SCM_ARG3, __FUNCTION__, "number") ; - SCM_ASSERT_TYPE(gh_number_p (p), a, SCM_ARG4, __FUNCTION__, "number") ; - - - return Lookup::bracket ((Axis)gh_scm2int (a), ly_scm2interval (iv), - gh_scm2double (t), - gh_scm2double (p)).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; } -