/*
- 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 <hanwen@cs.uu.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
- 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 <http://www.gnu.org/licenses/>.
*/
-#include <math.h>
-#include <ctype.h>
+#include "lookup.hh"
+
+#include <cmath>
+#include <cctype>
+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;
- Real max_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;
- SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"),
- gh_double2scm (thick),
- gh_double2scm (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 Molecule (box, at);
-}
+ p = Offset (0, -thick / 2);
+ b.add_point (p);
+ p += Offset (1, 1) * (blot / 2);
-Molecule
-Lookup::line (Real th, Offset from, Offset to)
-{
- SCM at = scm_list_n (ly_symbol2scm ("draw-line"),
- gh_double2scm (th),
- gh_double2scm (from[X_AXIS]),
- gh_double2scm (from[Y_AXIS]),
- gh_double2scm (to[X_AXIS]),
- gh_double2scm (to[Y_AXIS]),
- SCM_UNDEFINED);
+ points = scm_cons (scm_from_double (p[X_AXIS]),
+ scm_cons (scm_from_double (p[Y_AXIS]),
+ points));
- Box box;
- box.add_point (from);
- box.add_point (to);
+ 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);
- box[X_AXIS].widen (th/2);
- box[Y_AXIS].widen (th/2);
+ points = scm_cons (scm_from_double (p[X_AXIS]),
+ scm_cons (scm_from_double (p[Y_AXIS]),
+ points));
- return Molecule (box, at);
+ SCM expr = scm_list_n (ly_symbol2scm ("polygon"),
+ ly_quote_scm (points),
+ scm_from_double (blot),
+ SCM_BOOL_T,
+ SCM_UNDEFINED);
+
+ return Stencil (b, expr);
}
-Molecule
-Lookup::horizontal_line (Interval w, Real th)
+Stencil
+Lookup::rotated_box (Real slope, Real width, Real thick, Real blot)
{
- SCM at = scm_list_n (ly_symbol2scm ("horizontal-line"),
- gh_double2scm (w[LEFT]),
- gh_double2scm (w[RIGHT]),
- gh_double2scm (th),
- SCM_UNDEFINED);
+ vector<Offset> pts;
+ Offset rot (1, 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);
+ 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 Molecule (box, at);
+ return Stencil (box, at);
}
+Stencil
+Lookup::blank (Box b)
+{
+ return Stencil (b, scm_from_locale_string (""));
+}
-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);
}
/*
* | | | | |
* | | |
* x\_____/______________\_____/|_____v
- * |(0,0) |
+ * |(0, 0) |
* | |
* | |
* |<-------------------------->|
- * Box extent(X_AXIS)
+ * Box extent (X_AXIS)
*/
-Molecule
+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 ("round-filled-box"),
- 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_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 Molecule that represents a filled polygon with round edges.
+ * Create Stencil that represents a filled polygon with round edges.
*
* LIMITATIONS:
*
* 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
* 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
* postscript routine in the backend effectively does, but on the
* shrinked polygon). --jr
*/
-Molecule
-Lookup::round_filled_polygon (Array<Offset> points, Real blotdiameter)
+Stencil
+Lookup::round_filled_polygon (vector<Offset> const &points,
+ Real blotdiameter)
{
/* 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 */
const Real epsilon = 0.01;
- for (int i = 0; i < points.size ();)
+
+#ifndef NDEBUG
+ /* 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 * 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 (blotdiameter, points[0], points[1]);
/* shrink polygon in size by 0.5 * blotdiameter */
- Array<Offset> shrinked_points;
- shrinked_points.set_size (points.size ());
+ vector<Offset> shrunk_points;
+ shrunk_points.resize (points.size ());
bool ccw = 1; // true, if three adjacent points are counterclockwise ordered
- for (int i = 0; i < points.size (); i++)
+ for (vsize i = 0; i < points.size (); i++)
{
int i0 = i;
int i1 = (i + 1) % points.size ();
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;
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)
+ 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;
- shrinked_points[i1] = p1 + ((ccw) ? p13 : -p13);
+ p13 = (0.5 * blotdiameter / d) * p13n;
+ shrunk_points[i1] = p1 + ((ccw) ? p13 : -p13);
}
/* 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++)
+ 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]);
}
SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"),
- ly_quote_scm (shrinked_points_scm),
- gh_double2scm (blotdiameter),
- SCM_UNDEFINED);
+ ly_quote_scm (shrunk_points_scm),
+ scm_from_double (blotdiameter),
+ SCM_BOOL_T,
+ SCM_UNDEFINED);
- Molecule polygon = Molecule (box, polygon_scm);
- shrinked_points.clear ();
+ Stencil polygon = Stencil (box, polygon_scm);
+ shrunk_points.clear ();
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))
{
- list = gh_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),
- 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);
+ 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;
}
/*
* |
*
*/
-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));
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 = 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));
+
+ 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 = Axis ((a + 1) % 2);
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 , 0 >? protude);
-
- SCM s = scm_list_n (ly_symbol2scm ("symmetric-x-triangle"),
- gh_double2scm (thick),
- gh_double2scm (iv.length()),
- gh_double2scm (protude), SCM_UNDEFINED);
-
- return Molecule (b, s);
-}
-
+ Box b;
+ b[X_AXIS] = Interval (0, iv.length ());
+ b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude));
-/*
- 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}.")
-{
- 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") ;
+ vector<Offset> 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)gh_scm2int (a), ly_scm2interval (iv),
- gh_scm2double (t),
- gh_scm2double (p)).smobbed_copy ();
}
-
-
-LY_DEFINE(ly_filled_box ,"ly:round-filled-box",
- 3, 0, 0,
- (SCM xext, SCM yext, SCM blot),
- "Make a filled-box of dimensions @var{xext}, @var{yext} and roundness @var{blot}.")
+Stencil
+Lookup::points_to_line_stencil (Real thick, vector<Offset> const &points)
{
- SCM_ASSERT_TYPE(ly_number_pair_p (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ;
- SCM_ASSERT_TYPE(ly_number_pair_p (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ;
- SCM_ASSERT_TYPE(gh_number_p (blot), blot, SCM_ARG3, __FUNCTION__, "number") ;
-
- return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)),
- gh_scm2double (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;
}
-
projects / lilypond.git / blobdiff