X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=f012ca6930259a173d3964d9b6941ac6e4502b1f;hb=4300e287a18cbc4569c79f8e8445609dc7d4546a;hp=0f7d9b8d767c47ac2d6c51b262afa085a0c417c6;hpb=f7668e993b09e736286258276667e86e16dab557;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 0f7d9b8d76..f012ca6930 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,16 +3,17 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 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,122 +21,122 @@ #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 +Stencil Lookup::dot (Offset p, Real radius) { SCM at = (scm_list_n (ly_symbol2scm ("dot"), - gh_double2scm (p[X_AXIS]), - gh_double2scm (p[Y_AXIS]), - gh_double2scm (radius), + 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 Molecule (box, at); + return Stencil (box, at); } -Molecule -Lookup::beam (Real slope, Real width, Real thick) + + +/* + * 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 -Lookup::dashed_slur (Bezier b, Real thick, Real dash) + +Stencil +Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction) { SCM l = SCM_EOL; - - for (int i= 4; i -- ;) + + Real on = dash_fraction * dash_period; + Real off = dash_period - on; + + 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), - ly_quote_scm (l), - SCM_UNDEFINED)); + scm_make_real (thick), + scm_make_real (on), + scm_make_real (off), + ly_quote_scm (l), + SCM_UNDEFINED)); - Box box (Interval (0,0),Interval (0,0)); - return Molecule (box, at); + Box box (Interval (0, 0), Interval (0, 0)); + return Stencil (box, at); } -Molecule -Lookup::line (Real th, Offset f, Offset t) -{ - 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); - Box box; - box.add_point (f); - box.add_point (t); - box[X_AXIS].widen (th/2); - box[Y_AXIS].widen (th/2); - - return Molecule (box, at); -} - -Molecule +Stencil Lookup::horizontal_line (Interval w, Real th) { SCM at = scm_list_n (ly_symbol2scm ("horizontal-line"), - gh_double2scm (w[LEFT]), - gh_double2scm (w[RIGHT]), - gh_double2scm (th), + scm_make_real (w[LEFT]), + scm_make_real (w[RIGHT]), + scm_make_real (th), SCM_UNDEFINED); 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); } -Molecule +Stencil Lookup::blank (Box b) { - return Molecule (b, scm_makfrom0str ("")); + 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); } /* @@ -159,59 +160,39 @@ Lookup::filledbox (Box b) * | | | | | * | | | * x\_____/______________\_____/|_____v - * |(0,0) | + * |(0, 0) | * | | * | | * |<-------------------------->| - * 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); } -LY_DEFINE(ly_round_filled_box, "ly:round-filled-box", - 2, 0,0, - (SCM b, SCM blot), - "Make a box with rounded corners. B is a pair of number-pairs, and BLOT a number") -{ - SCM_ASSERT_TYPE(gh_number_p (blot), blot, SCM_ARG2, __FUNCTION__, "number") ; - SCM_ASSERT_TYPE(gh_pair_p (b), b, SCM_ARG4, __FUNCTION__, "pair") ; - - SCM_ASSERT_TYPE(ly_number_pair_p (gh_car (b)), gh_car (b), SCM_ARG1, __FUNCTION__, "number-pair") ; - SCM_ASSERT_TYPE(ly_number_pair_p (gh_cdr (b)), gh_cdr (b), SCM_ARG1, __FUNCTION__, "number-pair") ; - - Interval x (ly_scm2interval (gh_car (b))); - Interval y (ly_scm2interval (gh_cdr (b))); - - return Lookup::roundfilledbox (Box (x,y), - gh_scm2double (blot)).smobbed_copy(); - -} /* - * Create Molecule that represents a filled polygon with round edges. + * Create Stencil that represents a filled polygon with round edges. * * LIMITATIONS: * @@ -224,12 +205,12 @@ LY_DEFINE(ly_round_filled_box, "ly:round-filled-box", * 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 @@ -240,7 +221,7 @@ LY_DEFINE(ly_round_filled_box, "ly:round-filled-box", * 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 @@ -250,7 +231,7 @@ LY_DEFINE(ly_round_filled_box, "ly:round-filled-box", * postscript routine in the backend effectively does, but on the * shrinked polygon). --jr */ -Molecule +Stencil Lookup::round_filled_polygon (Array points, Real blotdiameter) { /* TODO: Maybe print a warning if one of the above limitations @@ -271,11 +252,11 @@ Lookup::round_filled_polygon (Array points, Real blotdiameter) /* special cases: degenerated polygons */ if (points.size () == 0) - return Molecule (); + return Stencil (); if (points.size () == 1) return dot (points[0], 0.5 * blotdiameter); 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 shrinked_points; @@ -309,7 +290,7 @@ Lookup::round_filled_polygon (Array points, Real blotdiameter) 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 @@ -328,25 +309,29 @@ Lookup::round_filled_polygon (Array points, Real blotdiameter) Box box; for (int i = 0; i < shrinked_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_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), - gh_double2scm (blotdiameter), + scm_make_real (blotdiameter), SCM_UNDEFINED); - Molecule polygon = Molecule (box, polygon_scm); + 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; for (Axis a = X_AXIS; a < NO_AXES; a = Axis (a + 1)) { @@ -358,18 +343,17 @@ Lookup::frame (Box b, Real thick) 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 (); @@ -384,9 +368,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]); /* @@ -394,23 +378,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); } /* @@ -436,25 +420,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); @@ -463,59 +447,28 @@ 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); + 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); + m.add_stencil (d); reg = reg.right_string (reg.length ()-1); } int eflag = 0x00; @@ -541,135 +494,135 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) } 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_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); + m.add_stencil (d); reg = reg.right_string (reg.length ()-2); } 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); + 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); + 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); + 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); + 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); + m.add_stencil (d); reg = reg.right_string (reg.length ()-1); } /* include 4' reed just for completeness. You don't want to use this. */ if (reg.left_string (1) == "F") { - 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); reg = reg.right_string (reg.length ()-1); } 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); + m.add_stencil (d); reg = reg.right_string (reg.length ()-2); } 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); + 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); + 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); + m.add_stencil (d); reg = reg.right_string (reg.length ()-1); } 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); + m.add_stencil (d); reg = reg.right_string (reg.length ()-1); } 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); + m.add_stencil (d); reg = reg.right_string (reg.length ()-1); } 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); + m.add_stencil (d); reg = reg.right_string (reg.length ()-1); } 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); + m.add_stencil (d); reg = reg.right_string (reg.length ()-1); } } @@ -677,97 +630,83 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) 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; } -Molecule +Stencil Lookup::triangle (Interval iv, Real thick, Real protude) { Box b ; - b[X_AXIS] = iv; + b[X_AXIS] = Interval (0, iv.length()); b[Y_AXIS] = Interval (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); -} - - -/* - 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") ; + Offset z1(iv[LEFT], 0); + Offset z2(iv[RIGHT], 0); + Offset z3((z1 + z2)[X_AXIS]/2, protude); + /* + 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 Lookup::bracket ((Axis)gh_scm2int (a), ly_scm2interval (iv), - gh_scm2double (t), - gh_scm2double (p)).smobbed_copy (); + return tri; } - +