X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=e7dd788ec8a1fce85544935bf0a8e24aa84a07e8;hb=e24df7c27635dc996c466295eacf2981bddccaf7;hp=157b474ade2f5ec19bc07b1bd7310c98efced1a7;hpb=b9b40f154d0dfa9c3fcd44028bd8b745b87e4873;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 157b474ade..e7dd788ec8 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,16 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys Jan Nieuwenhuizen - - TODO - Glissando */ + +#include "lookup.hh" + #include -#include +#include +#include "line-interface.hh" #include "warn.hh" #include "dimensions.hh" #include "bezier.hh" @@ -20,90 +21,117 @@ #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" -#include "molecule.hh" -#include "lookup.hh" #include "font-metric.hh" -Molecule -Lookup::beam (Real slope, Real width, Real thick) +Stencil +Lookup::dot (Offset p, Real radius) +{ + SCM at = (scm_list_n (ly_symbol2scm ("dot"), + scm_make_real (p[X_AXIS]), + scm_make_real (p[Y_AXIS]), + scm_make_real (radius), + SCM_UNDEFINED)); + Box box; + box.add_point (p - Offset (radius, radius)); + box.add_point (p + Offset (radius, radius)); + return Stencil (box, at); +} + + + +/* + * Horizontal Slope: + * + * /| ^ + * / | | + * / | | height + * / | | + * / | v + * | / + * | / + * (0,0) x /slope = dy/dx + * | / + * |/ + * + * <-----> + * width + */ +Stencil +Lookup::beam (Real slope, Real width, Real thick, Real blot) { Real height = slope * width; Real min_y = (0 ? height) + thick/2; - - Box b (Interval (0, width), Interval (min_y, max_y)); - SCM at = scm_list_n (ly_symbol2scm ("beam"), - gh_double2scm (width), - gh_double2scm (slope), - gh_double2scm (thick), + scm_make_real (width), + scm_make_real (slope), + scm_make_real (thick), + scm_make_real (blot), SCM_UNDEFINED); - return Molecule (b, at); + return Stencil (b, at); } -Molecule +Stencil Lookup::dashed_slur (Bezier b, Real thick, Real dash) { SCM l = SCM_EOL; - for (int i= 4; i -- ;) + for (int i = 4; i -- ;) { - l = gh_cons (ly_offset2scm (b.control_[i]), l); + l = scm_cons (ly_offset2scm (b.control_[i]), l); } SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"), - gh_double2scm (thick), - gh_double2scm (dash), + scm_make_real (thick), + scm_make_real (dash), ly_quote_scm (l), SCM_UNDEFINED)); Box box (Interval (0,0),Interval (0,0)); - return Molecule (box, at); + return Stencil (box, at); } -Molecule -Lookup::line (Real th, Offset f, Offset t) + + +Stencil +Lookup::horizontal_line (Interval w, Real th) { - SCM at = (scm_list_n (ly_symbol2scm ("draw-line"), - gh_double2scm (th), - gh_double2scm (f[X_AXIS]), - gh_double2scm (f[Y_AXIS]), - gh_double2scm (t[X_AXIS]), - gh_double2scm (t[Y_AXIS]), - SCM_UNDEFINED)); + SCM at = scm_list_n (ly_symbol2scm ("horizontal-line"), + scm_make_real (w[LEFT]), + scm_make_real (w[RIGHT]), + scm_make_real (th), + SCM_UNDEFINED); - Box box; - box.add_point (f); - box.add_point (t); - box[X_AXIS].widen (th/2); - box[Y_AXIS].widen (th/2); + Box box ; + box[X_AXIS] = w; + box[Y_AXIS] = Interval (-th/2,th/2); - return Molecule (box, at); + return Stencil (box, at); } -Molecule +Stencil Lookup::blank (Box b) { - return Molecule (b, SCM_EOL); + return Stencil (b, scm_makfrom0str ("")); } -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_make_real (-b[X_AXIS][LEFT]), + scm_make_real (b[X_AXIS][RIGHT]), + scm_make_real (-b[Y_AXIS][DOWN]), + scm_make_real (b[Y_AXIS][UP]), SCM_UNDEFINED)); - return Molecule (b,at); + return Stencil (b,at); } /* @@ -131,62 +159,196 @@ Lookup::filledbox (Box b) * | | * | | * |<-------------------------->| - * Box extent(X_AXIS) + * Box extent (X_AXIS) */ -Molecule -Lookup::roundfilledbox (Box b, Real blotdiameter) +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) { - programming_error (_f ("round filled box vertical extent smaller than blot; decreasing blot")); blotdiameter = b.y ().length (); } - SCM at = (scm_list_n (ly_symbol2scm ("roundfilledbox"), - 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 at = (scm_list_n (ly_symbol2scm ("round-filled-box"), + scm_make_real (-b[X_AXIS][LEFT]), + scm_make_real (b[X_AXIS][RIGHT]), + scm_make_real (-b[Y_AXIS][DOWN]), + scm_make_real (b[Y_AXIS][UP]), + scm_make_real (blotdiameter), SCM_UNDEFINED)); - return Molecule (b,at); + 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 (Array 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 ();) + { + int next_i = (i + 1) % points.size (); + Real d = (points[i] - points[next_i]).length (); + if (d < epsilon) + points.del (next_i); + else + i++; + } + + /* 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 */ + Array shrinked_points; + shrinked_points.set_size (points.size ()); + bool ccw = 1; // true, if three adjacent points are counterclockwise ordered + for (int i = 0; i < points.size (); i++) + { + int i0 = i; + int i1 = (i + 1) % points.size (); + int i2 = (i + 2) % points.size (); + Offset p0 = points[i0]; + Offset p1 = points[i1]; + Offset p2 = points[i2]; + Offset p10 = p0 - p1; + Offset p12 = p2 - p1; + if (p10.length () != 0.0) + { // recompute ccw + Real phi = p10.arg (); + // rotate (p2 - p0) by (-phi) + Offset q = complex_multiply (p2 - p0, complex_exp (Offset (1.0, -phi))); + + if (q[Y_AXIS] > 0) + ccw = 1; + else if (q[Y_AXIS] < 0) + ccw = 0; + else {} // keep ccw unchanged + } + else {} // keep ccw unchanged + Offset p10n = (1.0 / p10.length ()) * p10; // normalize length to 1.0 + Offset p12n = (1.0 / p12.length ()) * p12; + Offset p13n = 0.5 * (p10n + p12n); + Offset p14n = 0.5 * (p10n - p12n); + Offset p13; + Real d = p13n.length () * p14n.length (); // distance p3n to line (p1..p0) + if (d < epsilon) + // special case: p0, p1, p2 are on a single line => build + // vector orthogonal to (p2-p0) of length 0.5 blotdiameter + { + p13[X_AXIS] = p10[Y_AXIS]; + p13[Y_AXIS] = -p10[X_AXIS]; + p13 = (0.5 * blotdiameter / p13.length ()) * p13; + } + else + p13 = (0.5 * blotdiameter / d) * p13n; + shrinked_points[i1] = p1 + ((ccw) ? p13 : -p13); + } + + /* build scm expression and bounding box */ + SCM shrinked_points_scm = SCM_EOL; + Box box; + for (int i = 0; i < shrinked_points.size (); i++) + { + SCM x = scm_make_real (shrinked_points[i][X_AXIS]); + SCM y = scm_make_real (shrinked_points[i][Y_AXIS]); + shrinked_points_scm = scm_cons (x, scm_cons (y, shrinked_points_scm)); + box.add_point (points[i]); + } + SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"), + ly_quote_scm (shrinked_points_scm), + scm_make_real (blotdiameter), + SCM_UNDEFINED); + + Stencil polygon = Stencil (box, polygon_scm); + shrinked_points.clear (); + return polygon; } -Molecule -Lookup::frame (Box b, Real thick) + +/* + TODO: deprecate? + */ +Stencil +Lookup::frame (Box b, Real thick, Real blot) { - Molecule m; + Stencil m; Direction d = LEFT; - Axis a = X_AXIS; - while (a < NO_AXES) + for (Axis a = X_AXIS; a < NO_AXES; a = Axis (a + 1)) { + Axis o = Axis ((a+1)%NO_AXES); do { - Axis o = Axis ((a+1)%NO_AXES); - 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)); + m.add_stencil (round_filled_box (edges, blot)); } while (flip (&d) != LEFT); } return m; - } /* Make a smooth curve along the points */ -Molecule +Stencil Lookup::slur (Bezier curve, Real curvethick, Real linethick) { Real alpha = (curve.control_[3] - curve.control_[0]).arg (); @@ -201,9 +363,9 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) SCM scontrols[8]; - for (int i=4; i--;) + for (int i =4; i--;) scontrols[ i ] = ly_offset2scm (back.control_[i]); - for (int i=4 ; i--;) + for (int i =4 ; i--;) scontrols[i+4] = ly_offset2scm (curve.control_[i]); /* @@ -211,23 +373,23 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) */ int indices[]= {5, 6, 7, 4, 1, 2, 3, 0}; SCM list = SCM_EOL; - for (int i= 8; i--;) + for (int i = 8; i--;) { - list = gh_cons (scontrols[indices[i]], list); + list = scm_cons (scontrols[indices[i]], list); } - SCM at = (scm_list_n (ly_symbol2scm ("bezier-bow"), + SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"), ly_quote_scm (list), - gh_double2scm (linethick), + scm_make_real (linethick), SCM_UNDEFINED)); - Box b(curve.extent (X_AXIS), + 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); + return Stencil (b, at); } /* @@ -253,25 +415,25 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) * | * */ -Molecule +Stencil Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) { /* 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); + 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), - gh_double2scm (0.0), + scm_make_real (0.0), SCM_UNDEFINED); Interval x_extent = top_curve.extent (X_AXIS); @@ -280,295 +442,266 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) 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); + return Stencil (b, horizontal_bend); } /* TODO: junk me. */ -Molecule +Stencil 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))); + Stencil m; + String sym = ly_scm2string (scm_car (s)); + String reg = ly_scm2string (scm_car (scm_cdr (s))); if (sym == "Discant") { - Molecule r = fm->find_by_name ("accordion-accDiscant"); - m.add_molecule (r); - if (reg.left_str (1) == "F") + Stencil r = fm->find_by_name ("accordion.accDiscant"); + m.add_stencil (r); + if (reg.left_string (1) == "F") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-1); } int eflag = 0x00; - if (reg.left_str (3) == "EEE") + if (reg.left_string (3) == "EEE") { eflag = 0x07; - reg = reg.right_str (reg.length_i ()-3); + reg = reg.right_string (reg.length ()-3); } - else if (reg.left_str (2) == "EE") + else if (reg.left_string (2) == "EE") { eflag = 0x05; - reg = reg.right_str (reg.length_i ()-2); + reg = reg.right_string (reg.length ()-2); } - else if (reg.left_str (2) == "Eh") + else if (reg.left_string (2) == "Eh") { eflag = 0x04; - reg = reg.right_str (reg.length_i ()-2); + reg = reg.right_string (reg.length ()-2); } - else if (reg.left_str (1) == "E") + else if (reg.left_string (1) == "E") { eflag = 0x02; - reg = reg.right_str (reg.length_i ()-1); + reg = reg.right_string (reg.length ()-1); } if (eflag & 0x02) { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_molecule (d); + m.add_stencil (d); } if (eflag & 0x04) { - Molecule d = fm->find_by_name ("accordion-accDot"); + 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_molecule (d); + m.add_stencil (d); } if (eflag & 0x01) { - Molecule d = fm->find_by_name ("accordion-accDot"); + 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_molecule (d); + m.add_stencil (d); } - if (reg.left_str (2) == "SS") + if (reg.left_string (2) == "SS") { - Molecule d = fm->find_by_name ("accordion-accDot"); + 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_molecule (d); + m.add_stencil (d); d.translate_axis (-0.8 * staff_space PT, X_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-2); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-2); } - if (reg.left_str (1) == "S") + if (reg.left_string (1) == "S") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (0.5 * staff_space PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (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_str (1) == "F") + Stencil r = fm->find_by_name ("accordion.accFreebase"); + m.add_stencil (r); + if (reg.left_string (1) == "F") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-1); } if (reg == "E") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - m.add_molecule (d); + m.add_stencil (d); } } else if (sym == "Bayanbase") { - Molecule r = fm->find_by_name ("accordion-accBayanbase"); - m.add_molecule (r); - if (reg.left_str (1) == "T") + Stencil r = fm->find_by_name ("accordion.accBayanbase"); + m.add_stencil (r); + if (reg.left_string (1) == "T") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-1); } /* include 4' reed just for completeness. You don't want to use this. */ - if (reg.left_str (1) == "F") + if (reg.left_string (1) == "F") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-1); } - if (reg.left_str (2) == "EE") + if (reg.left_string (2) == "EE") { - Molecule d = fm->find_by_name ("accordion-accDot"); + 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_molecule (d); + m.add_stencil (d); d.translate_axis (-0.8 * staff_space PT, X_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-2); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-2); } - if (reg.left_str (1) == "E") + if (reg.left_string (1) == "E") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (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_str (1) == "T") + Stencil r = fm->find_by_name ("accordion.accStdbase"); + m.add_stencil (r); + if (reg.left_string (1) == "T") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 3.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-1); } - if (reg.left_str (1) == "F") + if (reg.left_string (1) == "F") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-1); } - if (reg.left_str (1) == "M") + if (reg.left_string (1) == "M") { - Molecule d = fm->find_by_name ("accordion-accDot"); + 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_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-1); } - if (reg.left_str (1) == "E") + if (reg.left_string (1) == "E") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-1); } - if (reg.left_str (1) == "S") + if (reg.left_string (1) == "S") { - Molecule d = fm->find_by_name ("accordion-accDot"); + Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 0.5 PT, Y_AXIS); - m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + m.add_stencil (d); + reg = reg.right_string (reg.length ()-1); } } /* ugh maybe try to use regular font for S.B. and B.B and only use one font for the rectangle */ else if (sym == "SB") { - Molecule r = fm->find_by_name ("accordion-accSB"); - m.add_molecule (r); + Stencil r = fm->find_by_name ("accordion.accSB"); + m.add_stencil (r); } else if (sym == "BB") { - Molecule r = fm->find_by_name ("accordion-accBB"); - m.add_molecule (r); + Stencil r = fm->find_by_name ("accordion.accBB"); + m.add_stencil (r); } else if (sym == "OldEE") { - Molecule r = fm->find_by_name ("accordion-accOldEE"); - m.add_molecule (r); + Stencil r = fm->find_by_name ("accordion.accOldEE"); + m.add_stencil (r); } else if (sym == "OldEES") { - Molecule r = fm->find_by_name ("accordion-accOldEES"); - m.add_molecule (r); + Stencil r = fm->find_by_name ("accordion.accOldEES"); + m.add_stencil (r); } return m; } -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 wid = scm_make_real (w); + SCM sl = scm_make_real (s); + SCM thick = scm_make_real (t); SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"), - wid, sl, thick, SCM_UNDEFINED); + wid, sl, thick, SCM_UNDEFINED); - Box b (Interval (0, w + sqrt (sqr(t/s) + sqr (t))), + Box b (Interval (0, w + sqrt (sqr (t/s) + sqr (t))), Interval (0, w * s)); - return Molecule (b, slashnodot); // http://slashnodot.org + 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 protude, 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; + b[other] = Interval (-1, 1) * thick * 0.5; - Molecule m = filledbox (b); + 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 (protude)); + oi *= sign (protude); 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; } -/* - 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}.") +Stencil +Lookup::triangle (Interval iv, Real thick, Real protude) { - 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") ; + Box b ; + b[X_AXIS] = Interval (0, iv.length()); + b[Y_AXIS] = Interval (0 ? protude); + + Offset z1(iv[LEFT], 0); + Offset z2(iv[RIGHT], 0); + Offset z3((z1 + z2)[X_AXIS]/2, protude); - return Lookup::bracket ((Axis)gh_scm2int (a), ly_scm2interval (iv), - gh_scm2double (t), - gh_scm2double (p)).smobbed_copy (); + /* + TODO: move Triangle to Line_interface ? + */ + Stencil tri = Line_interface::make_line (thick, z1, z2); + tri.add_stencil (Line_interface::make_line (thick, z2, z3)); + tri.add_stencil (Line_interface::make_line (thick, z3, z1)); + + return tri; } - +