X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=dcbafb39755c466843a26141766fe99a64929e56;hb=bb446de35e2d24c7f6f15425a76b433cb71a4a1d;hp=2ca4bdddde79f9af99b661bccfc7b1de7766a946;hpb=96c20e0d65d98ac10fb2ed72c14f478bdaa33e81;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 2ca4bdddde..dcbafb3975 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,262 +3,368 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--1999 Han-Wen Nienhuys Jan Nieuwenhuizen TODO - Read spacing info from AFMs Glissando */ +#include #include "lookup.hh" #include "debug.hh" #include "dimensions.hh" -#include "symtable.hh" #include "scalar.hh" #include "paper-def.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" + +SCM +array_to_list (SCM *a , int l) +{ + SCM list = SCM_EOL; + for (int i= l; i--; ) + { + list = gh_cons (a[i], list); + } + return list; +} + Lookup::Lookup () { paper_l_ = 0; - symtables_p_ = new Symtables; - afm_p_ =0; + afm_l_ = 0; } 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_; + font_name_ = s.font_name_; paper_l_ = 0; - symtables_p_ = new Symtables (s); - afm_p_ = 0; + afm_l_ = 0; } -Lookup::~Lookup () -{ - delete afm_p_; - delete symtables_p_; -} -Atom -Lookup::accidental (int j) const +Molecule +Lookup::ledger_line (Interval xwid) const { - Atom a = afm_find (String ("accidentals") + String ("-") + to_str (j)); - return a; + 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; } -void -Lookup::add (String s, Symtable*p) + +Molecule +Lookup::accidental (int j, bool cautionary) const { - symtables_p_->add (s, p); + 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; } -Atom -Lookup::afm_find (String s) const + + +Molecule +Lookup::afm_find (String s, bool warn) const { - if (!afm_p_) + if (!afm_l_) { - *mlog << "[" << font_path_; - ( (Lookup*)this)->afm_p_ = new Adobe_font_metric (read_afm (font_path_)); - *mlog << "]" << flush ; - DOUT << this->afm_p_->str (); + 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")); + } } - Adobe_font_char_metric m = afm_p_->find_char (s); - - 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; + 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; } -Atom +Molecule Lookup::ball (int j) const { if (j > 2) j = 2; - return afm_find (String ("balls") + String ("-") + to_str (j)); + return afm_find (String ("noteheads-") + to_str (j)); +} + +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))); } -Atom + +Molecule Lookup::bar (String str, Real h) const { - 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; + 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; } -Atom +Molecule 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; + + 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; } -Atom +Molecule Lookup::clef (String st) const { - return afm_find (String ("clefs") + String ("-") + st); + return afm_find (String ("clefs-" + st)); } -Atom +SCM +offset2scm (Offset o) +{ + return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), + SCM_UNDEFINED); +} + +Molecule Lookup::dashed_slur (Array controls, Real thick, Real dash) const { assert (controls.size () == 8); + Offset d = controls[3] - controls[0]; + + Real dx = d[X_AXIS]; + Real dy = d[Y_AXIS]; + + Molecule m; - Real dx = controls[3].x () - controls[0].x (); - Real dy = controls[3].y () - controls[0].y (); - - Atom a; - a.font_ = font_; - a.dim_[X_AXIS] = Interval (0, dx); - a.dim_[Y_AXIS] = Interval (0 ? dy); - - // (lambda (o) (dashed-slur o '((0.1 0.2) (1.1 1.2) (2.1 2.2) (3.1 3.2)))) - 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_list2 (ly_quote (), - gh_cons (ly_list2 (gh_double2scm (controls[1].x ()), gh_double2scm (controls[1].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[2].x ()), gh_double2scm (controls[2].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[3].x ()), gh_double2scm (controls[3].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[0].x ()), gh_double2scm (controls[0].y ())), - SCM_EOL)))))))))))); - - a.str_ = "dashed_slur"; - return a; + + m.dim_[X_AXIS] = Interval (0, dx); + m.dim_[Y_AXIS] = Interval (0 ? dy); + + SCM sc[4]; + for (int i=0; i< 4; i++) + { + sc[i] = offset2scm (controls[i]); + } + + 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; } -Atom +Molecule Lookup::dots () const { - return afm_find (String ("dots") + String ("-") + String ("dot")); + return afm_find (String ("dots-dot")); } -Atom -Lookup::dynamic (String st) const -{ - return (*symtables_p_) ("dynamics")->lookup (st); -} -Atom + +Molecule Lookup::fill (Box b) const { - Atom a; - a.dim_ = b; - return a; + Molecule m; + m.dim_ = b; + return m; } -Atom +Molecule 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; -} - -void -Lookup::print () const -{ -#ifndef NPRINT - DOUT << "Lookup {\n"; - symtables_p_->print (); - DOUT << "}\n"; -#endif + return afm_find (String ("flags-") + to_str (c) + to_str (j)); } -Atom +Molecule Lookup::rest (int j, bool o) const { - return afm_find (String ("rests") - + String ("-") + to_str (j) + (o ? "o" : "")); + return afm_find (String ("rests-") + to_str (j) + (o ? "o" : "")); } -Atom +Molecule 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); + 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; } -Atom +Molecule Lookup::script (String str) const { - return afm_find (String ("scripts") + String ("-") + str); + return afm_find (String ("scripts-") + str); } -Atom -Lookup::special_time_signature (String s, Array arr) const +Molecule +Lookup::special_time_signature (String s, int n, int d) const { - String symbolname = "timesig-" + s; - if (!arr.empty ()) - symbolname += to_str (arr[0]); - if (arr.size () >1) - symbolname += "/" + to_str (arr[1]); + // First guess: s contains only the signature style + String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d); - Atom a = afm_find (symbolname); - if (!a.empty ()) - return a; + Molecule m = afm_find (symbolname, false); + if (!m.dim_[X_AXIS].empty_b ()) + return m; -#if 0 //guess we covered this - // Try if the full name was given - a = afm_find ("timesig-"+s); - if (!a.empty ()) - return a; -#endif + // 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 (arr); + return time_signature (n,d); } -Atom +Molecule +Lookup::filledbox (Box b ) const +{ + 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) @@ -267,177 +373,232 @@ Lookup::stem (Real y1, Real y2) const y1 = y2; y2 = t; } - Atom a; - - a.dim_.x () = Interval (0,0); - a.dim_.y () = Interval (y1,y2); - - Array arr; - Real stem_width = paper_l_->get_var ("stemthickness"); - arr.push (-stem_width /2); - arr.push (stem_width); - arr.push (y2); - arr.push (-y1); - - a.lambda_ = lambda_scm ("stem", arr); - a.str_ = "stem"; - a.font_ = font_; + return filledbox (Box (Interval (-stem_width/2,stem_width/2), + Interval (y1, y2))); } -Atom -Lookup::streepje (int type) const -{ - if (type > 2) - type = 2; - - Atom a = afm_find ("balls" + String ("-") + to_str (type) + "l"); - return a; -} -Atom +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} +}; + +static Dictionary cmr_dict (cmr_init); + +Molecule Lookup::text (String style, String text) const { - Array arr; + Molecule m; + - arr.push (text); - Atom a = (*symtables_p_) ("style")->lookup (style); - a.lambda_ = lambda_scm (a.str_, arr); - a.str_ = "text"; - a.font_ = font_; -} + Real font_h = paper_l_->get_var ("font_normal"); + if (paper_l_->scope_p_->elem_b ("font_" + style)) + { + font_h = paper_l_->get_var ("font_" + style); + } + + if (cmr_dict.elem_b (style)) + { + style = String (cmr_dict [style]) + to_str ((int)font_h); // ugh + } -Atom -Lookup::time_signature (Array a) const -{ - Atom a ((*symtables_p_) ("param")->lookup ("time_signature")); - a.lambda_ = lambda_scm (a.str_, arr); - a.str_ = "time_signature"; + 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++) + { + if (text[i]=='\\') + for (i++; (i < text.length_i ()) && isalpha(text[i]); i++) + ; + else + { + Character_metric *c = afm_l->get_char (text[i],false); + w += c->dimensions()[X_AXIS].length (); + ydims.unite (c->dimensions()[Y_AXIS]); + } + } + + 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; } + /* - should be handled via Tex_ code and Lookup::bar () */ -Atom -Lookup::vbrace (Real &y) const +Molecule +Lookup::time_signature (int num, int den) 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) + 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) { - warning (_ ("piano brace") - + " " + _ ("too small") + " (" + print_dimen (y) + ")"); - y = min_y; + m.add_at_edge (Y_AXIS, UP, n, 0.0); + m.add_at_edge (Y_AXIS, DOWN, d, 0.0); } - if (y > max_y) + else { - warning (_ ("piano brace") - + " " + _ ("too big") + " (" + print_dimen (y) + ")"); - y = max_y; + m = n; + m.do_center (Y_AXIS); } + return m; +} +Molecule +Lookup::staff_brace (Real y) const +{ + Molecule m; - int idx = int (rint ( (y- min_y)/step)) + 1; + Atom at (gh_list (ly_symbol ("pianobrace"), + gh_double2scm (y), + SCM_UNDEFINED + )); - 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; + m.dim_[Y_AXIS] = Interval (-y/2,y/2); + m.dim_[X_AXIS] = Interval (0,0); + m.add_atom (&at); + return m; } -Atom +Molecule Lookup::hairpin (Real width, bool decresc, bool continued) const { - Atom a; + Molecule m; 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; + + 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; } -Atom +Molecule Lookup::plet (Real dy , Real dx, Direction dir) const { - String ps; - + Molecule m; + SCM thick = ly_symbol ("tuplet_thick"); + Real t = 0.1 PT; + if (paper_l_->scope_p_->elem_b (thick)) + { + t = paper_l_->get_realvar (thick); + } - 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; + 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; } -Atom +/* + Make a smooth curve along the points + */ +Molecule Lookup::slur (Array controls) const { - assert (controls.size () == 8); + Offset delta_off = controls[3]- controls[0]; + Molecule m; - String ps; - - Real dx = controls[3].x () - controls[0].x (); - Real dy = controls[3].y () - controls[0].y (); - Atom a; - - // (lambda (o) (slur o '((0.1 0.2) (1.1 1.2) (2.1 2.2) (3.1 3.2) .. ))) - a.lambda_ = ( - ly_append (ly_lambda_o (), - ly_list1 (ly_append (ly_func_o ("slur"), - ly_list1 (ly_list2 (ly_quote (), - gh_cons (ly_list2 (gh_double2scm (controls[5].x ()), gh_double2scm (controls[5].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[6].x ()), gh_double2scm (controls[6].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[7].x ()), gh_double2scm (controls[7].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[4].x ()), gh_double2scm (controls[4].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[1].x ()), gh_double2scm (controls[1].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[2].x ()), gh_double2scm (controls[2].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[3].x ()), gh_double2scm (controls[3].y ())), - gh_cons (ly_list2 (gh_double2scm (controls[0].x ()), gh_double2scm (controls[0].y ())), - SCM_EOL)))))))))))))); - a.str_ = "slur"; - - a.dim_[X_AXIS] = Interval (0, dx); - a.dim_[Y_AXIS] = Interval (0 ? dy); - a.font_ = font_; - return 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]]); + + + 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; } -Atom -Lookup::vbracket (Real &y) const +Molecule +Lookup::staff_bracket (Real y) const { - Atom a; - Real min_y = paper_l_->staffheight_f (); - if (y < min_y) + 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)) { - warning (_ ("bracket") - + " " + _ ("too small") + " (" + print_dimen (y) + ")"); -// y = min_y; + t = paper_l_->get_realvar (thick); } - 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; + 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); +} +