X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=e59699292d2832860d07da13db7f7e19dc6a9212;hb=6b89a99dbfb2e208c42ba1510be9e638d21be4a9;hp=bb6ac3fe8917917ddc1ae28b84be354286dfdca1;hpb=df019fc9342e7b78138a3e24c5cddafec9d754e4;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index bb6ac3fe89..e59699292d 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,600 +3,572 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen TODO Glissando */ - +#include #include -#include "lookup.hh" -#include "debug.hh" + +#include "warn.hh" #include "dimensions.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 "all-fonts.hh" -#include "afm.hh" -#include "scope.hh" #include "molecule.hh" -#include "atom.hh" +#include "lookup.hh" +#include "font-metric.hh" -SCM -array_to_list (SCM *a , int l) +Molecule +Lookup::beam (Real slope, Real width, Real thick) { - SCM list = SCM_EOL; - for (int i= l; i--; ) - { - list = gh_cons (a[i], list); - } - return list; -} + Real height = slope * width; + Real min_y = (0 ? height) + thick/2; + -Lookup::Lookup () -{ - paper_l_ = 0; - afm_l_ = 0; -} + Box b (Interval (0, width), + Interval (min_y, max_y)); -Lookup::Lookup (Lookup const& s) -{ - font_name_ = s.font_name_; - paper_l_ = 0; - afm_l_ = 0; + + SCM at = scm_list_n (ly_symbol2scm ("beam"), + gh_double2scm (width), + gh_double2scm (slope), + gh_double2scm (thick), + SCM_UNDEFINED); + return Molecule (b, at); } - Molecule -Lookup::ledger_line (Interval xwid) const +Lookup::dashed_slur (Bezier b, Real thick, Real dash) { - Molecule end (afm_find ("noteheads-ledgerending")); - Interval ed = end.dim_[X_AXIS]; - xwid = Interval (xwid[LEFT] - ed[LEFT], - xwid[RIGHT] - ed[RIGHT]); - Molecule mid = filledbox (Box (xwid, end.dim_[Y_AXIS])); - Molecule l (mid); - - Molecule e2 = end; - Molecule e1 = end; - e1.translate_axis (xwid[RIGHT], X_AXIS); - e2.translate_axis (xwid[LEFT], X_AXIS); - - l.add_molecule (e1); - l.add_molecule (e2); - return l; -} - + SCM l = SCM_EOL; -Molecule -Lookup::accidental (int j, bool cautionary) const -{ - Molecule m(afm_find (String ("accidentals-") + to_str (j))); - if (cautionary) + for (int i= 4; i -- ;) { - Molecule open = afm_find (String ("accidentals-(")); - Molecule close = afm_find (String ("accidentals-)")); - m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0); - m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0); + l = gh_cons (ly_offset2scm (b.control_[i]), l); } - return m; -} + SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"), + gh_double2scm (thick), + gh_double2scm (dash), + ly_quote_scm (l), + SCM_UNDEFINED)); + Box box (Interval (0,0),Interval (0,0)); + return Molecule (box, at); +} Molecule -Lookup::afm_find (String s, bool warn) const +Lookup::line (Real th, Offset f, Offset t) { - if (!afm_l_) - { - Lookup * me = (Lookup*)(this); - me->afm_l_ = all_fonts_global_p->find_afm (font_name_); - if (!me->afm_l_) - { - warning (_f("Can't open `%s'\n", font_name_)); - warning (_f("Search path %s\n", global_path.str ().ch_C())); - } - } - Adobe_font_char_metric cm = afm_l_->find_char (s, warn); - Molecule m; - if (cm.code () < 0) - return m; - - Atom at (gh_list (ly_symbol ("char"), - gh_int2scm (cm.code ()), - SCM_UNDEFINED)); - at.font_ = ly_symbol (font_name_.ch_C()); - m.dim_ = cm.dimensions(); - m.add_atom (&at); - return m; + 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)); + + Box box; + box.add_point (f); + box.add_point (t); + + box[X_AXIS].widen (th/2); + box[Y_AXIS].widen (th/2); + + return Molecule (box, at); } + Molecule -Lookup::ball (int j) const +Lookup::blank (Box b) { - if (j > 2) - j = 2; - - return afm_find (String ("noteheads-") + to_str (j)); + return Molecule (b, SCM_EOL); } Molecule -Lookup::simple_bar (String type, Real h) const +Lookup::filledbox (Box b) { - SCM thick = ly_symbol ("barthick_" + type); - Real w = 0.1 PT; - if (paper_l_->scope_p_->elem_b (thick)) - { - w = paper_l_->get_realvar (thick); - } + SCM at = (scm_list_n (ly_symbol2scm ("filledbox"), + gh_double2scm (-b[X_AXIS][LEFT]), + gh_double2scm (b[X_AXIS][RIGHT]), + gh_double2scm (-b[Y_AXIS][DOWN]), + gh_double2scm (b[Y_AXIS][UP]), + SCM_UNDEFINED)); - return filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); + return Molecule (b,at); } - +/* + * round filled box: + * + * __________________________________ + * / \ ^ / \ ^ + * | |blot | | + * | | |dia | | | + * | |meter | | + * |\ _ _ / v \ _ _ /| | + * | | | + * | | | Box + * | <------>| | extent + * | blot | | (Y_AXIS) + * | diameter| | + * | | | + * | _ _ _ _ | | + * |/ \ / \| | + * | | | + * | | | | | + * | | | + * x\_____/______________\_____/|_____v + * |(0,0) | + * | | + * | | + * |<-------------------------->| + * Box extent(X_AXIS) + */ Molecule -Lookup::bar (String str, Real h) const +Lookup::roundfilledbox (Box b, Real blotdiameter) { - if (str == "[") - return staff_bracket (h); - else if (str == "{") - return staff_brace (h); - - Real kern = paper_l_->get_var ("bar_kern"); - Real thinkern = paper_l_->get_var ("bar_thinkern"); - Molecule thin = simple_bar ("thin", h); - Molecule thick = simple_bar ("thick", h); - Molecule colon = afm_find ("dots-repeatcolon"); - - Molecule m; - - if (str == "") + if (b.x ().length () < blotdiameter) { - return fill (Box (Interval(0, 0), Interval (-h/2, h/2))); + programming_error (_f ("round filled box horizontal extent smaller than blot; decreasing blot")); + blotdiameter = b.x ().length (); } - else if (str == "|") + if (b.y ().length () < blotdiameter) { - return thin; - } - else if (str == "|.") - { - m.add_at_edge (X_AXIS, LEFT, thick, 0); - m.add_at_edge (X_AXIS, LEFT, thin, kern); - } - else if (str == ".|") - { - m.add_at_edge (X_AXIS, RIGHT, thick, 0); - m.add_at_edge (X_AXIS, RIGHT, thin, kern); - } - else if (str == ":|") - { - m.add_at_edge (X_AXIS, LEFT, thick, 0); - m.add_at_edge (X_AXIS, LEFT, thin, kern); - m.add_at_edge (X_AXIS, LEFT, colon, kern); - } - else if (str == "|:") - { - m.add_at_edge (X_AXIS, RIGHT, thick, 0); - m.add_at_edge (X_AXIS, RIGHT, thin, kern); - m.add_at_edge (X_AXIS, RIGHT, colon, kern); - } - else if (str == ":|:") - { - m.add_at_edge (X_AXIS, LEFT, thick, thinkern); - m.add_at_edge (X_AXIS, LEFT, colon, kern); - m.add_at_edge (X_AXIS, RIGHT, thick, kern); - m.add_at_edge (X_AXIS, RIGHT, colon, kern); - } - else if (str == ".|.") - { - m.add_at_edge (X_AXIS, LEFT, thick, thinkern); - m.add_at_edge (X_AXIS, RIGHT, thick, kern); - } - else if (str == "||") - { - m.add_at_edge (X_AXIS, RIGHT, thin, 0); - m.add_at_edge (X_AXIS, RIGHT, thin, thinkern); + programming_error (_f ("round filled box vertical extent smaller than blot; decreasing blot")); + blotdiameter = b.y ().length (); } - return m; -} - -Molecule -Lookup::beam (Real slope, Real width, Real thick) const -{ - Real height = slope * width; - Real min_y = (0 ? height) + thick/2; + SCM at = (scm_list_n (ly_symbol2scm ("roundfilledbox"), + gh_double2scm (-b[X_AXIS][LEFT]), + gh_double2scm (b[X_AXIS][RIGHT]), + gh_double2scm (-b[Y_AXIS][DOWN]), + gh_double2scm (b[Y_AXIS][UP]), + gh_double2scm (blotdiameter), + SCM_UNDEFINED)); - - Molecule m; - Atom at - (gh_list (ly_symbol ("beam"), - gh_double2scm (width), - gh_double2scm (slope), - gh_double2scm (thick), - SCM_UNDEFINED)); - - m.dim_[X_AXIS] = Interval (0, width); - m.dim_[Y_AXIS] = Interval (min_y, max_y); - m.add_atom (&at); - return m; + return Molecule (b,at); } Molecule -Lookup::clef (String st) const -{ - return afm_find (String ("clefs-" + st)); -} - -SCM -offset2scm (Offset o) +Lookup::frame (Box b, Real thick) { - return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), - SCM_UNDEFINED); + Molecule m; + Direction d = LEFT; + Axis a = X_AXIS; + while (a < 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; + edges[o][UP] = b[o][UP] + thick/2; + + m.add_molecule (filledbox (edges)); + } + while (flip (&d) != LEFT); + } + return m; + } +/* + Make a smooth curve along the points + */ Molecule -Lookup::dashed_slur (Array controls, Real thick, Real dash) const +Lookup::slur (Bezier curve, Real curvethick, Real linethick) { - assert (controls.size () == 8); - Offset d = controls[3] - controls[0]; + 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; - Real dx = d[X_AXIS]; - Real dy = d[Y_AXIS]; + SCM scontrols[8]; - Molecule m; + 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]); - - m.dim_[X_AXIS] = Interval (0, dx); - m.dim_[Y_AXIS] = Interval (0 ? dy); - - SCM sc[4]; - for (int i=0; i< 4; 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--;) { - sc[i] = offset2scm (controls[i]); + list = gh_cons (scontrols[indices[i]], list); } - - Atom at - (gh_list (ly_symbol ("dashed-slur"), - gh_double2scm (thick), - gh_double2scm (dash), - ly_quote_scm (array_to_list (sc, 4)), - SCM_UNDEFINED)); - m.add_atom (&at); - return m; -} - -Molecule -Lookup::dots () const -{ - return afm_find (String ("dots-dot")); -} - - + SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + gh_double2scm (linethick), + SCM_UNDEFINED)); + Box b(curve.extent (X_AXIS), + curve.extent (Y_AXIS)); -Molecule -Lookup::fill (Box b) const -{ - Molecule m; - m.dim_ = b; - return m; -} + b[X_AXIS].unite (back.extent (X_AXIS)); + b[Y_AXIS].unite (back.extent (Y_AXIS)); -Molecule -Lookup::flag (int j, Direction d) const -{ - char c = (d == UP) ? 'u' : 'd'; - return afm_find (String ("flags-") + to_str (c) + to_str (j)); -} - -Molecule -Lookup::rest (int j, bool o) const -{ - return afm_find (String ("rests-") + to_str (j) + (o ? "o" : "")); + return Molecule (b, at); } +/* + * Bezier Sandwich: + * + * .| + * . | + * top . | + * . curve | + * . | + * . | + * . | + * | | + * | .| + * | . + * | bottom . + * | . curve + * | . + * | . + * | . + * | . + * |. + * | + * + */ Molecule -Lookup::rule_symbol (Real height, Real width) const +Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) { - Atom at (gh_list (ly_symbol ("rulesym"), - gh_double2scm (height), - gh_double2scm (width), - SCM_UNDEFINED)); - - Molecule m; - m.dim_.x () = Interval (0, width); - m.dim_.y () = Interval (0, height); - - m.add_atom (&at); - - return m; + /* + Need the weird order b.o. the way PS want its arguments + */ + SCM list = SCM_EOL; + list = gh_cons (ly_offset2scm (bottom_curve.control_[3]), list); + list = gh_cons (ly_offset2scm (bottom_curve.control_[0]), list); + list = gh_cons (ly_offset2scm (bottom_curve.control_[1]), list); + list = gh_cons (ly_offset2scm (bottom_curve.control_[2]), list); + list = gh_cons (ly_offset2scm (top_curve.control_[0]), list); + list = gh_cons (ly_offset2scm (top_curve.control_[3]), list); + list = gh_cons (ly_offset2scm (top_curve.control_[2]), list); + list = gh_cons (ly_offset2scm (top_curve.control_[1]), list); + + SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + gh_double2scm (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 Molecule (b, horizontal_bend); } +/* + * Horizontal Slope: + * + * /| ^ + * / | | + * / | | height + * / | | + * / | v + * | / + * | / + * (0,0) x /slope=dy/dx + * | / + * |/ + * + * <-----> + * width + */ Molecule -Lookup::script (String str) const +Lookup::horizontal_slope (Real width, Real slope, Real height) { - return afm_find (String ("scripts-") + str); + SCM width_scm = gh_double2scm (width); + SCM slope_scm = gh_double2scm (slope); + SCM height_scm = gh_double2scm (height); + SCM horizontal_slope = scm_list_n (ly_symbol2scm ("beam"), + width_scm, slope_scm, + height_scm, SCM_UNDEFINED); + Box b (Interval (0, width), + Interval (-height/2, height/2 + width*slope)); + return Molecule (b, horizontal_slope); } +/* + TODO: junk me. + */ Molecule -Lookup::special_time_signature (String s, int n, int d) const -{ - // First guess: s contains only the signature style - String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d); - - Molecule m = afm_find (symbolname, false); - if (!m.dim_[X_AXIS].empty_b ()) - return m; - - // Second guess: s contains the full signature name - m = afm_find ("timesig-"+s, false); - if (!m.dim_[X_AXIS].empty_b ()) - return m; - - // Resort to default layout with numbers - return time_signature (n,d); -} - -Molecule -Lookup::filledbox (Box b ) const +Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { Molecule m; - - Atom at (gh_list (ly_symbol ("filledbox"), - gh_double2scm (-b[X_AXIS][LEFT]), - gh_double2scm (b[X_AXIS][RIGHT]), - gh_double2scm (-b[Y_AXIS][DOWN]), - gh_double2scm (b[Y_AXIS][UP]), - SCM_UNDEFINED)); - - m.dim_ = b; - m.add_atom (&at); - return m; -} + String sym = ly_scm2string (ly_car (s)); + String reg = ly_scm2string (ly_car (ly_cdr (s))); -Molecule -Lookup::stem (Real y1, Real y2) const -{ - if (y1 > y2) + if (sym == "Discant") { - Real t = y1; - y1 = y2; - y2 = t; + Molecule r = fm->find_by_name ("accordion-accDiscant"); + m.add_molecule (r); + if (reg.left_str (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); + } + int eflag = 0x00; + if (reg.left_str (3) == "EEE") + { + eflag = 0x07; + reg = reg.right_str (reg.length_i ()-3); + } + else if (reg.left_str (2) == "EE") + { + eflag = 0x05; + reg = reg.right_str (reg.length_i ()-2); + } + else if (reg.left_str (2) == "Eh") + { + eflag = 0x04; + reg = reg.right_str (reg.length_i ()-2); + } + else if (reg.left_str (1) == "E") + { + eflag = 0x02; + reg = reg.right_str (reg.length_i ()-1); + } + if (eflag & 0x02) + { + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + m.add_molecule (d); + } + if (eflag & 0x04) + { + Molecule 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_molecule (d); + } + if (eflag & 0x01) + { + Molecule 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_molecule (d); + } + if (reg.left_str (2) == "SS") + { + Molecule 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_molecule (d); + d.translate_axis (-0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-2); + } + if (reg.left_str (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); + } } - Real stem_width = paper_l_->get_var ("stemthickness"); - return filledbox (Box (Interval (-stem_width/2,stem_width/2), - Interval (y1, y2))); -} - - -static Dict_initialiser cmr_init[] = { - {"bold", "cmbx"}, - {"dynamic", "feta-din"}, - {"finger", "feta-nummer"}, - {"italic", "cmti"}, - {"roman", "cmr"}, - {"large", "cmbx"}, - {"Large", "cmbx"}, - {"mark", "feta-nummer"}, - {"number", "feta-nummer"}, - {"volta", "feta-nummer"}, - {0,0} -}; - -static Dictionary cmr_dict (cmr_init); - -Molecule -Lookup::text (String style, String text) const -{ - Molecule m; - - - Real font_h = paper_l_->get_var ("font_normal"); - if (paper_l_->scope_p_->elem_b ("font_" + style)) + else if (sym == "Freebase") { - font_h = paper_l_->get_var ("font_" + style); + Molecule r = fm->find_by_name ("accordion-accFreebase"); + m.add_molecule (r); + if (reg.left_str (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); + } + if (reg == "E") + { + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + m.add_molecule (d); + } } - - if (cmr_dict.elem_b (style)) + else if (sym == "Bayanbase") { - style = String (cmr_dict [style]) + to_str ((int)font_h); // ugh + Molecule r = fm->find_by_name ("accordion-accBayanbase"); + m.add_molecule (r); + if (reg.left_str (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); + } + /* include 4' reed just for completeness. You don't want to use this. */ + if (reg.left_str (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); + } + if (reg.left_str (2) == "EE") + { + Molecule 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_molecule (d); + d.translate_axis (-0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-2); + } + if (reg.left_str (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); + } } - - Real w = 0; - Interval ydims (0,0); - - Font_metric* afm_l = all_fonts_global_p->find_font (style); - DOUT << "\nChars: "; - - for (int i = 0; i < text.length_i (); i++) + else if (sym == "Stdbase") { - if (text[i]=='\\') - for (i++; (i < text.length_i ()) && isalpha(text[i]); i++) - ; - else + Molecule r = fm->find_by_name ("accordion-accStdbase"); + m.add_molecule (r); + if (reg.left_str (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); + } + if (reg.left_str (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); + } + if (reg.left_str (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); + } + if (reg.left_str (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); + } + if (reg.left_str (1) == "S") { - Character_metric *c = afm_l->get_char (text[i],false); - w += c->dimensions()[X_AXIS].length (); - ydims.unite (c->dimensions()[Y_AXIS]); + 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); } } - - DOUT << "\n" << to_str (w) << "\n"; - m.dim_.x () = Interval (0, w); - m.dim_.y () = ydims; - Atom at (gh_list (ly_symbol ("text"), - gh_str02scm (text.ch_C()), - SCM_UNDEFINED)); - at.font_ = ly_symbol (style); - - m.add_atom (&at); - return m; -} - - -/* - */ -Molecule -Lookup::time_signature (int num, int den) const -{ - String sty = "number"; - Molecule n (text (sty, to_str (num))); - Molecule d (text (sty, to_str (den))); - n.do_center (X_AXIS); - d.do_center (X_AXIS); - Molecule m; - if (den) + /* 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") { - m.add_at_edge (Y_AXIS, UP, n, 0.0); - m.add_at_edge (Y_AXIS, DOWN, d, 0.0); + Molecule r = fm->find_by_name ("accordion-accSB"); + m.add_molecule (r); } - else + else if (sym == "BB") { - m = n; - m.do_center (Y_AXIS); + Molecule r = fm->find_by_name ("accordion-accBB"); + m.add_molecule (r); } - return m; -} - -Molecule -Lookup::staff_brace (Real y) const -{ - Molecule m; - - Atom at (gh_list (ly_symbol ("pianobrace"), - gh_double2scm (y), - SCM_UNDEFINED - )); - - m.dim_[Y_AXIS] = Interval (-y/2,y/2); - m.dim_[X_AXIS] = Interval (0,0); - m.add_atom (&at); - return m; -} - -Molecule -Lookup::hairpin (Real width, bool decresc, bool continued) const -{ - Molecule m; - Real height = paper_l_->staffheight_f () / 6; - - String hairpin = String (decresc ? "de" : "") + "crescendo"; - Atom at (gh_list (ly_symbol (hairpin), - gh_double2scm (width), - gh_double2scm (height), - gh_double2scm (continued ? height/2 : 0.0), - SCM_UNDEFINED)); - m.dim_.x () = Interval (0, width); - m.dim_.y () = Interval (-2*height, 2*height); - - m.add_atom (&at); - return m; -} - -Molecule -Lookup::plet (Real dy , Real dx, Direction dir) const -{ - Molecule m; - SCM thick = ly_symbol ("tuplet_thick"); - Real t = 0.1 PT; - if (paper_l_->scope_p_->elem_b (thick)) + else if (sym == "OldEE") { - t = paper_l_->get_realvar (thick); + Molecule r = fm->find_by_name ("accordion-accOldEE"); + m.add_molecule (r); } - - Atom at (gh_list(ly_symbol ("tuplet"), - gh_double2scm (dx), - gh_double2scm (dy), - gh_double2scm (t), - gh_int2scm (dir), - SCM_UNDEFINED)); -m.add_atom (&at); - - return m; + else if (sym == "OldEES") + { + Molecule r = fm->find_by_name ("accordion-accOldEES"); + m.add_molecule (r); + } + return m; } -/* - Make a smooth curve along the points - */ Molecule -Lookup::slur (Array controls) const +Lookup::repeat_slash (Real w, Real s, Real t) { - Offset delta_off = controls[3]- controls[0]; - Molecule m; - - 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]]); - + SCM wid = gh_double2scm (w); + SCM sl = gh_double2scm (s); + SCM thick = gh_double2scm (t); + SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"), + wid, sl, thick, SCM_UNDEFINED); - Atom at (gh_list (ly_symbol ("bezier-sandwich"), - ly_quote_scm (array_to_list (scontrols, 8)), - SCM_UNDEFINED)); + Box b (Interval (0, w + sqrt (sqr(t/s) + sqr (t))), + Interval (0, w * s)); - m.dim_[X_AXIS] = Interval (0, delta_off[X_AXIS]); - m.dim_[Y_AXIS] = Interval (0 ? delta_off[Y_AXIS]); - m.add_atom (&at); - return m; + return Molecule (b, slashnodot); // http://slashnodot.org } Molecule -Lookup::staff_bracket (Real y) const +Lookup::bracket (Axis a, Interval iv, Real thick, Real protude) { - Molecule m; - Atom at ( gh_list (ly_symbol ("bracket"), - gh_double2scm (y), - SCM_UNDEFINED)); - m.add_atom (&at); - m.dim_[Y_AXIS] = Interval (-y/2,y/2); - m.dim_[X_AXIS] = Interval (0,4 PT); - - m.translate_axis (- 4. / 3. * m.dim_[X_AXIS].length (), X_AXIS); - return m; -} - -Molecule -Lookup::volta (Real w, bool last_b) const -{ - Molecule m; - SCM thick = ly_symbol ("volta_thick"); - Real t = 0.1 PT; - if (paper_l_->scope_p_->elem_b (thick)) - { - t = paper_l_->get_realvar (thick); - } - Atom at (gh_list (ly_symbol ("volta"), - gh_double2scm (w), - gh_double2scm (t), - gh_int2scm (last_b), - SCM_UNDEFINED)); - - Real interline_f = paper_l_->interline_f (); + Box b; + Axis other = Axis((a+1)%2); + b[a] = iv; + b[other] = Interval(-1, 1) * thick * 0.5; + + Molecule m = filledbox (b); - m.dim_[Y_AXIS] = Interval (-interline_f, interline_f); - m.dim_[X_AXIS] = Interval (0, w); + 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_molecule (filledbox (b)); + b[a] = Interval (iv[DOWN], iv[DOWN] +thick); + m.add_molecule (filledbox(b)); - m.add_atom (&at); return m; } - -Molecule -Lookup::special_ball (int j, String kind_of_ball) const +/* + TODO: use rounded boxes. + */ +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}.") { - if (j > 2) - j = 2; + 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") ; - return afm_find (String ("noteheads-") + kind_of_ball); -} + return Lookup::bracket ((Axis)gh_scm2int (a), ly_scm2interval (iv), + gh_scm2double (t), + gh_scm2double (p)).smobbed_copy (); +} +