X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=222d7ebd0f280e19dfbb41c2c7ada30f0685a11e;hb=78fab0cd2b9f3f568e9b97b313e33f28d7077223;hp=22518b575d12c271c6c426d879e13d87419777d1;hpb=5a42c3ec738076a6e520e630ad837b687729a492;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 22518b575d..222d7ebd0f 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,517 +3,738 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys Jan Nieuwenhuizen - - TODO - Read spacing info from AFMs - Glissando */ - +#include #include -#include "lookup.hh" -#include "debug.hh" + +#include "line-interface.hh" +#include "warn.hh" #include "dimensions.hh" -#include "symtable.hh" -#include "scalar.hh" -#include "paper-def.hh" +#include "bezier.hh" #include "string-convert.hh" #include "file-path.hh" #include "main.hh" #include "lily-guile.hh" +#include "stencil.hh" +#include "lookup.hh" +#include "font-metric.hh" +#include "interval.hh" - -Lookup::Lookup () +Stencil +Lookup::dot (Offset p, Real radius) { - paper_l_ = 0; - symtables_p_ = new Symtables; - afm_p_ =0; + 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_UNDEFINED)); + Box box; + box.add_point (p - Offset (radius, radius)); + box.add_point (p + Offset (radius, radius)); + return Stencil (box, at); } -Lookup::Lookup (Lookup const& s) -{ - font_ = s.font_; - font_path_ = s.font_path_; - paper_l_ = s.paper_l_; - symtables_p_ = new Symtables (*s.symtables_p_); - afm_p_ = 0; -} -Lookup::Lookup (Symtables const& s) -{ - font_ = s.font_; - font_path_ = s.font_path_; - paper_l_ = 0; - symtables_p_ = new Symtables (s); - afm_p_ = 0; -} -Lookup::~Lookup () +/* + * Horizontal Slope: + * + * /| ^ + * / | | + * / | | height + * / | | + * / | v + * | / + * | / + * (0,0) x /slope=dy/dx + * | / + * |/ + * + * <-----> + * width + */ +Stencil +Lookup::beam (Real slope, Real width, Real thick, Real blot) { - delete afm_p_; - delete symtables_p_; -} + Real height = slope * width; + Real min_y = (0 ? height) + thick/2; -Molecule -Lookup::accidental (int j, bool cautionary) const -{ - Molecule m(afm_find (String ("accidentals") + String ("-") + to_str (j))); - if (cautionary) - { - m.add_at_edge(X_AXIS, LEFT, - Molecule(afm_find (String ("accidentals") + String ("-(")))) -; - m.add_at_edge(X_AXIS, RIGHT, - Molecule(afm_find (String ("accidentals") + String ("-)")))) -; - } - return m; + 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); } -void -Lookup::add (String s, Symtable*p) +Stencil +Lookup::dashed_slur (Bezier b, Real thick, Real dash) { - symtables_p_->add (s, p); -} + SCM l = SCM_EOL; -Atom -Lookup::afm_find (String s, bool warn) const -{ - if (!afm_p_) + for (int i= 4; i -- ;) { - *mlog << "[" << font_path_; - ( (Lookup*)this)->afm_p_ = new Adobe_font_metric (read_afm (font_path_)); - *mlog << "]" << flush ; - DOUT << this->afm_p_->str (); + l = scm_cons (ly_offset2scm (b.control_[i]), l); } - Adobe_font_char_metric m = afm_p_->find_char (s, warn); - Atom a; - if (m.code () < 0) - return a; - - a.dim_ = m.B_; - a.dim_[X_AXIS] *= 1 / 1000.0; - a.dim_[Y_AXIS] *= 1 / 1000.0; - Array arr; - arr.push (m.code ()); - a.lambda_ = (lambda_scm ("char", arr)); - a.str_ = "afm_find: " + s; - a.font_ = font_; - return a; + SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"), + scm_make_real (thick), + scm_make_real (dash), + ly_quote_scm (l), + SCM_UNDEFINED)); + + Box box (Interval (0,0),Interval (0,0)); + return Stencil (box, at); } -Atom -Lookup::ball (int j) const -{ - if (j > 2) - j = 2; - return afm_find (String ("balls") + String ("-") + to_str (j)); -} -Atom -Lookup::bar (String str, Real h) const +Stencil +Lookup::horizontal_line (Interval w, Real th) { - Array arr; - arr.push (h); - Atom a = (*symtables_p_) ("bars")->lookup (str); - a.lambda_ = (lambda_scm (a.str_, arr)); - a.str_ = "bar"; - a.dim_.y () = Interval (-h/2, h/2); - a.font_ = font_; - return a; -} + SCM at = scm_list_n (ly_symbol2scm ("horizontal-line"), + scm_make_real (w[LEFT]), + scm_make_real (w[RIGHT]), + scm_make_real (th), + SCM_UNDEFINED); -Atom -Lookup::beam (Real slope, Real width, Real thick) const -{ - Real height = slope * width; - Real min_y = (0 ? height) + thick/2; - Array arr; - arr.push (width); - arr.push (slope); - arr.push (thick); - - Atom a; - a.lambda_ = (lambda_scm ("beam", arr)); - a.str_ = "beam"; - a.dim_[X_AXIS] = Interval (0, width); - a.dim_[Y_AXIS] = Interval (min_y, max_y); - return a; + Box box ; + box[X_AXIS] = w; + box[Y_AXIS] = Interval (-th/2,th/2); + + return Stencil (box, at); } -Atom -Lookup::clef (String st) const + +Stencil +Lookup::blank (Box b) { - return afm_find (String ("clefs") + String ("-") + st); + return Stencil (b, scm_makfrom0str ("")); } -SCM -offset2scm (Offset o) +Stencil +Lookup::filled_box (Box b) { - return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), SCM_UNDEFINED); + 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); } -Atom -Lookup::dashed_slur (Array controls, Real thick, Real dash) const +/* + * round filled box: + * + * __________________________________ + * / \ ^ / \ ^ + * | |blot | | + * | | |dia | | | + * | |meter | | + * |\ _ _ / v \ _ _ /| | + * | | | + * | | | Box + * | <------>| | extent + * | blot | | (Y_AXIS) + * | diameter| | + * | | | + * | _ _ _ _ | | + * |/ \ / \| | + * | | | + * | | | | | + * | | | + * x\_____/______________\_____/|_____v + * |(0,0) | + * | | + * | | + * |<-------------------------->| + * Box extent (X_AXIS) + */ +Stencil +Lookup::round_filled_box (Box b, Real blotdiameter) { - assert (controls.size () == 8); - Offset d = controls[3] - controls[0]; - - Real dx = d[X_AXIS]; - Real dy = d[Y_AXIS]; - - Atom a; - a.font_ = font_; - a.dim_[X_AXIS] = Interval (0, dx); - a.dim_[Y_AXIS] = Interval (0 ? dy); - - SCM sc[4]; - for (int i=0; i< 4; i++) + if (b.x ().length () < blotdiameter) + { + programming_error (_f ("round filled box horizontal extent smaller than blot; decreasing blot")); + blotdiameter = b.x ().length (); + } + if (b.y ().length () < blotdiameter) { - sc[i] = offset2scm (controls[i]); + programming_error (_f ("round filled box vertical extent smaller than blot; decreasing blot")); + blotdiameter = b.y ().length (); } - // (lambda (o) (dashed-slur o thick dash '(stuff)) - a.lambda_ = - ly_append (ly_lambda_o (), - ly_list1 (ly_append (ly_func_o ("dashed-slur"), - gh_cons (gh_double2scm (thick), - gh_cons (gh_double2scm (dash), - ly_list1 (ly_quote_scm (gh_list (sc[0], sc[1], sc[2], sc[3], SCM_UNDEFINED)))))))); + 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_UNDEFINED)); - a.str_ = "dashed_slur"; - return a; + return Stencil (b,at); } -Atom -Lookup::dots () const -{ - return afm_find (String ("dots") + String ("-") + String ("dot")); -} + -Atom -Lookup::dynamic (String st) const -{ - return (*symtables_p_) ("dynamics")->lookup (st); -} - -Atom -Lookup::fill (Box b) const +/* + * Create Stencil 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 + */ +Stencil +Lookup::round_filled_polygon (Array points, Real blotdiameter) { - Atom a; - a.dim_ = b; - return a; -} + /* TODO: Maybe print a warning if one of the above limitations + applies to the given polygon. However, this is quite complicated + to check. */ -Atom -Lookup::flag (int j, Direction d) const -{ - char c = (d == UP) ? 'u' : 'd'; - Atom a = afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j)); - return a; -} + /* 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++; + } -void -Lookup::print () const -{ -#ifndef NPRINT - DOUT << "Lookup {\n"; - symtables_p_->print (); - DOUT << "}\n"; -#endif -} + /* special cases: degenerated polygons */ + if (points.size () == 0) + return Stencil (); + if (points.size () == 1) + return dot (points[0], 0.5 * blotdiameter); + if (points.size () == 2) + 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 ()); + 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); + } -Atom -Lookup::rest (int j, bool o) const -{ - return afm_find (String ("rests") - + String ("-") + to_str (j) + (o ? "o" : "")); + /* 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 = 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)); + box.add_point (points[i]); + } + SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"), + ly_quote_scm (shrinked_points_scm), + scm_make_real (blotdiameter), + SCM_UNDEFINED); + + Stencil polygon = Stencil (box, polygon_scm); + shrinked_points.clear (); + return polygon; } -Atom -Lookup::rule_symbol (Real height, Real width) const -{ - Atom a = (*symtables_p_) ("param")->lookup ("rule"); - Array arr; - arr.push (height); - arr.push (width); - a.lambda_ = (lambda_scm (a.str_, arr)); - a.str_ = "rule_symbol"; - a.dim_.x () = Interval (0, width); - a.dim_.y () = Interval (0, height); - return a; -} -Atom -Lookup::script (String str) const +/* + TODO: deprecate? + */ +Stencil +Lookup::frame (Box b, Real thick, Real blot) { - return afm_find (String ("scripts") + String ("-") + str); + Stencil m; + Direction d = LEFT; + for (Axis a = X_AXIS; a < NO_AXES; a = Axis (a + 1)) + { + 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; + + m.add_stencil (round_filled_box (edges, blot)); + } + while (flip (&d) != LEFT); + } + return m; } -Atom -Lookup::special_time_signature (String s, Array arr) const +/* + Make a smooth curve along the points + */ +Stencil +Lookup::slur (Bezier curve, Real curvethick, Real linethick) { - // First guess: s contains only the signature style - assert (arr.size () >1); - String symbolname = "timesig-" + s + to_str (arr[0]) + "/" + to_str (arr[1]); + 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; + back.reverse (); + back.control_[1] += perp; + back.control_[2] += perp; + + curve.control_[1] -= perp; + curve.control_[2] -= perp; - Atom a = afm_find (symbolname, false); - if (!a.empty ()) - return a; - - // Second guess: s contains the full signature name - a = afm_find ("timesig-"+s, false); - if (!a.empty ()) - return a; - - // Resort to default layout with numbers - return time_signature (arr); -} - -Atom -Lookup::stem (Real y1, Real y2) const -{ - if (y1 > y2) + SCM scontrols[8]; + + 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]); + + /* + 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--;) { - Real t = y1; - y1 = y2; - y2 = t; + list = scm_cons (scontrols[indices[i]], list); } - Atom a; - - a.dim_.x () = Interval (0,0); - a.dim_.y () = Interval (y1,y2); - - Array arr; + + + SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + scm_make_real (linethick), + SCM_UNDEFINED)); + Box b (curve.extent (X_AXIS), + curve.extent (Y_AXIS)); - Real stem_width = paper_l_->get_var ("stemthickness"); - arr.push (-stem_width /2); - arr.push (stem_width); - arr.push (y2); - arr.push (-y1); + b[X_AXIS].unite (back.extent (X_AXIS)); + b[Y_AXIS].unite (back.extent (Y_AXIS)); - a.lambda_ = (lambda_scm ("stem", arr)); - a.str_ = "stem"; - a.font_ = font_; - return a; + return Stencil (b, at); } -Atom -Lookup::streepje (int type) const +/* + * Bezier Sandwich: + * + * .| + * . | + * top . | + * . curve | + * . | + * . | + * . | + * | | + * | .| + * | . + * | bottom . + * | . curve + * | . + * | . + * | . + * | . + * |. + * | + * + */ +Stencil +Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) { - if (type > 2) - type = 2; - - return afm_find ("balls" + String ("-") +to_str (type) + "l"); + /* + 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); + list = scm_cons (ly_offset2scm (bottom_curve.control_[1]), list); + list = scm_cons (ly_offset2scm (bottom_curve.control_[2]), list); + list = scm_cons (ly_offset2scm (top_curve.control_[0]), list); + list = scm_cons (ly_offset2scm (top_curve.control_[3]), list); + list = scm_cons (ly_offset2scm (top_curve.control_[2]), list); + list = scm_cons (ly_offset2scm (top_curve.control_[1]), list); + + SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + scm_make_real (0.0), + SCM_UNDEFINED); + + Interval x_extent = top_curve.extent (X_AXIS); + x_extent.unite (bottom_curve.extent (X_AXIS)); + Interval y_extent = top_curve.extent (Y_AXIS); + y_extent.unite (bottom_curve.extent (Y_AXIS)); + Box b (x_extent, y_extent); + + return Stencil (b, horizontal_bend); } -Dictionary cmr_dict; -Dictionary afm_p_dict; - -Atom -Lookup::text (String style, String text) const +/* + TODO: junk me. + */ +Stencil +Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { - Array arr; + Stencil m; + String sym = ly_scm2string (ly_car (s)); + String reg = ly_scm2string (ly_car (ly_cdr (s))); - arr.push (text); - Atom a = (*symtables_p_) ("style")->lookup (style); - a.lambda_ = lambda_scm (a.str_, arr); - -// urg -// if (!cmr_dict.length_i ()) - if (!cmr_dict.elem_b ("roman")) + if (sym == "Discant") { - cmr_dict.elem ("italic") = "cmri12.afm"; - cmr_dict.elem ("roman") = "cmr12.afm"; + 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); + } } - - if (!afm_p_dict.elem_b (style)) + else if (sym == "Freebase") { - String cmr_str = cmr_dict.elem (style); - String font_path = global_path.find (cmr_str); - if (!font_path.length_i ()) - error (_f("can't open file: `%s'", cmr_str.ch_C ())); - *mlog << "[" << font_path; - Adobe_font_metric* afm_p = new Adobe_font_metric (read_afm (font_path)); - DOUT << afm_p->str (); - *mlog << "]" << flush ; - afm_p_dict.elem (style) = afm_p; + 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); + } } - Real w = 0; - Real guess_w = a.dim_.x ().length (); - Adobe_font_metric* afm_p = afm_p_dict.elem (style); - DOUT << "\nChars: "; - for (int i = 0; i < text.length_i (); i++) + else if (sym == "Bayanbase") { - if (text[i]=='\\') - for (i++; (i < text.length_i ()) && isalpha(text[i]); i++) - ; - else + Stencil r = fm->find_by_name ("accordion-accBayanbase"); + m.add_stencil (r); + if (reg.left_string (1) == "T") { - if (afm_p) - { - Adobe_font_char_metric m = afm_p->char_metrics_[(int)text[i]]; - w += m.B_.x ().length (); - DOUT << to_str (m.B_.x ().length ()) << " "; - } - else - w += guess_w; + 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); } } - DOUT << "\n" << to_str (w) << "\n"; - a.dim_.x () = Interval (0, w); - a.str_ = "text"; - a.font_ = font_; - return a; + 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; } - -Atom -Lookup::time_signature (Array a) const +Stencil +Lookup::repeat_slash (Real w, Real s, Real t) { - Atom s ((*symtables_p_) ("param")->lookup ("time_signature")); - s.lambda_ = (lambda_scm (s.str_, a)); + SCM wid = scm_make_real (w); + 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); + + Box b (Interval (0, w + sqrt (sqr (t/s) + sqr (t))), + Interval (0, w * s)); - return s; + return Stencil (b, slashnodot); // http://slashnodot.org } -/* - should be handled via Tex_ code and Lookup::bar () - */ -Atom -Lookup::vbrace (Real &y) const -{ - Atom a = (*symtables_p_) ("param")->lookup ( "brace"); - Interval ydims = a.dim_[Y_AXIS]; - Real min_y = ydims[LEFT]; - Real max_y = ydims[RIGHT]; - Real step = 1.0 PT; - - if (y < min_y) - { - warning (_ ("piano brace") - + " " + _ ("too small") + " (" + print_dimen (y) + ")"); - y = min_y; - } - if (y > max_y) - { - warning (_ ("piano brace") - + " " + _ ("too big") + " (" + print_dimen (y) + ")"); - y = max_y; - } +Stencil +Lookup::bracket (Axis a, Interval iv, Real thick, Real protude, Real blot) +{ + Box b; + Axis other = Axis ((a+1)%2); + b[a] = iv; + b[other] = Interval (-1, 1) * thick * 0.5; - int idx = int (rint ( (y- min_y)/step)) + 1; - - Array arr; - arr.push (idx); - a.lambda_ = (lambda_scm (a.str_, arr)); - a.str_ = "brace"; - a.dim_[Y_AXIS] = Interval (-y/2,y/2); - a.font_ = font_; - return a; -} + Stencil m = round_filled_box (b, blot); -Atom -Lookup::hairpin (Real width, bool decresc, bool continued) const -{ - Atom a; - Real height = paper_l_->staffheight_f () / 6; - String ps; - ps += to_str (width) + " " - + to_str (height) + " " - + to_str (continued ? height/2 : 0) + - + " draw_" + String (decresc ? "de" : "") + "cresc\n"; - a.str_ = ps; - a.dim_.x () = Interval (0, width); - a.dim_.y () = Interval (-2*height, 2*height); - a.font_ = font_; - return a; + 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_stencil (round_filled_box (b, blot)); + b[a] = Interval (iv[DOWN], iv[DOWN] +thick); + m.add_stencil (round_filled_box (b,blot)); + + return m; } -Atom -Lookup::plet (Real dy , Real dx, Direction dir) const +Stencil +Lookup::triangle (Interval iv, Real thick, Real protude) { - String ps; - - ps += String_convert::double_str (dx) + " " - + String_convert::double_str (dy) + " " - + String_convert::int_str ( (int)dir) + - " draw_plet "; - - Atom a; - a.str_ = ps; - return a; + Box b ; + b[X_AXIS] = iv; + b[Y_AXIS] = Interval (0 ? protude); + + SCM s = scm_list_n (ly_symbol2scm ("symmetric-x-triangle"), + scm_make_real (thick), + scm_make_real (iv.length ()), + scm_make_real (protude), SCM_UNDEFINED); + + return Stencil (b, s); } -Atom -Lookup::slur (Array controls) const + +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}.") { - assert (controls.size () == 8); + 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 (ly_c_number_p (t), a, SCM_ARG3, __FUNCTION__, "number") ; + SCM_ASSERT_TYPE (ly_c_number_p (p), a, SCM_ARG4, __FUNCTION__, "number") ; - String ps; - - Real dx = controls[3].x () - controls[0].x (); - Real dy = controls[3].y () - controls[0].y (); - Atom a; - - SCM scontrols [8]; - int indices[] = {5,6,7,4,1,2,3,0}; - - for (int i= 0; i < 8; i++) - scontrols[i] = offset2scm (controls[indices[i]]); - - - a.lambda_ = - gh_append2 (ly_lambda_o (), - gh_list (gh_append2 (ly_func_o ("slur"), - gh_list (ly_quote_scm (gh_list (scontrols[0], - scontrols[1], - scontrols[2], - scontrols[3], - scontrols[4], - scontrols[5], - scontrols[6], - scontrols[7], - SCM_UNDEFINED)), - SCM_UNDEFINED) - ), - SCM_UNDEFINED) - ); - - - a.str_ = "slur"; - - a.dim_[X_AXIS] = Interval (0, dx); - a.dim_[Y_AXIS] = Interval (0 ? dy); - a.font_ = font_; - return a; + + return Lookup::bracket ((Axis)ly_scm2int (a), ly_scm2interval (iv), + ly_scm2double (t), + ly_scm2double (p), + 0.95 * ly_scm2double (t)).smobbed_copy (); } -Atom -Lookup::vbracket (Real &y) const + + +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}." + ) { - Atom a; - Real min_y = paper_l_->staffheight_f (); - if (y < min_y) - { - warning (_ ("bracket") - + " " + _ ("too small") + " (" + print_dimen (y) + ")"); - // y = min_y; - } - Array arr; - arr.push (y); - a.lambda_ = (lambda_scm ("bracket", arr)); - a.str_ = "vbracket"; - a.dim_[Y_AXIS] = Interval (-y/2,y/2); - a.dim_[X_AXIS] = Interval (0,4 PT); - return a; -} + 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 (ly_c_number_p (blot), blot, SCM_ARG3, __FUNCTION__, "number") ; + return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)), + ly_scm2double (blot)).smobbed_copy (); +}