X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=0f7d9b8d767c47ac2d6c51b262afa085a0c417c6;hb=f7668e993b09e736286258276667e86e16dab557;hp=e59699292d2832860d07da13db7f7e19dc6a9212;hpb=492f3643bd2a86956201c3e0c93bb1b65bcdea4e;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index e59699292d..0f7d9b8d76 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys Jan Nieuwenhuizen @@ -23,6 +23,21 @@ #include "molecule.hh" #include "lookup.hh" #include "font-metric.hh" +#include "interval.hh" + +Molecule +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_UNDEFINED)); + Box box; + box.add_point (p - Offset (radius, radius)); + box.add_point (p + Offset (radius, radius)); + return Molecule (box, at); +} Molecule Lookup::beam (Real slope, Real width, Real thick) @@ -68,13 +83,13 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash) Molecule Lookup::line (Real th, Offset f, Offset t) { - SCM at = (scm_list_n (ly_symbol2scm ("draw-line"), + 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_UNDEFINED); Box box; box.add_point (f); @@ -86,11 +101,28 @@ Lookup::line (Real th, Offset f, Offset t) return Molecule (box, at); } +Molecule +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_UNDEFINED); + + + Box box ; + box[X_AXIS] = w; + box[Y_AXIS] = Interval (-th/2,th/2); + + return Molecule (box, at); +} + Molecule Lookup::blank (Box b) { - return Molecule (b, SCM_EOL); + return Molecule (b, scm_makfrom0str ("")); } Molecule @@ -158,18 +190,169 @@ Lookup::roundfilledbox (Box b, Real blotdiameter) return Molecule (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. + * + * 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 + */ +Molecule +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 Molecule (); + if (points.size () == 1) + return dot (points[0], 0.5 * blotdiameter); + if (points.size () == 2) + return 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 = 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)); + box.add_point (points[i]); + } + SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"), + ly_quote_scm (shrinked_points_scm), + gh_double2scm (blotdiameter), + SCM_UNDEFINED); + + Molecule polygon = Molecule (box, polygon_scm); + shrinked_points.clear (); + return polygon; +} + Molecule Lookup::frame (Box b, Real thick) { Molecule 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; @@ -217,7 +400,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) } - SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"), + SCM at = (scm_list_n (ly_symbol2scm ("bezier-bow"), ly_quote_scm (list), gh_double2scm (linethick), SCM_UNDEFINED)); @@ -328,33 +511,33 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { Molecule r = fm->find_by_name ("accordion-accDiscant"); m.add_molecule (r); - if (reg.left_str (1) == "F") + if (reg.left_string (1) == "F") { Molecule 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); + 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) { @@ -376,7 +559,7 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) d.translate_axis (-0.8 * staff_space PT, X_AXIS); m.add_molecule (d); } - if (reg.left_str (2) == "SS") + if (reg.left_string (2) == "SS") { Molecule d = fm->find_by_name ("accordion-accDot"); d.translate_axis (0.5 * staff_space PT, Y_AXIS); @@ -384,26 +567,26 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) m.add_molecule (d); d.translate_axis (-0.8 * staff_space PT, X_AXIS); m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-2); + 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"); d.translate_axis (0.5 * staff_space PT, Y_AXIS); m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + 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") + if (reg.left_string (1) == "F") { Molecule 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); + reg = reg.right_string (reg.length ()-1); } if (reg == "E") { @@ -416,22 +599,22 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { Molecule r = fm->find_by_name ("accordion-accBayanbase"); m.add_molecule (r); - if (reg.left_str (1) == "T") + if (reg.left_string (1) == "T") { Molecule 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); + 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"); d.translate_axis (staff_space * 1.5 PT, Y_AXIS); m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + 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"); d.translate_axis (staff_space * 0.5 PT, Y_AXIS); @@ -439,55 +622,55 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) m.add_molecule (d); d.translate_axis (-0.8 * staff_space PT, X_AXIS); m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-2); + 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"); d.translate_axis (staff_space * 0.5 PT, Y_AXIS); m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + 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") + if (reg.left_string (1) == "T") { Molecule 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); + 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"); d.translate_axis (staff_space * 2.5 PT, Y_AXIS); m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + 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"); 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); + 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"); d.translate_axis (staff_space * 1.5 PT, Y_AXIS); m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + 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"); d.translate_axis (staff_space * 0.5 PT, Y_AXIS); m.add_molecule (d); - reg = reg.right_str (reg.length_i ()-1); + 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 @@ -551,20 +734,36 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude) return m; } +Molecule +Lookup::triangle (Interval iv, Real thick, Real protude) +{ + Box b ; + b[X_AXIS] = iv; + 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", +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}.") + "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") ; + SCM_ASSERT_TYPE(gh_number_p (p), a, SCM_ARG4, __FUNCTION__, "number") ; return Lookup::bracket ((Axis)gh_scm2int (a), ly_scm2interval (iv),