X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=2ebe0baa072212e1fb9dcdd4c510c6cfa569f3da;hb=508a9588e53be24ee4d4fd0c905152b4929d85ea;hp=4bb7c2d8a6be10202d00f0d628797283a34d0c38;hpb=b72fc08ee82eba965f91f2569ab4e43361668641;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 4bb7c2d8a6..2ebe0baa07 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,16 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys Jan Nieuwenhuizen - - TODO - Glissando */ #include #include +#include "line-interface.hh" #include "warn.hh" #include "dimensions.hh" #include "bezier.hh" @@ -20,12 +18,12 @@ #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" -#include "molecule.hh" +#include "stencil.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"), @@ -36,7 +34,7 @@ Lookup::dot (Offset p, Real radius) Box box; box.add_point (p - Offset (radius, radius)); box.add_point (p + Offset (radius, radius)); - return Molecule (box, at); + return Stencil (box, at); } @@ -58,7 +56,7 @@ Lookup::dot (Offset p, Real radius) * <-----> * width */ -Molecule +Stencil Lookup::beam (Real slope, Real width, Real thick, Real blot) { Real height = slope * width; @@ -74,10 +72,10 @@ Lookup::beam (Real slope, Real width, Real thick, Real blot) gh_double2scm (thick), gh_double2scm (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; @@ -94,32 +92,12 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash) SCM_UNDEFINED)); Box box (Interval (0,0),Interval (0,0)); - return Molecule (box, at); + return Stencil (box, at); } -Molecule -Lookup::line (Real th, Offset from, Offset to) -{ - SCM at = scm_list_n (ly_symbol2scm ("draw-line"), - gh_double2scm (th), - gh_double2scm (from[X_AXIS]), - gh_double2scm (from[Y_AXIS]), - gh_double2scm (to[X_AXIS]), - gh_double2scm (to[Y_AXIS]), - SCM_UNDEFINED); - - Box box; - box.add_point (from); - box.add_point (to); - - 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"), @@ -133,17 +111,17 @@ Lookup::horizontal_line (Interval w, Real th) 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_makfrom0str ("")); + return Stencil (b, scm_makfrom0str ("")); } -Molecule +Stencil Lookup::filled_box (Box b) { SCM at = (scm_list_n (ly_symbol2scm ("filledbox"), @@ -153,7 +131,7 @@ Lookup::filled_box (Box b) gh_double2scm (b[Y_AXIS][UP]), SCM_UNDEFINED)); - return Molecule (b,at); + return Stencil (b,at); } /* @@ -181,9 +159,9 @@ Lookup::filled_box (Box b) * | | * | | * |<-------------------------->| - * Box extent(X_AXIS) + * Box extent (X_AXIS) */ -Molecule +Stencil Lookup::round_filled_box (Box b, Real blotdiameter) { if (b.x ().length () < blotdiameter) @@ -205,13 +183,13 @@ Lookup::round_filled_box (Box b, Real blotdiameter) gh_double2scm (blotdiameter), SCM_UNDEFINED)); - return Molecule (b,at); + return Stencil (b,at); } /* - * Create Molecule that represents a filled polygon with round edges. + * Create Stencil that represents a filled polygon with round edges. * * LIMITATIONS: * @@ -224,12 +202,12 @@ Lookup::round_filled_box (Box b, Real blotdiameter) * 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 +218,7 @@ Lookup::round_filled_box (Box b, Real blotdiameter) * 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 +228,7 @@ Lookup::round_filled_box (Box b, Real blotdiameter) * 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 +249,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 +287,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 @@ -338,7 +316,7 @@ Lookup::round_filled_polygon (Array points, Real blotdiameter) gh_double2scm (blotdiameter), SCM_UNDEFINED); - Molecule polygon = Molecule (box, polygon_scm); + Stencil polygon = Stencil (box, polygon_scm); shrinked_points.clear (); return polygon; } @@ -346,13 +324,11 @@ Lookup::round_filled_polygon (Array points, Real blotdiameter) /* TODO: deprecate? - - should use rounded corners. */ -Molecule +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)) { @@ -364,7 +340,7 @@ Lookup::frame (Box b, Real thick, Real blot) edges[o][DOWN] = b[o][DOWN] - thick/2; edges[o][UP] = b[o][UP] + thick/2; - m.add_molecule (round_filled_box (edges, blot)); + m.add_stencil (round_filled_box (edges, blot)); } while (flip (&d) != LEFT); } @@ -374,7 +350,7 @@ Lookup::frame (Box b, Real thick, Real blot) /* 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 (); @@ -409,13 +385,13 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) ly_quote_scm (list), gh_double2scm (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); } /* @@ -441,7 +417,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) * | * */ -Molecule +Stencil Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) { /* @@ -468,28 +444,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); + return Stencil (b, horizontal_bend); } /* TODO: junk me. */ -Molecule +Stencil Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { - Molecule m; + Stencil m; String sym = ly_scm2string (ly_car (s)); String reg = ly_scm2string (ly_car (ly_cdr (s))); if (sym == "Discant") { - Molecule r = fm->find_by_name ("accordion-accDiscant"); - m.add_molecule (r); + 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; @@ -515,135 +491,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); } } @@ -651,28 +627,28 @@ 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); @@ -681,35 +657,35 @@ Lookup::repeat_slash (Real w, Real s, Real t) SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"), wid, sl, thick, SCM_UNDEFINED); - Box b (Interval (0, w + sqrt (sqr(t/s) + sqr (t))), + 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 +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 = round_filled_box (b, blot); + 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_molecule (round_filled_box (b, blot)); + m.add_stencil (round_filled_box (b, blot)); b[a] = Interval (iv[DOWN], iv[DOWN] +thick); - m.add_molecule (round_filled_box (b,blot)); + m.add_stencil (round_filled_box (b,blot)); return m; } -Molecule +Stencil Lookup::triangle (Interval iv, Real thick, Real protude) { Box b ; @@ -718,27 +694,27 @@ Lookup::triangle (Interval iv, Real thick, Real protude) SCM s = scm_list_n (ly_symbol2scm ("symmetric-x-triangle"), gh_double2scm (thick), - gh_double2scm (iv.length()), + gh_double2scm (iv.length ()), gh_double2scm (protude), SCM_UNDEFINED); - return Molecule (b, s); + return Stencil (b, s); } /* TODO: use rounded boxes. */ -LY_DEFINE(ly_bracket ,"ly:bracket", +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(is_axis (a), a, SCM_ARG1, __FUNCTION__, "axis") ; - SCM_ASSERT_TYPE(is_number_pair (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") ; + SCM_ASSERT_TYPE (is_axis (a), a, SCM_ARG1, __FUNCTION__, "axis") ; + SCM_ASSERT_TYPE (is_number_pair (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") ; return Lookup::bracket ((Axis)gh_scm2int (a), ly_scm2interval (iv), @@ -749,14 +725,17 @@ LY_DEFINE(ly_bracket ,"ly:bracket", -LY_DEFINE(ly_filled_box ,"ly:round-filled-box", +LY_DEFINE (ly_filled_box ,"ly:round-filled-box", 3, 0, 0, (SCM xext, SCM yext, SCM blot), - "Make a filled-box of dimensions @var{xext}, @var{yext} and roundness @var{blot}.") + "Make a @code{Stencil} " + " that prints a filled-box of dimensions @var{xext}, " + "@var{yext} and roundness @var{blot}." + ) { - SCM_ASSERT_TYPE(is_number_pair (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ; - SCM_ASSERT_TYPE(is_number_pair (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ; - SCM_ASSERT_TYPE(gh_number_p (blot), blot, SCM_ARG3, __FUNCTION__, "number") ; + SCM_ASSERT_TYPE (is_number_pair (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ; + SCM_ASSERT_TYPE (is_number_pair (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ; + SCM_ASSERT_TYPE (gh_number_p (blot), blot, SCM_ARG3, __FUNCTION__, "number") ; return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)), gh_scm2double (blot)).smobbed_copy ();