X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=d7b6b8d26e9bc81c5eada2ab7911128c1de26a2d;hb=f072a75dd79d39a772a46c9e7961f46cd955d874;hp=42fbb1cf29ea54956231f1910e0bc36105d202a9;hpb=3c41f585e2d515d6ea71dc86d7e2d084694d359d;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 42fbb1cf29..d7b6b8d26e 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -1,137 +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--2004 Han-Wen Nienhuys + Copyright (C) 1997--2015 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 -#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 "stencil.hh" -#include "lookup.hh" -#include "font-metric.hh" -#include "interval.hh" Stencil -Lookup::dot (Offset p, Real radius) +Lookup::beam (Real slope, Real width, Real thick, Real blot) { - 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_UNDEFINED)); - Box box; - box.add_point (p - Offset (radius, radius)); - box.add_point (p + Offset (radius, radius)); - return Stencil (box, at); -} + Box b; + Offset p; + p = Offset (0, thick / 2); + b.add_point (p); + p += Offset (1, -1) * (blot / 2); -/* - * 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; - - 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); -} + SCM points = SCM_EOL; -Stencil -Lookup::dashed_slur (Bezier b, Real thick, Real dash) -{ - SCM l = SCM_EOL; + points = scm_cons (scm_from_double (p[X_AXIS]), + scm_cons (scm_from_double (p[Y_AXIS]), + points)); - for (int i= 4; i -- ;) - { - l = scm_cons (ly_offset2scm (b.control_[i]), l); - } + p = Offset (0, -thick / 2); + b.add_point (p); + p += Offset (1, 1) * (blot / 2); - SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"), - scm_make_real (thick), - scm_make_real (dash), - ly_quote_scm (l), - SCM_UNDEFINED)); + points = scm_cons (scm_from_double (p[X_AXIS]), + scm_cons (scm_from_double (p[Y_AXIS]), + points)); - Box box (Interval (0,0),Interval (0,0)); - return Stencil (box, at); -} + 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_4 (ly_symbol2scm ("polygon"), + ly_quote_scm (points), + scm_from_double (blot), + SCM_BOOL_T); + return Stencil (b, expr); +} Stencil -Lookup::horizontal_line (Interval w, Real th) +Lookup::rotated_box (Real slope, Real width, Real thick, Real blot) { - SCM at = scm_list_n (ly_symbol2scm ("horizontal-line"), - scm_make_real (w[LEFT]), - scm_make_real (w[RIGHT]), - scm_make_real (th), - 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); +} +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 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) +{ + return Stencil (b, scm_string (SCM_EOL)); +} Stencil -Lookup::blank (Box b) +Lookup::circle (Real rad, Real thick, bool filled) { - return Stencil (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))); } 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); } /* @@ -155,7 +157,7 @@ Lookup::filled_box (Box b) * | | | | | * | | | * x\_____/______________\_____/|_____v - * |(0,0) | + * |(0, 0) | * | | * | | * |<-------------------------->| @@ -164,27 +166,29 @@ 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) + Real width = b.x ().delta (); + blotdiameter = min (blotdiameter, width); + Real height = b.y ().delta (); + blotdiameter = min (blotdiameter, height); + + if (blotdiameter < 0.0) { - 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 ("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_UNDEFINED)); - - return Stencil (b,at); -} + 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); +} /* * Create Stencil that represents a filled polygon with round edges. @@ -225,171 +229,251 @@ Lookup::round_filled_box (Box b, Real blotdiameter) * 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. */ Stencil -Lookup::round_filled_polygon (Array points, Real blotdiameter) +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 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_interface::make_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 = 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]); + shrunk_box.add_point (shrunk_points[i]); } - SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"), - ly_quote_scm (shrinked_points_scm), - scm_make_real (blotdiameter), - SCM_UNDEFINED); + 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); - shrinked_points.clear (); return polygon; } - /* TODO: deprecate? - */ +*/ 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; } /* - 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, + SCM dash_details) { - Real alpha = (curve.control_[3] - curve.control_[0]).arg (); + Stencil return_value; + + /* + calculate the offset for the two beziers that make the sandwich + for the slur + */ + Offset dir = (curve.control_[3] - curve.control_[0]).direction (); Bezier back = curve; - Offset perp = curvethick * complex_exp (Offset (0, alpha + M_PI/2)) * 0.5; - back.reverse (); + Offset perp = 0.5 * curvethick * Offset (-dir[Y_AXIS], dir[X_AXIS]); 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)) { - list = scm_cons (scontrols[indices[i]], list); + /* solid slur */ + return_value = bezier_sandwich (back, curve, linethick); } - - - SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"), - ly_quote_scm (list), - scm_make_real (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 Stencil (b, at); + else + { + /* 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)); + } + } + } + } + return return_value; } /* @@ -416,25 +500,38 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) * */ Stencil -Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) +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_make_real (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)); @@ -442,301 +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); + b.widen (0.5 * thickness, 0.5 * thickness); return Stencil (b, horizontal_bend); } -/* - TODO: junk me. - */ -Stencil -Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) -{ - Stencil m; - String sym = ly_scm2string (scm_car (s)); - String reg = ly_scm2string (scm_car (scm_cdr (s))); - - 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; -} - 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); - 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)); + 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 } - 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 = other_axis (a); b[a] = iv; b[other] = Interval (-1, 1) * thick * 0.5; - - Stencil m = round_filled_box (b, blot); + + 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)); + b[a] = Interval (iv[DOWN], iv[DOWN] + thick); + 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); - - - Offset z1(iv[LEFT], 0); - Offset z2(iv[RIGHT], 0); - Offset z3(z2[X_AXIS]/2, protude); - - Stencil tri = make_line (z1, z2); - tri.add_stencil (make_line (z2, z3)); - tri.add_stencil (make_line (z3, z1)); - - return tri; -} - + Box b; + b[X_AXIS] = Interval (0, iv.length ()); + b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude)); -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") ; + 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 points_to_line_stencil (thick, points); - 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 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; } -