X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=567cb9dd6d8f4e9d3748bc063e3cb3437449dda8;hb=d1ddb3de33c8811b914cccbafdf82549c4e76034;hp=08444bfd8d17adfbf26f8fbdf9d5e8832b003678;hpb=48eb640005f5abb84b3d6f8db2e1704d4bff7645;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 08444bfd8d..567cb9dd6d 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,12 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys Jan Nieuwenhuizen */ + +#include "lookup.hh" + #include -#include +#include #include "line-interface.hh" #include "warn.hh" @@ -18,10 +21,7 @@ #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" -#include "stencil.hh" -#include "lookup.hh" #include "font-metric.hh" -#include "interval.hh" Stencil Lookup::dot (Offset p, Real radius) @@ -37,8 +37,6 @@ Lookup::dot (Offset p, Real radius) return Stencil (box, at); } - - /* * Horizontal Slope: * @@ -49,89 +47,89 @@ Lookup::dot (Offset p, Real radius) * / | v * | / * | / - * (0,0) x /slope=dy/dx + * (0, 0)x /slope = dy/dx * | / * |/ * * <-----> * width */ -Stencil -Lookup::beam (Real slope, Real width, Real thick, Real blot) +Stencil +Lookup::beam (Real slope, Real width, Real thick, Real blot) { - Real height = slope * width; - Real min_y = (0 ? height) + thick/2; + Real height = slope * width; + Real min_y = min (0., height) - thick / 2; + Real max_y = max (0., height) + thick / 2; Box b (Interval (0, width), Interval (min_y, max_y)); - + SCM at = scm_list_n (ly_symbol2scm ("beam"), - scm_make_real (width), - scm_make_real (slope), - scm_make_real (thick), - scm_make_real (blot), - SCM_UNDEFINED); + scm_make_real (width), + scm_make_real (slope), + scm_make_real (thick), + scm_make_real (blot), + SCM_UNDEFINED); return Stencil (b, at); } Stencil -Lookup::dashed_slur (Bezier b, Real thick, Real dash) +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 = scm_cons (ly_offset2scm (b.control_[i]), l); } SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"), - scm_make_real (thick), - scm_make_real (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 Stencil (box, at); + Box box (Interval (0, 0), Interval (0, 0)); + return Stencil (box, at); } - - Stencil Lookup::horizontal_line (Interval w, Real th) { SCM at = scm_list_n (ly_symbol2scm ("horizontal-line"), - scm_make_real (w[LEFT]), + scm_make_real (w[LEFT]), scm_make_real (w[RIGHT]), scm_make_real (th), SCM_UNDEFINED); - - Box box ; + Box box; box[X_AXIS] = w; - box[Y_AXIS] = Interval (-th/2,th/2); + box[Y_AXIS] = Interval (-th / 2, th / 2); return Stencil (box, at); } - Stencil -Lookup::blank (Box b) +Lookup::blank (Box b) { return Stencil (b, scm_makfrom0str ("")); } Stencil -Lookup::filled_box (Box b) +Lookup::filled_box (Box b) { - SCM at = (scm_list_n (ly_symbol2scm ("filledbox"), - 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 Stencil (b,at); + SCM at = (scm_list_n (ly_symbol2scm ("filledbox"), + 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 Stencil (b, at); } /* @@ -155,7 +153,7 @@ Lookup::filled_box (Box b) * | | | | | * | | | * x\_____/______________\_____/|_____v - * |(0,0) | + * |(0, 0) | * | | * | | * |<-------------------------->| @@ -181,11 +179,9 @@ Lookup::round_filled_box (Box b, Real blotdiameter) scm_make_real (blotdiameter), SCM_UNDEFINED)); - return Stencil (b,at); + return Stencil (b, at); } - - /* * Create Stencil that represents a filled polygon with round edges. * @@ -312,6 +308,7 @@ Lookup::round_filled_polygon (Array points, Real blotdiameter) SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"), ly_quote_scm (shrinked_points_scm), scm_make_real (blotdiameter), + SCM_BOOL_T, SCM_UNDEFINED); Stencil polygon = Stencil (box, polygon_scm); @@ -319,10 +316,9 @@ Lookup::round_filled_polygon (Array points, Real blotdiameter) return polygon; } - /* TODO: deprecate? - */ +*/ Stencil Lookup::frame (Box b, Real thick, Real blot) { @@ -330,14 +326,14 @@ Lookup::frame (Box b, Real thick, Real blot) Direction d = LEFT; for (Axis a = X_AXIS; a < NO_AXES; a = Axis (a + 1)) { - Axis o = Axis ((a+1)%NO_AXES); + 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; - + edges[o][DOWN] = b[o][DOWN] - thick / 2; + edges[o][UP] = b[o][UP] + thick / 2; + m.add_stencil (round_filled_box (edges, blot)); } while (flip (&d) != LEFT); @@ -346,45 +342,44 @@ Lookup::frame (Box b, Real thick, Real blot) } /* - Make a smooth curve along the points - */ + Make a smooth curve along the points +*/ Stencil -Lookup::slur (Bezier curve, Real curvethick, Real linethick) +Lookup::slur (Bezier curve, Real curvethick, Real linethick) { 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; + 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=4; i--;) + for (int i = 4; i--;) scontrols[ i ] = ly_offset2scm (back.control_[i]); - for (int i=4 ; i--;) - scontrols[i+4] = ly_offset2scm (curve.control_[i]); + for (int 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}; + 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--;) + for (int i = 8; i--;) { list = scm_cons (scontrols[indices[i]], list); } - - + SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"), - ly_quote_scm (list), - scm_make_real (linethick), - SCM_UNDEFINED)); + ly_quote_scm (list), + scm_make_real (linethick), + SCM_UNDEFINED)); Box b (curve.extent (X_AXIS), - curve.extent (Y_AXIS)); + curve.extent (Y_AXIS)); b[X_AXIS].unite (back.extent (X_AXIS)); b[Y_AXIS].unite (back.extent (Y_AXIS)); @@ -419,8 +414,8 @@ Stencil Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) { /* - Need the weird order b.o. the way PS want its arguments - */ + 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); @@ -447,9 +442,9 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) /* TODO: junk me. - */ +*/ Stencil -Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) +Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { Stencil m; String sym = ly_scm2string (scm_car (s)); @@ -457,193 +452,193 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) if (sym == "Discant") { - Stencil r = fm->find_by_name ("accordion-accDiscant"); + Stencil r = fm->find_by_name ("accordion.accDiscant"); m.add_stencil (r); if (reg.left_string (1) == "F") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } int eflag = 0x00; if (reg.left_string (3) == "EEE") { eflag = 0x07; - reg = reg.right_string (reg.length ()-3); + reg = reg.right_string (reg.length () - 3); } else if (reg.left_string (2) == "EE") { eflag = 0x05; - reg = reg.right_string (reg.length ()-2); + reg = reg.right_string (reg.length () - 2); } else if (reg.left_string (2) == "Eh") { eflag = 0x04; - reg = reg.right_string (reg.length ()-2); + reg = reg.right_string (reg.length () - 2); } else if (reg.left_string (1) == "E") { eflag = 0x02; - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } if (eflag & 0x02) { - Stencil 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_stencil (d); } if (eflag & 0x04) { - Stencil 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_stencil (d); } if (eflag & 0x01) { - Stencil 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_stencil (d); } if (reg.left_string (2) == "SS") { - Stencil 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_stencil (d); d.translate_axis (-0.8 * staff_space PT, X_AXIS); m.add_stencil (d); - reg = reg.right_string (reg.length ()-2); + reg = reg.right_string (reg.length () - 2); } if (reg.left_string (1) == "S") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } } else if (sym == "Freebase") { - Stencil r = fm->find_by_name ("accordion-accFreebase"); + Stencil r = fm->find_by_name ("accordion.accFreebase"); m.add_stencil (r); if (reg.left_string (1) == "F") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } if (reg == "E") { - Stencil 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_stencil (d); } } else if (sym == "Bayanbase") { - Stencil r = fm->find_by_name ("accordion-accBayanbase"); + Stencil r = fm->find_by_name ("accordion.accBayanbase"); m.add_stencil (r); if (reg.left_string (1) == "T") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + 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") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } if (reg.left_string (2) == "EE") { - Stencil 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_stencil (d); d.translate_axis (-0.8 * staff_space PT, X_AXIS); m.add_stencil (d); - reg = reg.right_string (reg.length ()-2); + reg = reg.right_string (reg.length () - 2); } if (reg.left_string (1) == "E") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } } else if (sym == "Stdbase") { - Stencil r = fm->find_by_name ("accordion-accStdbase"); + Stencil r = fm->find_by_name ("accordion.accStdbase"); m.add_stencil (r); if (reg.left_string (1) == "T") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } if (reg.left_string (1) == "F") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } if (reg.left_string (1) == "M") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } if (reg.left_string (1) == "E") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-1); + reg = reg.right_string (reg.length () - 1); } if (reg.left_string (1) == "S") { - Stencil 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_stencil (d); - reg = reg.right_string (reg.length ()-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 for the rectangle */ else if (sym == "SB") { - Stencil r = fm->find_by_name ("accordion-accSB"); + Stencil r = fm->find_by_name ("accordion.accSB"); m.add_stencil (r); } else if (sym == "BB") { - Stencil r = fm->find_by_name ("accordion-accBB"); + Stencil r = fm->find_by_name ("accordion.accBB"); m.add_stencil (r); } else if (sym == "OldEE") { - Stencil r = fm->find_by_name ("accordion-accOldEE"); + Stencil r = fm->find_by_name ("accordion.accOldEE"); m.add_stencil (r); } else if (sym == "OldEES") { - Stencil r = fm->find_by_name ("accordion-accOldEES"); + Stencil r = fm->find_by_name ("accordion.accOldEES"); m.add_stencil (r); } - return m; + return m; } Stencil @@ -653,32 +648,31 @@ Lookup::repeat_slash (Real w, Real s, Real t) 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 Stencil (b, slashnodot); // http://slashnodot.org } - 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; - - Stencil 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); + 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)); + b[a] = Interval (iv[DOWN], iv[DOWN] + thick); + m.add_stencil (round_filled_box (b, blot)); return m; } @@ -686,18 +680,17 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) Stencil Lookup::triangle (Interval iv, Real thick, Real protude) { - Box b ; - b[X_AXIS] = Interval (0, iv.length()); - b[Y_AXIS] = Interval (0 ? protude); - + Box b; + b[X_AXIS] = Interval (0, iv.length ()); + b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude)); - Offset z1(iv[LEFT], 0); - Offset z2(iv[RIGHT], 0); - Offset z3(z2[X_AXIS]/2, protude); + 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)); @@ -705,41 +698,3 @@ Lookup::triangle (Interval iv, Real thick, Real protude) return tri; } - -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 (scm_is_number (t), a, SCM_ARG3, __FUNCTION__, "number") ; - SCM_ASSERT_TYPE (scm_is_number (p), a, SCM_ARG4, __FUNCTION__, "number") ; - - - return Lookup::bracket ((Axis)scm_to_int (a), ly_scm2interval (iv), - scm_to_double (t), - scm_to_double (p), - 0.95 * scm_to_double (t)).smobbed_copy (); -} - - - -LY_DEFINE (ly_filled_box ,"ly:round-filled-box", - 3, 0, 0, - (SCM xext, SCM yext, SCM blot), - "Make a @code{Stencil} " - "that prints a black 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 (scm_is_number (blot), blot, SCM_ARG3, __FUNCTION__, "number") ; - - return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)), - scm_to_double (blot)).smobbed_copy (); -} -