X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=1e24db5da75f95619e93c0dbbbe94f46545412a5;hb=6f96331d77b66f223cd9f4f68b857b53a2dd6c03;hp=7bf26da20b295d940b1ef0013fbabcfd81224ca2;hpb=f3467e6b78be6d8497cf4d0a43ffd01656a33300;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 7bf26da20b..1e24db5da7 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,619 +3,355 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 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 = gh_list (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 -{ - 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; -} - Molecule -Lookup::accidental (int j, bool cautionary) const +Lookup::dashed_slur (Bezier b, Real thick, Real dash) { - Molecule m(afm_find (String ("accidentals-") + to_str (j))); - if (cautionary) - { - 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); - } - return m; -} - + SCM l = SCM_EOL; - -Molecule -Lookup::afm_find (String s, bool warn) const -{ - if (!afm_l_) + for (int i= 4; i -- ;) { - 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())); - error (_f("Aborting")); - } + l = gh_cons (ly_offset2scm (b.control_[i]), l); } - 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; -} -Molecule -Lookup::ball (int j) const -{ - if (j > 2) - j = 2; + SCM at = (gh_list (ly_symbol2scm ("dashed-slur"), + gh_double2scm (thick), + gh_double2scm (dash), + ly_quote_scm (l), + SCM_UNDEFINED)); - return afm_find (String ("noteheads-") + to_str (j)); + Box box (Interval(0,0),Interval( 0,0)); + return Molecule (box, at); } -Molecule -Lookup::simple_bar (String type, Real h) const -{ - 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); - } - return filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); -} - + Molecule -Lookup::bar (String str, Real h) const +Lookup::blank (Box b) { - 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 == "") - { - return fill (Box (Interval(0, 0), Interval (-h/2, h/2))); - } - else if (str == "|") - { - 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); - } - - return m; + return Molecule (b, SCM_EOL); } -Molecule -Lookup::beam (Real slope, Real width, Real thick) const -{ - Real height = slope * width; - Real min_y = (0 ? height) + thick/2; - - - 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; -} Molecule -Lookup::clef (String st) const +Lookup::filledbox (Box b ) { - return afm_find (String ("clefs-" + st)); -} + SCM at = (gh_list (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)); -SCM -offset2scm (Offset o) -{ - return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), - SCM_UNDEFINED); + return Molecule ( b,at); } Molecule -Lookup::dashed_slur (Array controls, Real thick, Real dash) const +Lookup::frame (Box b, Real thick) { - assert (controls.size () == 8); - Offset d = controls[3] - controls[0]; - - Real dx = d[X_AXIS]; - Real dy = d[Y_AXIS]; - Molecule m; - - - m.dim_[X_AXIS] = Interval (0, dx); - m.dim_[Y_AXIS] = Interval (0 ? dy); - - SCM sc[4]; - for (int i=0; i< 4; i++) + Direction d = LEFT; + Axis a = X_AXIS; + while (a < NO_AXES) { - sc[i] = offset2scm (controls[i]); + 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); } - - 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")); -} - - +/* + Make a smooth curve along the points + */ Molecule -Lookup::fill (Box b) const +Lookup::slur (Bezier curve, Real curvethick, Real linethick) { - Molecule m; - m.dim_ = b; - return m; -} + Real alpha = (curve.control_[3] - curve.control_[0]).arg (); + Bezier back = curve; -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)); -} + back.reverse (); + back.control_[1] += curvethick * complex_exp (Offset (0, alpha + M_PI/2)); + back.control_[2] += curvethick * complex_exp (Offset (0, alpha + M_PI/2)); -Molecule -Lookup::rest (int j, bool o) const -{ - return afm_find (String ("rests-") + to_str (j) + (o ? "o" : "")); -} + SCM scontrols[8]; -Molecule -Lookup::rule_symbol (Real height, Real width) const -{ - Atom at (gh_list (ly_symbol ("rulesym"), - gh_double2scm (height), - gh_double2scm (width), - SCM_UNDEFINED)); + 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]); - Molecule m; - m.dim_.x () = Interval (0, width); - m.dim_.y () = Interval (0, height); + /* + 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--; ) + { + list = gh_cons (scontrols[indices[i]], list); + } - m.add_atom (&at); - - return m; -} - -Molecule -Lookup::script (String str) const -{ - return afm_find (String ("scripts-") + str); -} - -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; + SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + gh_double2scm (linethick), + SCM_UNDEFINED)); - // Resort to default layout with numbers - return time_signature (n,d); + Box b ( curve.extent (X_AXIS), curve.extent (Y_AXIS)); + return Molecule (b, at); } 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; -} - -Molecule -Lookup::stem (Real y1, Real y2) const -{ - if (y1 > y2) - { - Real t = y1; - y1 = y2; - y2 = t; - } - Real stem_width = paper_l_->get_var ("stemthickness"); - return filledbox (Box (Interval (-stem_width/2,stem_width/2), - Interval (y1, y2))); -} + String sym = ly_scm2string(gh_car (s)); + String reg = ly_scm2string(gh_car (gh_cdr(s))); - -static Dict_initialiser cmr_init[] = { - {"bold", "cmbx"}, - {"dynamic", "feta-din"}, - {"finger", "feta-nummer"}, - {"typewriter", "cmtt"}, - {"italic", "cmti"}, - {"roman", "cmr"}, - {"large", "cmbx"}, - {"Large", "cmbx"}, - {"mark", "feta-nummer"}, - {"number", "feta-nummer"}, - {"volta", "feta-nummer"}, - {0,0} -}; - -/** - Magnification steps. These are powers of 1.2. The numbers are - taken from Knuth's plain.tex: */ -static Real mag_steps[] = {1, 1, 1.200, 1.440, 1.7280, 2.074, 2.488}; - -static Dictionary cmr_dict (cmr_init); - -Molecule -Lookup::text (String style, String text) const -{ - Molecule m; - - int font_mag = 1; - Real font_h = paper_l_->get_var ("font_normal"); - if (paper_l_->scope_p_->elem_b ("font_" + style)) + if (sym == "Discant") { - font_h = paper_l_->get_var ("font_" + style); + 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); + } } - - if (paper_l_->scope_p_->elem_b ("magnification_" + style)) + else if (sym == "Freebase") { - font_mag = (int)paper_l_->get_var ("magnification_" + 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") { - 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 * 1.5 PT, Y_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-1); + } + if (reg.left_str(1) == "S") + { + 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); } } - - if (font_mag > 1 && font_mag < 7 ) + /* 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") { - style = style + String(" scaled \\magstep ") + to_str (font_mag); - w *= mag_steps[font_mag]; - ydims *= mag_steps[font_mag]; + Molecule r = fm->find_by_name ("accordion-accSB"); + m.add_molecule(r); } - - 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) + else if (sym == "BB") { - 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-accBB"); + m.add_molecule(r); } - else + else if (sym == "OldEE") { - m = n; - m.do_center (Y_AXIS); + Molecule r = fm->find_by_name ("accordion-accOldEE"); + 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 == "OldEES") { - t = paper_l_->get_realvar (thick); + Molecule r = fm->find_by_name ("accordion-accOldEES"); + 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; -} - -/* - Make a smooth curve along the points - */ -Molecule -Lookup::slur (Array controls) const -{ - 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]]); - - - Atom at (gh_list (ly_symbol ("bezier-sandwich"), - ly_quote_scm (array_to_list (scontrols, 8)), - SCM_UNDEFINED)); - - 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; -} - -Molecule -Lookup::staff_bracket (Real y) const -{ - 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 (); - - m.dim_[Y_AXIS] = Interval (-interline_f, interline_f); - m.dim_[X_AXIS] = Interval (0, w); - - m.add_atom (&at); - return m; -} - - -Molecule -Lookup::special_ball (int j, String kind_of_ball) const -{ - if (j > 2) - j = 2; - - return afm_find (String ("noteheads-") + kind_of_ball); + return m; }