/*
- 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Copyright (C) 1997--2012 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 "debug.hh"
+
+#include <cmath>
+#include <cctype>
+using namespace std;
+
+#include "line-interface.hh"
+#include "warn.hh"
+#include "international.hh"
#include "dimensions.hh"
-#include "scalar.hh"
-#include "paper-def.hh"
-#include "string-convert.hh"
+#include "bezier.hh"
#include "file-path.hh"
#include "main.hh"
#include "lily-guile.hh"
-#include "all-fonts.hh"
-#include "afm.hh"
-#include "scope.hh"
-#include "molecule.hh"
-#include "atom.hh"
-#include "lily-guile.hh"
-
-Lookup::Lookup ()
+Stencil
+Lookup::beam (Real slope, Real width, Real thick, Real blot)
{
- afm_l_ = 0;
-}
+ Box b;
-Lookup::Lookup (Lookup const& s)
-{
- font_name_ = s.font_name_;
- afm_l_ = 0;
-}
+ Offset p;
+ p = Offset (0, thick / 2);
+ b.add_point (p);
+ p += Offset (1, -1) * (blot / 2);
-/*
- build a ledger line for small pieces.
- */
-Molecule
-Lookup::ledger_line (Interval xwid) const
-{
- Drul_array<Molecule> endings;
- endings[LEFT] = afm_find ("noteheads-ledgerending");
- Molecule * e = &endings[LEFT];
- endings[RIGHT] = *e;
-
- Real thick = e->dim_[Y_AXIS].length();
- Real len = e->dim_[X_AXIS].length () - thick;
-
- Molecule total;
- Direction d = LEFT;
- do {
- endings[d].translate_axis (xwid[d] - endings[d].dim_[X_AXIS][d], X_AXIS);
- total.add_molecule (endings[d]);
- } while ((flip(&d)) != LEFT);
-
- Real xpos = xwid [LEFT] + len;
-
- while (xpos + len + thick /2 <= xwid[RIGHT])
- {
- e->translate_axis (len, X_AXIS);
- total.add_molecule (*e);
- xpos += len;
- }
+ SCM points = SCM_EOL;
- return total;
-}
+ 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);
-Molecule
-Lookup::accidental (int j, bool cautionary) const
-{
- Molecule m(afm_find (String ("accidentals-") + to_str (j)));
- if (cautionary)
- {
- Molecule open = afm_find (String ("accidentals-("));
- Molecule close = afm_find (String ("accidentals-)"));
- m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0);
- m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0);
- }
- return m;
-}
+ 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));
-Molecule
-Lookup::afm_find (String s, bool warn) const
-{
- if (!afm_l_)
- {
- Lookup * me = (Lookup*)(this);
- me->afm_l_ = all_fonts_global_p->find_afm (font_name_);
- if (!me->afm_l_)
- {
- warning (_f("Can't open `%s'\n", font_name_));
- warning (_f("Search path %s\n", global_path.str ().ch_C()));
- error (_f("Aborting"));
- }
- }
- Adobe_font_char_metric cm = afm_l_->find_char (s, warn);
- Molecule m;
- if (cm.code () < 0)
- {
- /*
- don't want people relying on this kind of dimension.
- */
- m.set_empty (false);
- return m;
- }
-
- Atom at (gh_list (char_scm_sym,
- gh_int2scm (cm.code ()),
- SCM_UNDEFINED));
- at.font_ = ly_symbol (font_name_.ch_C());
- at.magn_ = gh_int2scm (0);
-
- m.dim_ = cm.dimensions();
- m.add_atom (&at);
- return m;
-}
+ p = Offset (width, width * slope + thick / 2);
+ b.add_point (p);
+ p += Offset (-1, -1) * (blot / 2);
-Molecule
-Lookup::notehead (int j, String type) const
-{
- if (j > 2)
- j = 2;
+ points = scm_cons (scm_from_double (p[X_AXIS]),
+ scm_cons (scm_from_double (p[Y_AXIS]),
+ points));
- return afm_find (String ("noteheads-") + to_str (j) + type);
+ 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::simple_bar (String type, Real h, Paper_def* paper_l) const
+Stencil
+Lookup::rotated_box (Real slope, Real width, Real thick, Real blot)
{
- SCM thick = ly_symbol ("barthick_" + type);
- Real w = 0.0;
-
- if (paper_l->scope_p_->elem_b (thick))
- {
- w = paper_l->get_realvar (thick);
- }
- else
- {
- programming_error ("No bar thickness set ! ");
- w = 1 PT;
- }
- return filledbox (Box (Interval(0,w), Interval(-h/2, h/2)));
+ 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);
}
-
-Molecule
-Lookup::bar (String str, Real h, Paper_def *paper_l) const
+Stencil
+Lookup::horizontal_line (Interval w, Real th)
{
- if (str == "bracket")
- return staff_bracket (h);
- else if (str == "brace")
- {
- Real staffht = paper_l->get_var ("staffheight");
- return staff_brace (h,staffht);
- }
- Real kern = paper_l->get_var ("bar_kern");
- Real thinkern = paper_l->get_var ("bar_thinkern");
-
- Molecule thin = simple_bar ("thin", h, paper_l);
- Molecule thick = simple_bar ("thick", h, paper_l);
- Molecule colon = afm_find ("dots-repeatcolon", paper_l);
-
- Molecule m;
-
- if (str == "")
- {
- return fill (Box (Interval(0, 0), Interval (-h/2, h/2)));
- }
- if (str == "scorepostbreak")
- {
- return simple_bar ("score", h, paper_l);
- }
- else if (str == "|")
- {
- return thin;
- }
- else if (str == "|.")
- {
- m.add_at_edge (X_AXIS, LEFT, thick, 0);
- m.add_at_edge (X_AXIS, LEFT, thin, kern);
- }
- else if (str == ".|")
- {
- m.add_at_edge (X_AXIS, RIGHT, thick, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, kern);
- }
- else if (str == ":|")
- {
- m.add_at_edge (X_AXIS, LEFT, thick, 0);
- m.add_at_edge (X_AXIS, LEFT, thin, kern);
- m.add_at_edge (X_AXIS, LEFT, colon, kern);
- }
- else if (str == "|:")
- {
- m.add_at_edge (X_AXIS, RIGHT, thick, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, kern);
- m.add_at_edge (X_AXIS, RIGHT, colon, kern);
- }
- else if (str == ":|:")
- {
- m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
- m.add_at_edge (X_AXIS, LEFT, colon, kern);
- m.add_at_edge (X_AXIS, RIGHT, thick, kern);
- m.add_at_edge (X_AXIS, RIGHT, colon, kern);
- }
- else if (str == ".|.")
- {
- m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
- m.add_at_edge (X_AXIS, RIGHT, thick, kern);
- }
- else if (str == "||")
- {
- m.add_at_edge (X_AXIS, RIGHT, thin, 0);
- m.add_at_edge (X_AXIS, RIGHT, thin, thinkern);
- }
-
- return m;
+ 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[X_AXIS] = w;
+ box[Y_AXIS] = Interval (-th / 2, th / 2);
+
+ return Stencil (box, at);
}
-Molecule
-Lookup::beam (Real slope, Real width, Real thick) const
+Stencil
+Lookup::blank (Box b)
{
- Real height = slope * width;
- Real min_y = (0 <? height) - thick/2;
- Real max_y = (0 >? height) + thick/2;
-
-
- Molecule m;
- Atom at
- (gh_list (beam_scm_sym,
- gh_double2scm (width),
- gh_double2scm (slope),
- gh_double2scm (thick),
- SCM_UNDEFINED));
-
- m.dim_[X_AXIS] = Interval (0, width);
- m.dim_[Y_AXIS] = Interval (min_y, max_y);
- m.add_atom (&at);
- return m;
+ return Stencil (b, scm_from_locale_string (""));
}
-Molecule
-Lookup::clef (String st) const
+Stencil
+Lookup::circle (Real rad, Real thick, bool filled)
{
- return afm_find (String ("clefs-" + st));
+ 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)));
}
-SCM
-offset2scm (Offset o)
+Stencil
+Lookup::filled_box (Box b)
{
- return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]),
- SCM_UNDEFINED);
+ return round_filled_box (b, 0.0);
}
-Molecule
-Lookup::dashed_slur (Array<Offset> controls, Real thick, Real dash) const
+/*
+ * round filled box:
+ *
+ * __________________________________
+ * / \ ^ / \ ^
+ * | |blot | |
+ * | | |dia | | |
+ * | |meter | |
+ * |\ _ _ / v \ _ _ /| |
+ * | | |
+ * | | | Box
+ * | <------>| | extent
+ * | blot | | (Y_AXIS)
+ * | diameter| |
+ * | | |
+ * | _ _ _ _ | |
+ * |/ \ / \| |
+ * | | |
+ * | | | | |
+ * | | |
+ * x\_____/______________\_____/|_____v
+ * |(0, 0) |
+ * | |
+ * | |
+ * |<-------------------------->|
+ * Box extent (X_AXIS)
+ */
+Stencil
+Lookup::round_filled_box (Box b, Real blotdiameter)
{
- assert (controls.size () == 8);
- Offset d = controls[3] - controls[0];
-
- Real dx = d[X_AXIS];
- Real dy = d[Y_AXIS];
-
- Molecule m;
-
-
- m.dim_[X_AXIS] = Interval (0, dx);
- m.dim_[Y_AXIS] = Interval (0 <? dy, 0 >? dy);
+ Real width = b.x ().delta ();
+ blotdiameter = min (blotdiameter, width);
+ Real height = b.y ().delta ();
+ blotdiameter = min (blotdiameter, height);
- SCM sc[4];
- for (int i=0; i< 4; i++)
+ if (blotdiameter < 0.0)
{
- sc[i] = offset2scm (controls[i]);
+ if (!isinf (blotdiameter))
+ warning (_f ("Not drawing a box with negative dimension, %.2f by %.2f.",
+ width, height));
+ return Stencil (b, SCM_EOL);
}
- Atom at
- (gh_list (ly_symbol ("dashed-slur"),
- gh_double2scm (thick),
- gh_double2scm (dash),
- ly_quote_scm (array_to_list (sc, 4)),
- SCM_UNDEFINED));
-
-
- m.add_atom (&at);
- return m;
-}
-
-Molecule
-Lookup::dots () const
-{
- return afm_find (String ("dots-dot"));
-}
+ 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));
-
-
-Molecule
-Lookup::fill (Box b) const
-{
- Molecule m;
- m.dim_ = b;
- return m;
+ return Stencil (b, at);
}
-Molecule
-Lookup::rest (int j, bool o, String style) const
+/*
+ * Create Stencil that represents a filled polygon with round edges.
+ *
+ * LIMITATIONS:
+ *
+ * (a) Only outer (convex) edges are rounded.
+ *
+ * (b) This algorithm works as expected only for polygons whose edges
+ * do not intersect. For example, the polygon ((0, 0), (q, 0), (0,
+ * q), (q, q)) has an intersection at point (q/2, q/2) and therefore
+ * will give a strange result. Even non-adjacent edges that just
+ * 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))),
+ * 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
+ * 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
+ * small value -- maybe even 0.0)!
+ *
+ * NOTE: Limitations (b) and (c) arise from the fact that round edges
+ * are made by moulding sharp edges to round ones rather than adding
+ * 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
+ * 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
+ * polygon -- which is not trivial define precisely and unambigously.
+ * With the other approach, one simply could move a circle of size
+ * blotdiameter along all edges of the polygon (which is what the
+ * postscript routine in the backend effectively does, but on the
+ * shrinked polygon). --jr
+ */
+Stencil
+Lookup::round_filled_polygon (vector<Offset> const &points,
+ Real blotdiameter)
{
- return afm_find (String ("rests-") + to_str (j) + (o ? "o" : "") + style);
-}
+ /* TODO: Maybe print a warning if one of the above limitations
+ applies to the given polygon. However, this is quite complicated
+ to check. */
+
+ const Real epsilon = 0.01;
+
+#ifndef NDEBUG
+ /* remove consecutive duplicate points */
+ for (vsize i = 0; i < points.size (); i++)
+ {
+ int next = (i + 1) % points.size ();
+ Real d = (points[i] - points[next]).length ();
+ if (d < epsilon)
+ programming_error ("Polygon should not have duplicate points");
+ }
+#endif
+
+ /* special cases: degenerated polygons */
+ if (points.size () == 0)
+ return Stencil ();
+ if (points.size () == 1)
+ {
+ 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]);
+
+ /* shrink polygon in size by 0.5 * blotdiameter */
+ vector<Offset> shrunk_points;
+ shrunk_points.resize (points.size ());
+ bool ccw = 1; // true, if three adjacent points are counterclockwise ordered
+ for (vsize i = 0; i < points.size (); i++)
+ {
+ int i0 = i;
+ 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;
+ shrunk_points[i1] = p1 + ((ccw) ? p13 : -p13);
+ }
+ /* build scm expression and bounding box */
+ SCM shrunk_points_scm = SCM_EOL;
+ Box box;
+ for (vsize i = 0; i < shrunk_points.size (); i++)
+ {
+ 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 (shrunk_points_scm),
+ scm_from_double (blotdiameter),
+ SCM_BOOL_T,
+ SCM_UNDEFINED);
-Molecule
-Lookup::special_time_signature (String s, int n, int d, Paper_def*pap) const
-{
- // First guess: s contains only the signature style
- String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
-
- Molecule m = afm_find (symbolname, false);
- if (!m.empty_b())
- return m;
-
- // Second guess: s contains the full signature name
- m = afm_find ("timesig-"+s, false);
- if (!m.empty_b ())
- return m;
-
- // Resort to default layout with numbers
- return time_signature (n,d,pap);
+ Stencil polygon = Stencil (box, polygon_scm);
+ shrunk_points.clear ();
+ return polygon;
}
-Molecule
-Lookup::filledbox (Box b ) const
+/*
+ TODO: deprecate?
+*/
+Stencil
+Lookup::frame (Box b, Real thick, Real blot)
{
- Molecule m;
-
- Atom at (gh_list (filledbox_scm_sym,
- 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));
-
- m.dim_ = b;
- m.add_atom (&at);
+ Stencil m;
+ for (Axis a = X_AXIS; a < NO_AXES; a = Axis (a + 1))
+ {
+ 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;
}
-
-
-/**
- Magnification steps. These are powers of 1.2. The numbers are
- taken from Knuth's plain.tex: */
-
-
-/**
- TODO: THIS IS UGLY. Since the user has direct access to TeX
- strings, we try some halfbaked attempt to detect TeX trickery.
-
+/*
+ Make a smooth curve along the points
*/
-Molecule
-Lookup::text (String style, String text, Paper_def *paper_l) const
+Stencil
+Lookup::slur (Bezier curve, Real curvethick, Real linethick,
+ SCM dash_details)
{
- Molecule m;
- if (style.empty_b ())
- style = "roman";
-
- int font_mag = 0;
- Real font_h = paper_l->get_var ("font_normal");
- if (paper_l->scope_p_->elem_b ("font_" + style))
- {
- font_h = paper_l->get_var ("font_" + style);
- }
-
-
- Real realmag = 1.0;
- if (paper_l->scope_p_->elem_b ("magnification_" + style))
- {
- font_mag = (int)paper_l->get_var ("magnification_" + style);
- realmag = pow (1.2, font_mag);
- }
+ Stencil return_value;
/*
- UGH.
+ calculate the offset for the two beziers that make the sandwich
+ for the slur
*/
- SCM l = ly_ch_C_eval_scm (("(style-to-cmr \"" + style + "\")").ch_C());
- if (l != SCM_BOOL_F)
- {
- style = ly_scm2string (SCM_CDR(l)) +to_str ((int)font_h);
- }
-
- Real w = 0;
- Interval ydims (0,0);
+ 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.control_[1] += perp;
+ back.control_[2] += perp;
- Font_metric* afm_l = all_fonts_global_p->find_font (style);
- DOUT << "\nChars: ";
+ curve.control_[1] -= perp;
+ curve.control_[2] -= perp;
-
- int brace_count =0;
- for (int i = 0; i < text.length_i (); i++)
+ if (!scm_is_pair (dash_details))
{
-
- if (text[i]=='\\')
- {
- for (i++; (i < text.length_i ()) && isalpha(text[i]); i++)
- ;
- i--; // Compensate for the increment in the outer loop!
- }
- else
- {
- if (text[i] == '{')
- brace_count ++;
- else if (text[i] == '}')
- brace_count --;
- Character_metric *c = (Character_metric*)afm_l->get_char ((unsigned char)text[i],false);
-
- w += c->dimensions()[X_AXIS].length ();
- ydims.unite (c->dimensions()[Y_AXIS]);
- }
- }
-
- if(brace_count)
- {
- warning (_f ("Non-matching braces in text `%s', adding braces.", text.ch_C()));
-
- if (brace_count < 0)
- {
- text = to_str ('{', -brace_count) + text;
- }
- else
- {
- text = text + to_str ('}', brace_count);
- }
- }
-
- ydims *= realmag;
- m.dim_.x () = Interval (0, w*realmag);
- m.dim_.y () = ydims;
-
-
- Atom at (gh_list (text_scm_sym,
- ly_ch_C_to_scm (text.ch_C()),
- SCM_UNDEFINED));
- at.font_ = ly_symbol (style);
- at.magn_ = gh_int2scm (font_mag);
-
- m.add_atom (&at);
- return m;
-}
-
-
-Molecule
-Lookup::time_signature (int num, int den, Paper_def *paper_l) const
-{
- String sty = "number";
- Molecule n (text (sty, to_str (num), paper_l));
- Molecule d (text (sty, to_str (den), paper_l));
- n.align_to (X_AXIS, CENTER);
- d.align_to (X_AXIS, CENTER);
- Molecule m;
- if (den)
- {
- m.add_at_edge (Y_AXIS, UP, n, 0.0);
- m.add_at_edge (Y_AXIS, DOWN, d, 0.0);
+ /* solid slur */
+ return_value = bezier_sandwich (back, curve, linethick);
}
else
{
- m = n;
- m.align_to (Y_AXIS, CENTER);
- }
- return m;
-}
-
-Molecule
-Lookup::staff_brace (Real y, int staff_size) const
-{
- Molecule m;
- /*
- (define (pianobrace y staffht)
- (let* ((step 1.0)
- (minht (* 2 staffht))
- (maxht (* 7 minht))
- )
- (string-append
- (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))) 0)
- (char (max 0 (/ (- (min y (- maxht step)) minht) step))))
- )
- )
- */
-
- Real step = 1.0;
- int minht = 2 * staff_size;
- int maxht = 7 * minht;
- int idx = int (((maxht - step) <? y - minht) / step);
- idx = idx >? 0;
-
- SCM f = ly_symbol (String ("feta-braces" + to_str (staff_size)));
- SCM e =gh_list (char_scm_sym, gh_int2scm (idx), SCM_UNDEFINED);
- Atom at (e);
- at.font_ = f;
-
- m.dim_[Y_AXIS] = Interval (-y/2,y/2);
- m.dim_[X_AXIS] = Interval (0,0);
- m.add_atom (&at);
- return m;
+ /* 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::hairpin (Real width, Real height, Real thick, bool decresc, bool continued) const
+/*
+ * Bezier Sandwich:
+ *
+ * .|
+ * . |
+ * top . |
+ * . curve |
+ * . |
+ * . |
+ * . |
+ * | |
+ * | .|
+ * | .
+ * | bottom .
+ * | . curve
+ * | .
+ * | .
+ * | .
+ * | .
+ * |.
+ * |
+ *
+ */
+Stencil
+Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve, Real thickness)
{
- Molecule m;
-
- String hairpin = String (decresc ? "de" : "") + "crescendo";
- Atom at (gh_list (ly_symbol (hairpin),
- gh_double2scm (thick),
- gh_double2scm (width),
- gh_double2scm (height),
- gh_double2scm (continued ? height/2 : 0.0),
- SCM_UNDEFINED));
- m.dim_.x () = Interval (0, width);
- m.dim_.y () = Interval (-2*height, 2*height);
-
- m.add_atom (&at);
- return m;
+ 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 ("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));
+ Interval y_extent = top_curve.extent (Y_AXIS);
+ 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);
}
-Molecule
-Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap, Real interline_f, Direction dir) const
+Stencil
+Lookup::repeat_slash (Real w, Real s, Real t)
{
- Molecule m;
-
- Atom at (gh_list(tuplet_scm_sym,
- gh_double2scm (interline_f),
- gh_double2scm (gap),
- gh_double2scm (dx),
- gh_double2scm (dy),
- gh_double2scm (thick),
- gh_int2scm (dir),
- SCM_UNDEFINED));
- m.add_atom (&at);
- return m;
+ 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
}
-/*
- Make a smooth curve along the points
- */
-Molecule
-Lookup::slur (Array<Offset> controls, Real linethick) const
+Stencil
+Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot)
{
- Offset delta_off = controls[3]- controls[0];
- Molecule m;
-
- SCM scontrols [8];
- int indices[] = {5,6,7,4,1,2,3,0};
-
- for (int i= 0; i < 8; i++)
- scontrols[i] = offset2scm (controls[indices[i]]);
-
+ Box b;
+ Axis other = Axis ((a + 1) % 2);
+ b[a] = iv;
+ b[other] = Interval (-1, 1) * thick * 0.5;
- Atom at (gh_list (ly_symbol ("bezier-sandwich"),
- ly_quote_scm (array_to_list (scontrols, 8)),
- gh_double2scm (linethick),
- SCM_UNDEFINED));
+ Stencil m = round_filled_box (b, blot);
- m.dim_[X_AXIS] = Interval (0, delta_off[X_AXIS]);
- m.dim_[Y_AXIS] = Interval (0 <? delta_off[Y_AXIS], 0 >? delta_off[Y_AXIS]);
- m.add_atom (&at);
- return m;
-}
+ b[a] = Interval (iv[UP] - thick, iv[UP]);
+ 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));
-Molecule
-Lookup::staff_bracket (Real y) const
-{
- Molecule m;
- Atom at ( gh_list (bracket_scm_sym,
- gh_double2scm (y),
- SCM_UNDEFINED));
- m.add_atom (&at);
- m.dim_[Y_AXIS] = Interval (-y/2,y/2);
- m.dim_[X_AXIS] = Interval (0,4 PT);
-
- m.translate_axis (- 4. / 3. * m.dim_[X_AXIS].length (), X_AXIS);
return m;
}
-Molecule
-Lookup::volta (Real h, Real w, Real thick, bool vert_start, bool vert_end) const
+Stencil
+Lookup::triangle (Interval iv, Real thick, Real protrude)
{
- Molecule m;
+ Box b;
+ b[X_AXIS] = Interval (0, iv.length ());
+ b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude));
- Atom at (gh_list (volta_scm_sym,
- gh_double2scm (h),
- gh_double2scm (w),
- gh_double2scm (thick),
- gh_int2scm (vert_start),
- gh_int2scm (vert_end),
- SCM_UNDEFINED));
+ 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
- m.dim_[Y_AXIS] = Interval (- h/2, h/2);
- m.dim_[X_AXIS] = Interval (0, w);
+ return points_to_line_stencil (thick, points);
- m.add_atom (&at);
- return m;
}
-Molecule
-Lookup::accordion (SCM s, Real interline_f) const
+Stencil
+Lookup::points_to_line_stencil (Real thick, vector<Offset> const &points)
{
- Molecule m;
- String sym = ly_scm2string(SCM_CAR(s));
- String reg = ly_scm2string(SCM_CAR(SCM_CDR(s)));
-
- if (sym == "Discant")
- {
- Molecule r = afm_find("scripts-accDiscant");
- m.add_molecule(r);
- if (reg.left_str(1) == "F")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 2.5 PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- int eflag = 0x00;
- if (reg.left_str(3) == "EEE")
- {
- eflag = 0x07;
- reg = reg.right_str(reg.length_i()-3);
- }
- else if (reg.left_str(2) == "EE")
- {
- eflag = 0x05;
- reg = reg.right_str(reg.length_i()-2);
- }
- else if (reg.left_str(2) == "Eh")
- {
- eflag = 0x04;
- reg = reg.right_str(reg.length_i()-2);
- }
- else if (reg.left_str(1) == "E")
- {
- eflag = 0x02;
- reg = reg.right_str(reg.length_i()-1);
- }
- if (eflag & 0x02)
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
- m.add_molecule(d);
- }
- if (eflag & 0x04)
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
- d.translate_axis(0.8 * interline_f PT, X_AXIS);
- m.add_molecule(d);
- }
- if (eflag & 0x01)
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
- d.translate_axis(-0.8 * interline_f PT, X_AXIS);
- m.add_molecule(d);
- }
- if (reg.left_str(2) == "SS")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(0.5 * interline_f PT, Y_AXIS);
- d.translate_axis(0.4 * interline_f PT, X_AXIS);
- m.add_molecule(d);
- d.translate_axis(-0.8 * interline_f PT, X_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-2);
- }
- if (reg.left_str(1) == "S")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(0.5 * interline_f PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- }
- else if (sym == "Freebase")
- {
- Molecule r = afm_find("scripts-accFreebase");
- m.add_molecule(r);
- if (reg.left_str(1) == "F")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- if (reg == "E")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
- m.add_molecule(d);
- }
- }
- else if (sym == "Bayanbase")
- {
- Molecule r = afm_find("scripts-accBayanbase");
- m.add_molecule(r);
- if (reg.left_str(1) == "T")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 2.5 PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- /* include 4' reed just for completeness. You don't want to use this. */
- if (reg.left_str(1) == "F")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- if (reg.left_str(2) == "EE")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
- d.translate_axis(0.4 * interline_f PT, X_AXIS);
- m.add_molecule(d);
- d.translate_axis(-0.8 * interline_f PT, X_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-2);
- }
- if (reg.left_str(1) == "E")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- }
- else if (sym == "Stdbase")
- {
- Molecule r = afm_find("scripts-accStdbase");
- m.add_molecule(r);
- if (reg.left_str(1) == "T")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 3.5 PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- if (reg.left_str(1) == "F")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 2.5 PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- if (reg.left_str(1) == "M")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 2 PT, Y_AXIS);
- d.translate_axis(interline_f PT, X_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- if (reg.left_str(1) == "E")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 1.5 PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-1);
- }
- if (reg.left_str(1) == "S")
- {
- Molecule d = afm_find("scripts-accDot");
- d.translate_axis(interline_f * 0.5 PT, Y_AXIS);
- m.add_molecule(d);
- reg = reg.right_str(reg.length_i()-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 = afm_find("scripts-accSB");
- m.add_molecule(r);
- }
- else if (sym == "BB")
- {
- Molecule r = afm_find("scripts-accBB");
- m.add_molecule(r);
- }
- else if (sym == "OldEE")
- {
- Molecule r = afm_find("scripts-accOldEE");
- m.add_molecule(r);
- }
- else if (sym == "OldEES")
+ Stencil ret;
+ for (vsize i = 1; i < points.size (); i++)
{
- Molecule r = afm_find("scripts-accOldEES");
- m.add_molecule(r);
+ 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 m;
+ return ret;
}
projects / lilypond.git / blobdiff