X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=d8c20c044fcd871b36f831b83adf022ed28c0c54;hb=1965ca6b70aaf2c04a25ace9ed3f1fb4e1222f5a;hp=cd5f3b8b50d6136e8c1674f11626962c4f34b6b0;hpb=be4f786099ef94bc10aa48eb706631e4c1bbf016;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index cd5f3b8b50..d8c20c044f 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,15 +3,16 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include "lookup.hh" -#include +#include #include +using namespace std; #include "line-interface.hh" #include "warn.hh" @@ -27,9 +28,9 @@ 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_from_double (p[X_AXIS]), + scm_from_double (p[Y_AXIS]), + scm_from_double (radius), SCM_UNDEFINED)); Box box; box.add_point (p - Offset (radius, radius)); @@ -37,40 +38,54 @@ Lookup::dot (Offset p, Real 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 = 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); - return Stencil (b, at); + Box b; + + Offset p; + + p = Offset (0, thick / 2); + b.add_point (p); + p += Offset (1, -1) * (blot / 2); + + SCM points = SCM_EOL; + + points = scm_cons (scm_from_double (p[X_AXIS]), + scm_cons (scm_from_double (p[Y_AXIS]), + points)); + + p = Offset (0, -thick / 2); + b.add_point (p); + p += Offset (1, 1) * (blot / 2); + + points = scm_cons (scm_from_double (p[X_AXIS]), + scm_cons (scm_from_double (p[Y_AXIS]), + points)); + + p = Offset (width, width * slope - thick / 2); + b.add_point (p); + p += Offset (-1, 1) * (blot / 2); + + points = scm_cons (scm_from_double (p[X_AXIS]), + scm_cons (scm_from_double (p[Y_AXIS]), + points)); + + p = Offset (width, width * slope + thick / 2); + b.add_point (p); + p += Offset (-1, -1) * (blot / 2); + + points = scm_cons (scm_from_double (p[X_AXIS]), + scm_cons (scm_from_double (p[Y_AXIS]), + points)); + + SCM expr = scm_list_n (ly_symbol2scm ("polygon"), + ly_quote_scm (points), + scm_from_double (blot), + SCM_BOOL_T, + SCM_UNDEFINED); + + return Stencil (b, expr); } Stencil @@ -82,14 +97,12 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction) Real off = dash_period - on; for (int i = 4; i--;) - { - l = scm_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"), - scm_make_real (thick), - scm_make_real (on), - scm_make_real (off), + scm_from_double (thick), + scm_from_double (on), + scm_from_double (off), ly_quote_scm (l), SCM_UNDEFINED)); @@ -97,15 +110,31 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction) return Stencil (box, at); } +Stencil +Lookup::rotated_box (Real slope, Real width, Real thick, Real blot) +{ + vector pts; + Offset rot (1, slope); + + thick -= 2*blot; + width -= 2*blot; + rot /= sqrt (1 + slope*slope); + pts.push_back (Offset (0, -thick / 2) * rot); + pts.push_back (Offset (width, -thick / 2) * rot); + pts.push_back (Offset (width, thick / 2) * rot); + pts.push_back (Offset (0, thick / 2) * rot); + return Lookup::round_filled_polygon (pts, blot); +} + Stencil Lookup::horizontal_line (Interval w, Real th) { SCM at = scm_list_n (ly_symbol2scm ("draw-line"), - scm_make_real (th), - scm_make_real (w[LEFT]), - scm_make_real (0), - scm_make_real (w[RIGHT]), - scm_make_real (0), + scm_from_double (th), + scm_from_double (w[LEFT]), + scm_from_double (0), + scm_from_double (w[RIGHT]), + scm_from_double (0), SCM_UNDEFINED); Box box; @@ -124,14 +153,7 @@ Lookup::blank (Box b) Stencil 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); + return round_filled_box (b, 0.0); } /* @@ -165,20 +187,16 @@ Stencil Lookup::round_filled_box (Box b, Real blotdiameter) { if (b.x ().length () < blotdiameter) - { - blotdiameter = b.x ().length (); - } + blotdiameter = b.x ().length (); if (b.y ().length () < blotdiameter) - { - blotdiameter = b.y ().length (); - } + blotdiameter = b.y ().length (); 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_from_double (-b[X_AXIS][LEFT]), + scm_from_double (b[X_AXIS][RIGHT]), + scm_from_double (-b[Y_AXIS][DOWN]), + scm_from_double (b[Y_AXIS][UP]), + scm_from_double (blotdiameter), SCM_UNDEFINED)); return Stencil (b, at); @@ -225,23 +243,25 @@ Lookup::round_filled_box (Box b, Real blotdiameter) * shrinked polygon). --jr */ Stencil -Lookup::round_filled_polygon (Array points, Real blotdiameter) +Lookup::round_filled_polygon (vector const &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 ();) + +#ifndef NDEBUG + /* remove consecutive duplicate points */ + for (vsize i = 0; i < points.size (); i++) { int next_i = (i + 1) % points.size (); Real d = (points[i] - points[next_i]).length (); if (d < epsilon) - points.del (next_i); - else - i++; + programming_error ("Polygon should not have duplicate points"); } +#endif /* special cases: degenerated polygons */ if (points.size () == 0) @@ -252,10 +272,10 @@ Lookup::round_filled_polygon (Array points, Real blotdiameter) 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 ()); + vector shrunk_points; + shrunk_points.resize (points.size ()); bool ccw = 1; // true, if three adjacent points are counterclockwise ordered - for (int i = 0; i < points.size (); i++) + for (vsize i = 0; i < points.size (); i++) { int i0 = i; int i1 = (i + 1) % points.size (); @@ -294,27 +314,27 @@ Lookup::round_filled_polygon (Array points, Real blotdiameter) } else p13 = (0.5 * blotdiameter / d) * p13n; - shrinked_points[i1] = p1 + ((ccw) ? p13 : -p13); + shrunk_points[i1] = p1 + ((ccw) ? p13 : -p13); } /* build scm expression and bounding box */ - SCM shrinked_points_scm = SCM_EOL; + SCM shrunk_points_scm = SCM_EOL; Box box; - for (int i = 0; i < shrinked_points.size (); i++) + for (vsize i = 0; i < shrunk_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)); + SCM x = scm_from_double (shrunk_points[i][X_AXIS]); + SCM y = scm_from_double (shrunk_points[i][Y_AXIS]); + shrunk_points_scm = scm_cons (x, scm_cons (y, shrunk_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), + ly_quote_scm (shrunk_points_scm), + scm_from_double (blotdiameter), SCM_BOOL_T, SCM_UNDEFINED); Stencil polygon = Stencil (box, polygon_scm); - shrinked_points.clear (); + shrunk_points.clear (); return polygon; } @@ -361,9 +381,9 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) SCM scontrols[8]; - for (int i = 4; i--;) - scontrols[ i ] = ly_offset2scm (back.control_[i]); - for (int i = 4; i--;) + for (int i = 0; i < 4; i++) + scontrols[i] = ly_offset2scm (back.control_[i]); + for (int i = 0; i < 4; i++) scontrols[i + 4] = ly_offset2scm (curve.control_[i]); /* @@ -372,13 +392,11 @@ 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--;) - { - list = scm_cons (scontrols[indices[i]], list); - } + 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_from_double (linethick), SCM_UNDEFINED)); Box b (curve.extent (X_AXIS), curve.extent (Y_AXIS)); @@ -430,7 +448,7 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"), ly_quote_scm (list), - scm_make_real (0.0), + scm_from_double (0.0), SCM_UNDEFINED); Interval x_extent = top_curve.extent (X_AXIS); @@ -449,40 +467,40 @@ Stencil Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { Stencil m; - String sym = ly_scm2string (scm_car (s)); - String reg = ly_scm2string (scm_car (scm_cdr (s))); + string sym = ly_scm2string (scm_car (s)); + string reg = ly_scm2string (scm_car (scm_cdr (s))); if (sym == "Discant") { Stencil r = fm->find_by_name ("accordion.accDiscant"); m.add_stencil (r); - if (reg.left_string (1) == "F") + if (reg.substr (0, 1) == "F") { 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.substr (1); } int eflag = 0x00; - if (reg.left_string (3) == "EEE") + if (reg.substr (0, 3) == "EEE") { eflag = 0x07; - reg = reg.right_string (reg.length () - 3); + reg = reg.substr (3); } - else if (reg.left_string (2) == "EE") + else if (reg.substr (0, 2) == "EE") { eflag = 0x05; - reg = reg.right_string (reg.length () - 2); + reg = reg.substr (2); } - else if (reg.left_string (2) == "Eh") + else if (reg.substr (0, 2) == "Eh") { eflag = 0x04; - reg = reg.right_string (reg.length () - 2); + reg = reg.substr (2); } - else if (reg.left_string (1) == "E") + else if (reg.substr (0, 1) == "E") { eflag = 0x02; - reg = reg.right_string (reg.length () - 1); + reg = reg.substr (1); } if (eflag & 0x02) { @@ -504,7 +522,7 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) d.translate_axis (-0.8 * staff_space PT, X_AXIS); m.add_stencil (d); } - if (reg.left_string (2) == "SS") + if (reg.substr (0, 2) == "SS") { Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (0.5 * staff_space PT, Y_AXIS); @@ -512,26 +530,26 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) 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.substr (2); } - if (reg.left_string (1) == "S") + if (reg.substr (0, 1) == "S") { 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.substr (1); } } else if (sym == "Freebase") { Stencil r = fm->find_by_name ("accordion.accFreebase"); m.add_stencil (r); - if (reg.left_string (1) == "F") + if (reg.substr (0, 1) == "F") { 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.substr (1); } if (reg == "E") { @@ -544,22 +562,22 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { Stencil r = fm->find_by_name ("accordion.accBayanbase"); m.add_stencil (r); - if (reg.left_string (1) == "T") + if (reg.substr (0, 1) == "T") { 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.substr (1); } /* include 4' reed just for completeness. You don't want to use this. */ - if (reg.left_string (1) == "F") + if (reg.substr (0, 1) == "F") { 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.substr (1); } - if (reg.left_string (2) == "EE") + if (reg.substr (0, 2) == "EE") { Stencil d = fm->find_by_name ("accordion.accDot"); d.translate_axis (staff_space * 0.5 PT, Y_AXIS); @@ -567,55 +585,55 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) 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.substr (2); } - if (reg.left_string (1) == "E") + if (reg.substr (0, 1) == "E") { 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.substr (1); } } else if (sym == "Stdbase") { Stencil r = fm->find_by_name ("accordion.accStdbase"); m.add_stencil (r); - if (reg.left_string (1) == "T") + if (reg.substr (0, 1) == "T") { 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.substr (1); } - if (reg.left_string (1) == "F") + if (reg.substr (0, 1) == "F") { 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.substr (1); } - if (reg.left_string (1) == "M") + if (reg.substr (0, 1) == "M") { 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.substr (1); } - if (reg.left_string (1) == "E") + if (reg.substr (0, 1) == "E") { 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.substr (1); } - if (reg.left_string (1) == "S") + if (reg.substr (0, 1) == "S") { 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.substr (1); } } /* ugh maybe try to use regular font for S.B. and B.B and only use one font @@ -646,22 +664,19 @@ Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) Stencil Lookup::repeat_slash (Real w, Real s, Real t) { -#if 0 - // TODO - Array points ; +#if 0 /* TODO */ + vector points; Real blotdiameter = 0.0; - Offset p1(0, 0); - Offset p2(w, w*s); - - - + Offset p1 (0, 0); + Offset p2 (w, w * s); + return Lookup::round_filled_polygon (points, blotdiameter); #endif - - SCM wid = scm_make_real (w); - SCM sl = scm_make_real (s); - SCM thick = scm_make_real (t); + + SCM wid = scm_from_double (w); + SCM sl = scm_from_double (s); + SCM thick = scm_from_double (t); SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"), wid, sl, thick, SCM_UNDEFINED);