X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=fc6a2e896bca4afc494bd608076c6c05221078cc;hb=1efdfdaed5cd51abfe5da5e4f5731fe9396c96f2;hp=bb6ac3fe8917917ddc1ae28b84be354286dfdca1;hpb=df019fc9342e7b78138a3e24c5cddafec9d754e4;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index bb6ac3fe89..fc6a2e896b 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,600 +3,740 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys Jan Nieuwenhuizen - - TODO - Glissando */ -#include #include "lookup.hh" -#include "debug.hh" + +#include +#include +using namespace std; + +#include "line-interface.hh" +#include "warn.hh" #include "dimensions.hh" -#include "scalar.hh" -#include "paper-def.hh" +#include "bezier.hh" #include "string-convert.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" - -SCM -array_to_list (SCM *a , int l) -{ - SCM list = SCM_EOL; - for (int i= l; i--; ) - { - list = gh_cons (a[i], list); - } - return list; -} - +#include "font-metric.hh" -Lookup::Lookup () +Stencil +Lookup::dot (Offset p, Real radius) { - paper_l_ = 0; - afm_l_ = 0; + SCM at = (scm_list_n (ly_symbol2scm ("dot"), + scm_from_double (p[X_AXIS]), + scm_from_double (p[Y_AXIS]), + scm_from_double (radius), + SCM_UNDEFINED)); + Box box; + box.add_point (p - Offset (radius, radius)); + box.add_point (p + Offset (radius, radius)); + return Stencil (box, at); } -Lookup::Lookup (Lookup const& s) +Stencil +Lookup::beam (Real slope, Real width, Real thick, Real blot) { - font_name_ = s.font_name_; - paper_l_ = 0; - afm_l_ = 0; -} + Box b; + Offset p; -Molecule -Lookup::ledger_line (Interval xwid) const -{ - Molecule end (afm_find ("noteheads-ledgerending")); - Interval ed = end.dim_[X_AXIS]; - xwid = Interval (xwid[LEFT] - ed[LEFT], - xwid[RIGHT] - ed[RIGHT]); - Molecule mid = filledbox (Box (xwid, end.dim_[Y_AXIS])); - Molecule l (mid); - - Molecule e2 = end; - Molecule e1 = end; - e1.translate_axis (xwid[RIGHT], X_AXIS); - e2.translate_axis (xwid[LEFT], X_AXIS); - - l.add_molecule (e1); - l.add_molecule (e2); - return l; -} + p = Offset (0, thick / 2); + b.add_point (p); + p += Offset (1, -1) * (blot / 2); + SCM points = SCM_EOL; -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 (0, -thick / 2); + b.add_point (p); + p += Offset (1, 1) * (blot / 2); + points = scm_cons (scm_from_double (p[X_AXIS]), + scm_cons (scm_from_double (p[Y_AXIS]), + points)); -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())); - } - } - Adobe_font_char_metric cm = afm_l_->find_char (s, warn); - Molecule m; - if (cm.code () < 0) - return m; - - Atom at (gh_list (ly_symbol ("char"), - gh_int2scm (cm.code ()), - SCM_UNDEFINED)); - at.font_ = ly_symbol (font_name_.ch_C()); - 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::ball (int j) const -{ - if (j > 2) - j = 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); - return afm_find (String ("noteheads-") + to_str (j)); + points = scm_cons (scm_from_double (p[X_AXIS]), + scm_cons (scm_from_double (p[Y_AXIS]), + points)); + + SCM expr = scm_list_n (ly_symbol2scm ("polygon"), + ly_quote_scm (points), + scm_from_double (blot), + SCM_BOOL_T, + SCM_UNDEFINED); + + return Stencil (b, expr); } -Molecule -Lookup::simple_bar (String type, Real h) const +Stencil +Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction) { - SCM thick = ly_symbol ("barthick_" + type); - Real w = 0.1 PT; - if (paper_l_->scope_p_->elem_b (thick)) - { - w = paper_l_->get_realvar (thick); - } + SCM l = SCM_EOL; + + Real on = dash_fraction * dash_period; + Real off = dash_period - on; + + for (int i = 4; i--;) + l = scm_cons (ly_offset2scm (b.control_[i]), l); - return filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); + SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"), + scm_from_double (thick), + scm_from_double (on), + scm_from_double (off), + ly_quote_scm (l), + SCM_UNDEFINED)); + + Box box (b.extent (X_AXIS), b.extent (Y_AXIS)); + return Stencil (box, at); } - -Molecule -Lookup::bar (String str, Real h) const +Stencil +Lookup::rotated_box (Real slope, Real width, Real thick, Real blot) { - if (str == "[") - return staff_bracket (h); - else if (str == "{") - return staff_brace (h); - - Real kern = paper_l_->get_var ("bar_kern"); - Real thinkern = paper_l_->get_var ("bar_thinkern"); - Molecule thin = simple_bar ("thin", h); - Molecule thick = simple_bar ("thick", h); - Molecule colon = afm_find ("dots-repeatcolon"); - - Molecule m; - - if (str == "") - { - return fill (Box (Interval(0, 0), Interval (-h/2, h/2))); - } - 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; + vector 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::beam (Real slope, Real width, Real thick) const +Stencil +Lookup::horizontal_line (Interval w, Real th) { - Real height = slope * width; - Real min_y = (0 ? height) + thick/2; - - - Molecule m; - Atom at - (gh_list (ly_symbol ("beam"), - 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; + 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::clef (String st) const +Stencil +Lookup::blank (Box b) { - return afm_find (String ("clefs-" + st)); + return Stencil (b, scm_from_locale_string ("")); } -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 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]; + if (b.x ().length () < blotdiameter) + blotdiameter = b.x ().length (); + if (b.y ().length () < blotdiameter) + blotdiameter = b.y ().length (); + + 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 m; + return Stencil (b, at); +} +/* + * 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 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. */ - m.dim_[X_AXIS] = Interval (0, dx); - m.dim_[Y_AXIS] = Interval (0 ? dy); + const Real epsilon = 0.01; - SCM sc[4]; - for (int i=0; i< 4; i++) +#ifndef NDEBUG + /* remove consecutive duplicate points */ + for (vsize i = 0; i < points.size (); i++) { - sc[i] = offset2scm (controls[i]); + int next_i = (i + 1) % points.size (); + Real d = (points[i] - points[next_i]).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) + return dot (points[0], 0.5 * blotdiameter); + if (points.size () == 2) + return Line_interface::make_line (blotdiameter, points[0], points[1]); + + /* shrink polygon in size by 0.5 * blotdiameter */ + vector 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); } - 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; + /* 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); + + Stencil polygon = Stencil (box, polygon_scm); + shrunk_points.clear (); + return polygon; } -Molecule -Lookup::dots () const +/* + TODO: deprecate? +*/ +Stencil +Lookup::frame (Box b, Real thick, Real blot) { - return afm_find (String ("dots-dot")); -} - - + 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; -Molecule -Lookup::fill (Box b) const -{ - Molecule m; - m.dim_ = b; + m.add_stencil (round_filled_box (edges, blot)); + } + while (flip (&d) != LEFT); + } return m; } -Molecule -Lookup::flag (int j, Direction d) const -{ - char c = (d == UP) ? 'u' : 'd'; - return afm_find (String ("flags-") + to_str (c) + to_str (j)); -} - -Molecule -Lookup::rest (int j, bool o) const -{ - return afm_find (String ("rests-") + to_str (j) + (o ? "o" : "")); -} - -Molecule -Lookup::rule_symbol (Real height, Real width) const +/* + Make a smooth curve along the points +*/ +Stencil +Lookup::slur (Bezier curve, Real curvethick, Real linethick) { - Atom at (gh_list (ly_symbol ("rulesym"), - gh_double2scm (height), - gh_double2scm (width), - SCM_UNDEFINED)); + 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 (); + back.control_[1] += perp; + back.control_[2] += perp; + + curve.control_[1] -= perp; + curve.control_[2] -= perp; + + SCM scontrols[8]; + + for (int i = 0; i < 4; i++) + scontrols[i] = ly_offset2scm (back.control_[i]); + for (int i = 0; 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--;) + list = scm_cons (scontrols[indices[i]], list); - Molecule m; - m.dim_.x () = Interval (0, width); - m.dim_.y () = Interval (0, height); - - m.add_atom (&at); + SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + scm_from_double (linethick), + SCM_UNDEFINED)); + Box b (curve.extent (X_AXIS), + curve.extent (Y_AXIS)); - return m; -} + b[X_AXIS].unite (back.extent (X_AXIS)); + b[Y_AXIS].unite (back.extent (Y_AXIS)); -Molecule -Lookup::script (String str) const -{ - return afm_find (String ("scripts-") + str); + return Stencil (b, at); } -Molecule -Lookup::special_time_signature (String s, int n, int d) const +/* + * Bezier Sandwich: + * + * .| + * . | + * top . | + * . curve | + * . | + * . | + * . | + * | | + * | .| + * | . + * | bottom . + * | . curve + * | . + * | . + * | . + * | . + * |. + * | + * + */ +Stencil +Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) { - // 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.dim_[X_AXIS].empty_b ()) - return m; - - // Second guess: s contains the full signature name - m = afm_find ("timesig-"+s, false); - if (!m.dim_[X_AXIS].empty_b ()) - return m; - - // Resort to default layout with numbers - return time_signature (n,d); + /* + 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_from_double (0.0), + 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); + + return Stencil (b, horizontal_bend); } -Molecule -Lookup::filledbox (Box b ) const +/* + TODO: junk me. +*/ +Stencil +Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { - Molecule m; - - Atom at (gh_list (ly_symbol ("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)); - - m.dim_ = b; - m.add_atom (&at); - return m; -} + Stencil m; + string sym = ly_scm2string (scm_car (s)); + string reg = ly_scm2string (scm_car (scm_cdr (s))); -Molecule -Lookup::stem (Real y1, Real y2) const -{ - if (y1 > y2) + if (sym == "Discant") { - Real t = y1; - y1 = y2; - y2 = t; + Stencil r = fm->find_by_name ("accordion.accDiscant"); + m.add_stencil (r); + if (reg.substr (0, 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.substr (1); + } + int eflag = 0x00; + if (reg.substr (0, 3) == "EEE") + { + eflag = 0x07; + reg = reg.substr (3); + } + else if (reg.substr (0, 2) == "EE") + { + eflag = 0x05; + reg = reg.substr (2); + } + else if (reg.substr (0, 2) == "Eh") + { + eflag = 0x04; + reg = reg.substr (2); + } + else if (reg.substr (0, 1) == "E") + { + eflag = 0x02; + reg = reg.substr (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.substr (0, 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.substr (2); + } + if (reg.substr (0, 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.substr (1); + } } - Real stem_width = paper_l_->get_var ("stemthickness"); - return filledbox (Box (Interval (-stem_width/2,stem_width/2), - Interval (y1, y2))); -} - - -static Dict_initialiser cmr_init[] = { - {"bold", "cmbx"}, - {"dynamic", "feta-din"}, - {"finger", "feta-nummer"}, - {"italic", "cmti"}, - {"roman", "cmr"}, - {"large", "cmbx"}, - {"Large", "cmbx"}, - {"mark", "feta-nummer"}, - {"number", "feta-nummer"}, - {"volta", "feta-nummer"}, - {0,0} -}; - -static Dictionary cmr_dict (cmr_init); - -Molecule -Lookup::text (String style, String text) const -{ - Molecule m; - - - Real font_h = paper_l_->get_var ("font_normal"); - if (paper_l_->scope_p_->elem_b ("font_" + style)) + else if (sym == "Freebase") { - font_h = paper_l_->get_var ("font_" + style); + Stencil r = fm->find_by_name ("accordion.accFreebase"); + m.add_stencil (r); + if (reg.substr (0, 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.substr (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); + } } - - if (cmr_dict.elem_b (style)) + else if (sym == "Bayanbase") { - style = String (cmr_dict [style]) + to_str ((int)font_h); // ugh + Stencil r = fm->find_by_name ("accordion.accBayanbase"); + m.add_stencil (r); + if (reg.substr (0, 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.substr (1); + } + /* include 4' reed just for completeness. You don't want to use this. */ + if (reg.substr (0, 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.substr (1); + } + if (reg.substr (0, 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.substr (2); + } + if (reg.substr (0, 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.substr (1); + } } - - Real w = 0; - Interval ydims (0,0); - - Font_metric* afm_l = all_fonts_global_p->find_font (style); - DOUT << "\nChars: "; - - for (int i = 0; i < text.length_i (); i++) + else if (sym == "Stdbase") { - if (text[i]=='\\') - for (i++; (i < text.length_i ()) && isalpha(text[i]); i++) - ; - else + Stencil r = fm->find_by_name ("accordion.accStdbase"); + m.add_stencil (r); + if (reg.substr (0, 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.substr (1); + } + if (reg.substr (0, 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.substr (1); + } + if (reg.substr (0, 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.substr (1); + } + if (reg.substr (0, 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.substr (1); + } + if (reg.substr (0, 1) == "S") { - Character_metric *c = afm_l->get_char (text[i],false); - w += c->dimensions()[X_AXIS].length (); - ydims.unite (c->dimensions()[Y_AXIS]); + Stencil d = fm->find_by_name ("accordion.accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + m.add_stencil (d); + reg = reg.substr (1); } } - - DOUT << "\n" << to_str (w) << "\n"; - m.dim_.x () = Interval (0, w); - m.dim_.y () = ydims; - Atom at (gh_list (ly_symbol ("text"), - gh_str02scm (text.ch_C()), - SCM_UNDEFINED)); - at.font_ = ly_symbol (style); - - m.add_atom (&at); - return m; -} - - -/* - */ -Molecule -Lookup::time_signature (int num, int den) const -{ - String sty = "number"; - Molecule n (text (sty, to_str (num))); - Molecule d (text (sty, to_str (den))); - n.do_center (X_AXIS); - d.do_center (X_AXIS); - Molecule m; - if (den) + /* 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") { - m.add_at_edge (Y_AXIS, UP, n, 0.0); - m.add_at_edge (Y_AXIS, DOWN, d, 0.0); + Stencil r = fm->find_by_name ("accordion.accSB"); + m.add_stencil (r); } - else + else if (sym == "BB") { - m = n; - m.do_center (Y_AXIS); + Stencil r = fm->find_by_name ("accordion.accBB"); + m.add_stencil (r); } - return m; -} - -Molecule -Lookup::staff_brace (Real y) const -{ - Molecule m; - - Atom at (gh_list (ly_symbol ("pianobrace"), - gh_double2scm (y), - SCM_UNDEFINED - )); - - m.dim_[Y_AXIS] = Interval (-y/2,y/2); - m.dim_[X_AXIS] = Interval (0,0); - m.add_atom (&at); - return m; -} - -Molecule -Lookup::hairpin (Real width, bool decresc, bool continued) const -{ - Molecule m; - Real height = paper_l_->staffheight_f () / 6; - - String hairpin = String (decresc ? "de" : "") + "crescendo"; - Atom at (gh_list (ly_symbol (hairpin), - 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; -} - -Molecule -Lookup::plet (Real dy , Real dx, Direction dir) const -{ - Molecule m; - SCM thick = ly_symbol ("tuplet_thick"); - Real t = 0.1 PT; - if (paper_l_->scope_p_->elem_b (thick)) + else if (sym == "OldEE") { - t = paper_l_->get_realvar (thick); + 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); } - - Atom at (gh_list(ly_symbol ("tuplet"), - gh_double2scm (dx), - gh_double2scm (dy), - gh_double2scm (t), - gh_int2scm (dir), - SCM_UNDEFINED)); -m.add_atom (&at); - return m; } -/* - Make a smooth curve along the points - */ -Molecule -Lookup::slur (Array controls) const +Stencil +Lookup::repeat_slash (Real w, Real s, Real t) { - Offset delta_off = controls[3]- controls[0]; - Molecule m; +#if 0 /* TODO */ + vector points; + Real blotdiameter = 0.0; - SCM scontrols [8]; - int indices[] = {5,6,7,4,1,2,3,0}; + Offset p1 (0, 0); + Offset p2 (w, w * s); - for (int i= 0; i < 8; i++) - scontrols[i] = offset2scm (controls[indices[i]]); + return Lookup::round_filled_polygon (points, blotdiameter); +#endif + SCM wid = scm_from_double (w); + SCM sl = scm_from_double (s); + SCM thick = scm_from_double (t); + SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"), + wid, sl, thick, SCM_UNDEFINED); - Atom at (gh_list (ly_symbol ("bezier-sandwich"), - ly_quote_scm (array_to_list (scontrols, 8)), - SCM_UNDEFINED)); + Box b (Interval (0, w + sqrt (sqr (t / s) + sqr (t))), + Interval (0, w * s)); - m.dim_[X_AXIS] = Interval (0, delta_off[X_AXIS]); - m.dim_[Y_AXIS] = Interval (0 ? delta_off[Y_AXIS]); - m.add_atom (&at); - return m; + return Stencil (b, slashnodot); // http://slashnodot.org } -Molecule -Lookup::staff_bracket (Real y) const +Stencil +Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) { - Molecule m; - Atom at ( gh_list (ly_symbol ("bracket"), - 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); + Box b; + Axis other = Axis ((a + 1)%2); + b[a] = iv; + 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); + 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)); - m.translate_axis (- 4. / 3. * m.dim_[X_AXIS].length (), X_AXIS); return m; } -Molecule -Lookup::volta (Real w, bool last_b) const +Stencil +Lookup::triangle (Interval iv, Real thick, Real protude) { - Molecule m; - SCM thick = ly_symbol ("volta_thick"); - Real t = 0.1 PT; - if (paper_l_->scope_p_->elem_b (thick)) - { - t = paper_l_->get_realvar (thick); - } - Atom at (gh_list (ly_symbol ("volta"), - gh_double2scm (w), - gh_double2scm (t), - gh_int2scm (last_b), - SCM_UNDEFINED)); + Box b; + b[X_AXIS] = Interval (0, iv.length ()); + b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude)); - Real interline_f = paper_l_->interline_f (); + vector points; + points.push_back (Offset (iv[LEFT], 0)); + points.push_back (Offset (iv[RIGHT], 0)); + points.push_back (Offset (iv.center (), protude)); - m.dim_[Y_AXIS] = Interval (-interline_f, interline_f); - m.dim_[X_AXIS] = Interval (0, w); + return points_to_line_stencil (thick, points); - m.add_atom (&at); - return m; } -Molecule -Lookup::special_ball (int j, String kind_of_ball) const -{ - if (j > 2) - j = 2; - return afm_find (String ("noteheads-") + kind_of_ball); +Stencil +Lookup::points_to_line_stencil (Real thick, vector const &points) +{ + Stencil ret; + for (vsize i = 1; i < points.size (); i++) + { + if (points[i-1].is_sane () && points[i].is_sane ()) + { + Stencil line + = Line_interface::make_line (thick, points[i-1], points[i]); + ret.add_stencil (line); + } + } + return ret; } -