X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=344d42c906d3344404a1753110c3a08642d5846c;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=b557986c0742a7f7ed5981d6ab1dd2bd0bf527cc;hpb=32f5956ef64bfa7b0fd6a9f6c34a53760adae04e;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index b557986c07..344d42c906 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -1,11 +1,22 @@ /* - 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--2009 Han-Wen Nienhuys + Copyright (C) 1997--2014 Han-Wen Nienhuys Jan Nieuwenhuizen + + 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 "lookup.hh" @@ -16,26 +27,13 @@ using namespace std; #include "line-interface.hh" #include "warn.hh" +#include "international.hh" #include "dimensions.hh" #include "bezier.hh" #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" -Stencil -Lookup::dot (Offset p, Real radius) -{ - SCM at = (scm_list_n (ly_symbol2scm ("dot"), - 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)); - box.add_point (p + Offset (radius, radius)); - return Stencil (box, at); -} - Stencil Lookup::beam (Real slope, Real width, Real thick, Real blot) { @@ -50,38 +48,38 @@ Lookup::beam (Real slope, Real width, Real thick, Real blot) SCM points = SCM_EOL; points = scm_cons (scm_from_double (p[X_AXIS]), - scm_cons (scm_from_double (p[Y_AXIS]), - points)); + 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_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_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_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); + ly_quote_scm (points), + scm_from_double (blot), + SCM_BOOL_T, + SCM_UNDEFINED); return Stencil (b, expr); } @@ -92,9 +90,9 @@ Lookup::rotated_box (Real slope, Real width, Real thick, Real blot) vector pts; Offset rot (1, slope); - thick -= 2*blot; - width -= 2*blot; - rot /= sqrt (1 + slope*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); @@ -106,12 +104,12 @@ 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); + 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[X_AXIS] = w; @@ -126,6 +124,16 @@ Lookup::blank (Box b) return Stencil (b, scm_from_locale_string ("")); } +Stencil +Lookup::circle (Real rad, Real thick, bool filled) +{ + 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))); +} + Stencil Lookup::filled_box (Box b) { @@ -162,18 +170,26 @@ 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 (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]), - 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)); + 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); } @@ -220,7 +236,7 @@ Lookup::round_filled_box (Box b, Real blotdiameter) */ Stencil Lookup::round_filled_polygon (vector const &points, - Real blotdiameter) + Real blotdiameter) { /* TODO: Maybe print a warning if one of the above limitations applies to the given polygon. However, this is quite complicated @@ -235,7 +251,7 @@ Lookup::round_filled_polygon (vector const &points, int next = (i + 1) % points.size (); Real d = (points[i] - points[next]).length (); if (d < epsilon) - programming_error ("Polygon should not have duplicate points"); + programming_error ("Polygon should not have duplicate points"); } #endif @@ -243,7 +259,11 @@ Lookup::round_filled_polygon (vector const &points, if (points.size () == 0) return Stencil (); if (points.size () == 1) - return dot (points[0], 0.5 * blotdiameter); + { + Stencil circ = circle (0.5 * blotdiameter, 0, true); + circ.translate (points[0]); + return circ; + } if (points.size () == 2) return Line_interface::make_line (blotdiameter, points[0], points[1]); @@ -262,17 +282,18 @@ Lookup::round_filled_polygon (vector const &points, 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 - } + { + // 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; @@ -281,15 +302,15 @@ Lookup::round_filled_polygon (vector const &points, 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; - } + // 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; + p13 = (0.5 * blotdiameter / d) * p13n; shrunk_points[i1] = p1 + ((ccw) ? p13 : -p13); } @@ -304,10 +325,10 @@ Lookup::round_filled_polygon (vector const &points, box.add_point (points[i]); } SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"), - ly_quote_scm (shrunk_points_scm), - scm_from_double (blotdiameter), - SCM_BOOL_T, - SCM_UNDEFINED); + ly_quote_scm (shrunk_points_scm), + scm_from_double (blotdiameter), + SCM_BOOL_T, + SCM_UNDEFINED); Stencil polygon = Stencil (box, polygon_scm); shrunk_points.clear (); @@ -321,20 +342,18 @@ Stencil 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 - { - 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)); - } - 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; } @@ -348,8 +367,9 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick, { Stencil return_value; - /* calculate the offset for the two beziers that make the sandwich - * for the slur + /* + 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; @@ -359,58 +379,57 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick, curve.control_[1] -= perp; curve.control_[2] -= perp; - - if ((dash_details == SCM_UNDEFINED) || (dash_details == SCM_EOL)) - { /* solid slur */ + + if (!scm_is_pair (dash_details)) + { + /* solid slur */ return_value = bezier_sandwich (back, curve, linethick); } else - { /* dashed or combination slur */ + { + /* dashed or combination slur */ int num_segments = scm_to_int (scm_length (dash_details)); - for (int i=0; i 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)); + Interval (0, w * s)); return Stencil (b, slashnodot); // http://slashnodot.org } @@ -494,7 +534,7 @@ Stencil 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; @@ -522,25 +562,24 @@ Lookup::triangle (Interval iv, Real thick, Real protrude) 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 points_to_line_stencil (thick, points); } - - Stencil Lookup::points_to_line_stencil (Real thick, vector const &points) { 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); - } + 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; }