X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=4cef41f0616a44a85adaf238d18aa15127220eb9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=91e67d1510e1fa09368bd0de640c1f234c602c5d;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 91e67d1510..4cef41f061 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,25 +3,24 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include "lookup.hh" -#include +#include #include +using namespace std; #include "line-interface.hh" #include "warn.hh" #include "dimensions.hh" #include "bezier.hh" -#include "string-convert.hh" #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" -#include "font-metric.hh" Stencil Lookup::dot (Offset p, Real radius) @@ -105,10 +104,26 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction) ly_quote_scm (l), SCM_UNDEFINED)); - Box box (Interval (0, 0), Interval (0, 0)); + Box box (b.extent (X_AXIS), b.extent (Y_AXIS)); 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) { @@ -130,7 +145,7 @@ Lookup::horizontal_line (Interval w, Real th) Stencil Lookup::blank (Box b) { - return Stencil (b, scm_makfrom0str ("")); + return Stencil (b, scm_from_locale_string ("")); } Stencil @@ -226,7 +241,7 @@ Lookup::round_filled_box (Box b, Real blotdiameter) * shrinked polygon). --jr */ Stencil -Lookup::round_filled_polygon (Array const &points, +Lookup::round_filled_polygon (vector const &points, Real blotdiameter) { /* TODO: Maybe print a warning if one of the above limitations @@ -237,10 +252,10 @@ Lookup::round_filled_polygon (Array const &points, #ifndef NDEBUG /* remove consecutive duplicate points */ - for (int i = 0; i < points.size (); i++) + for (vsize i = 0; i < points.size (); i++) { - int next_i = (i + 1) % points.size (); - Real d = (points[i] - points[next_i]).length (); + int next = (i + 1) % points.size (); + Real d = (points[i] - points[next]).length (); if (d < epsilon) programming_error ("Polygon should not have duplicate points"); } @@ -255,10 +270,10 @@ Lookup::round_filled_polygon (Array const &points, return Line_interface::make_line (blotdiameter, points[0], points[1]); /* shrink polygon in size by 0.5 * blotdiameter */ - Array shrunk_points; - shrunk_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 (); @@ -303,7 +318,7 @@ Lookup::round_filled_polygon (Array const &points, /* build scm expression and bounding box */ SCM shrunk_points_scm = SCM_EOL; Box box; - for (int i = 0; i < shrunk_points.size (); i++) + for (vsize i = 0; i < shrunk_points.size (); i++) { SCM x = scm_from_double (shrunk_points[i][X_AXIS]); SCM y = scm_from_double (shrunk_points[i][Y_AXIS]); @@ -364,9 +379,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]); /* @@ -387,6 +402,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) b[X_AXIS].unite (back.extent (X_AXIS)); b[Y_AXIS].unite (back.extent (Y_AXIS)); + b.widen (0.5 * linethick, 0.5 * linethick); return Stencil (b, at); } @@ -443,212 +459,11 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) return Stencil (b, horizontal_bend); } -/* - TODO: junk me. -*/ -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))); - - if (sym == "Discant") - { - 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"); - d.translate_axis (staff_space * 2.5 PT, Y_AXIS); - m.add_stencil (d); - 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); - } - else if (reg.left_string (2) == "EE") - { - eflag = 0x05; - reg = reg.right_string (reg.length () - 2); - } - else if (reg.left_string (2) == "Eh") - { - eflag = 0x04; - reg = reg.right_string (reg.length () - 2); - } - else if (reg.left_string (1) == "E") - { - eflag = 0x02; - reg = reg.right_string (reg.length () - 1); - } - if (eflag & 0x02) - { - 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"); - 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"); - 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"); - 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); - } - if (reg.left_string (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); - } - } - else if (sym == "Freebase") - { - 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"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.right_string (reg.length () - 1); - } - if (reg == "E") - { - 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"); - m.add_stencil (r); - if (reg.left_string (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); - } - /* 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"); - d.translate_axis (staff_space * 1.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.right_string (reg.length () - 1); - } - if (reg.left_string (2) == "EE") - { - 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); - } - if (reg.left_string (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); - } - } - else if (sym == "Stdbase") - { - 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"); - d.translate_axis (staff_space * 3.5 PT, Y_AXIS); - m.add_stencil (d); - reg = reg.right_string (reg.length () - 1); - } - if (reg.left_string (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); - } - if (reg.left_string (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); - } - if (reg.left_string (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); - } - if (reg.left_string (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); - } - } - /* 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"); - m.add_stencil (r); - } - else if (sym == "BB") - { - Stencil r = fm->find_by_name ("accordion.accBB"); - m.add_stencil (r); - } - else if (sym == "OldEE") - { - Stencil r = fm->find_by_name ("accordion.accOldEE"); - m.add_stencil (r); - } - else if (sym == "OldEES") - { - Stencil r = fm->find_by_name ("accordion.accOldEES"); - m.add_stencil (r); - } - return m; -} - Stencil Lookup::repeat_slash (Real w, Real s, Real t) { #if 0 /* TODO */ - Array points; + vector points; Real blotdiameter = 0.0; Offset p1 (0, 0); @@ -670,7 +485,7 @@ Lookup::repeat_slash (Real w, Real s, Real t) } Stencil -Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) +Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot) { Box b; Axis other = Axis ((a + 1)%2); @@ -680,8 +495,8 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real 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 (protrude)); + oi *= sign (protrude); b[other] = oi; m.add_stencil (round_filled_box (b, blot)); b[a] = Interval (iv[DOWN], iv[DOWN] + thick); @@ -691,23 +506,35 @@ Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) } Stencil -Lookup::triangle (Interval iv, Real thick, Real protude) +Lookup::triangle (Interval iv, Real thick, Real protrude) { Box b; b[X_AXIS] = Interval (0, iv.length ()); - b[Y_AXIS] = Interval (min (0., protude), max (0.0, protude)); + b[Y_AXIS] = Interval (min (0., protrude), max (0.0, protrude)); - Offset z1 (iv[LEFT], 0); - Offset z2 (iv[RIGHT], 0); - Offset z3 ((z1 + z2)[X_AXIS] / 2, protude); + vector points; + points.push_back (Offset (iv[LEFT], 0)); + points.push_back (Offset (iv[RIGHT], 0)); + points.push_back (Offset (iv.center (), protrude)); - /* - 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 points_to_line_stencil (thick, points); - return tri; } + + +Stencil +Lookup::points_to_line_stencil (Real thick, vector const &points) +{ + Stencil ret; + for (vsize i = 1; i < points.size (); i++) + { + if (points[i-1].is_sane () && points[i].is_sane ()) + { + Stencil line + = Line_interface::make_line (thick, points[i-1], points[i]); + ret.add_stencil (line); + } + } + return ret; +}