X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=acb4a7e84b2fd1fcd995c4c8f93515fa311403fe;hb=ee6a85310a0fdc38772b2e2e1eeea98fc6a58f65;hp=08591cfe7cd61c811ef0327944029e18eca14f2b;hpb=7c9b553acad88d5cd62461989f0f20652dc04dda;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 08591cfe7c..acb4a7e84b 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -1,234 +1,472 @@ /* lookup.cc -- implement simple Lookup methods. - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--1998 Han-Wen Nienhuys + + Jan Nieuwenhuizen TODO - This doth suck. We should have PS output, and read spacing info from TFMs - - Glissando, bracket - + Read spacing info from AFMs + Glissando */ #include "lookup.hh" #include "debug.hh" +#include "dimensions.hh" #include "symtable.hh" -#include "dimen.hh" -#include "tex.hh" #include "scalar.hh" +#include "paper-def.hh" +#include "string-convert.hh" +#include "main.hh" +#include "lily-guile.hh" + -Lookup::Lookup() +Lookup::Lookup () { - texsetting = "\\unknowntexsetting"; - symtables_ = new Symtables; + paper_l_ = 0; + symtables_p_ = new Symtables; + afm_p_ =0; } -Lookup::Lookup(Lookup const &s) +Lookup::Lookup (Lookup const& s) { - texsetting = s.texsetting; - symtables_ = new Symtables(*s.symtables_); + 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() + +Lookup::Lookup (Symtables const& s) { - delete symtables_; + font_ = s.font_; + font_path_ = s.font_path_; + paper_l_ = 0; + symtables_p_ = new Symtables (s); + afm_p_ = 0; } -void -Lookup::add(String s, Symtable*p) +Lookup::~Lookup () +{ + delete afm_p_; + delete symtables_p_; +} + +Molecule +Lookup::accidental (int j, bool cautionary) const { - symtables_->add(s, p); + 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; } void -Lookup::print()const +Lookup::add (String s, Symtable*p) { - mtor << "Lookup: " << texsetting << " {\n"; - symtables_->print(); - mtor << "}\n"; + symtables_p_->add (s, p); } -Symbol -Lookup::text(String style, String text, int dir) const +Atom +Lookup::afm_find (String s, bool warn) const { - Array a; - - a.push(text); - Symbol tsym = (*symtables_)("style")->lookup(style); - a[0] = substitute_args(tsym.tex,a); + if (!afm_p_) + { + *mlog << "[" << font_path_; + ( (Lookup*)this)->afm_p_ = new Adobe_font_metric (read_afm (font_path_)); + *mlog << "]" << flush ; + DOUT << this->afm_p_->str (); + } + Adobe_font_char_metric m = afm_p_->find_char (s, warn); - Symbol s = (*symtables_)("align")->lookup(dir); - s.tex = substitute_args(s.tex,a); - s.dim = tsym.dim; - return 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; } +Atom +Lookup::ball (int j) const +{ + if (j > 2) + j = 2; + + return afm_find (String ("balls") + String ("-") + to_str (j)); +} -Real -Lookup::internote() const +Atom +Lookup::bar (String str, Real h) const { - return ball(4).dim.y.length()/2; + 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; } -Symbol -Lookup::ball(int j) const +Atom +Lookup::beam (Real slope, Real width, Real thick) const { - if (j > 4) - j = 4; + 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; +} - Symtable * st = (*symtables_)("balls"); - return st->lookup(String(j)); +Atom +Lookup::clef (String st) const +{ + return afm_find (String ("clefs") + String ("-") + st); } -Symbol -Lookup::rest(int j) const +SCM +offset2scm (Offset o) { - return (*symtables_)("rests")->lookup(String(j)); + return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), SCM_UNDEFINED); } -Symbol -Lookup::fill(Box b) const +Atom +Lookup::dashed_slur (Array controls, Real thick, Real dash) const { - Symbol s( (*symtables_)("param")->lookup("fill")); - s.dim = b; - return s; + 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++) + { + sc[i] = offset2scm (controls[i]); + } + + // (lambda (o) (dashed-slur o thick dash '(stuff)) + a.lambda_ = gh_list (gh_append3 (ly_lambda_o (), + ly_func_o ("dashed-slur"), + gh_list (gh_double2scm (thick), + gh_double2scm (dash), + ly_quote_scm (gh_list (sc[0], sc[1], sc[2], sc[3], SCM_UNDEFINED)), + SCM_UNDEFINED) + ), SCM_UNDEFINED); + + a.str_ = "dashed_slur"; + return a; } -Symbol -Lookup::accidental(int j) const +Atom +Lookup::dots () const { - return (*symtables_)("accidentals")->lookup(String(j)); + return afm_find (String ("dots") + String ("-") + String ("dot")); } +Atom +Lookup::dynamic (String st) const +{ + return (*symtables_p_) ("dynamics")->lookup (st); +} -Symbol -Lookup::bar(String s) const +Atom +Lookup::fill (Box b) const { - return (*symtables_)("bars")->lookup(s); + Atom a; + a.dim_ = b; + return a; } -Symbol -Lookup::script(String s) const +Atom +Lookup::flag (int j, Direction d) const { - return (*symtables_)("scripts")->lookup(s); + char c = (d == UP) ? 'u' : 'd'; + Atom a = afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j)); + return a; } -Symbol -Lookup::dynamic(String s) const +void +Lookup::print () const { - return (*symtables_)("dynamics")->lookup(s); +#ifndef NPRINT + DOUT << "Lookup {\n"; + symtables_p_->print (); + DOUT << "}\n"; +#endif } -Symbol -Lookup::clef(String s) const +Atom +Lookup::rest (int j, bool o) const { - return (*symtables_)("clefs")->lookup(s); + return afm_find (String ("rests") + + String ("-") + to_str (j) + (o ? "o" : "")); } - -Symbol -Lookup::dots(int j) const + +Atom +Lookup::rule_symbol (Real height, Real width) const { - if (j>3) - error("max 3 dots"); // todo - return (*symtables_)("dots")->lookup(j); + 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; } -Symbol -Lookup::flag(int j) const +Atom +Lookup::script (String str) const { - return (*symtables_)("flags")->lookup(j); + return afm_find (String ("scripts") + String ("-") + str); } -Symbol -Lookup::streepjes(int i) const +Atom +Lookup::special_time_signature (String s, Array arr) const { - assert(i); - - int arg; - String idx; - - if (i < 0) { - idx = "botlines"; - arg = -i; - } else { - arg = i; - idx = "toplines"; + // First guess: s contains only the signature style + assert (arr.size () >1); + String symbolname = "timesig-" + s + to_str (arr[0]) + "/" + to_str (arr[1]); + + 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) + { + Real t = y1; + y1 = y2; + y2 = t; } - Symbol ret = (*symtables_)("streepjes")->lookup(idx); - - Array a; - a.push(arg); - ret.tex = substitute_args(ret.tex, a); + Atom a; - return ret; + 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 a; } -Symbol -Lookup::hairpin(Real &wid, bool decresc) const +Atom +Lookup::streepje (int type) const { - int idx = int(rint(wid / 6 PT)); - if(!idx) idx ++; - wid = idx*6 PT; - String idxstr = (decresc)? "decrescendosym" : "crescendosym"; - Symbol ret=(*symtables_)("param")->lookup(idxstr); - - Array a; - a.push(idx); - ret.tex = substitute_args(ret.tex, a); - ret.dim.x = Interval(0,wid); - return ret; + if (type > 2) + type = 2; + + return afm_find ("balls" + String ("-") +to_str (type) + "l"); } -Symbol -Lookup::linestaff(int lines, Real wid) const +Atom +Lookup::text (String style, String text) const { - Symbol s; - s.dim.x = Interval(0,wid); - Real dy = (lines >0) ? (lines-1)*internote()*2 : 0; - s.dim.y = Interval(0,dy); + Array arr; + + arr.push (text); + Atom a = (*symtables_p_) ("style")->lookup (style); + a.lambda_ = lambda_scm (a.str_, arr); + a.str_ = "text"; + a.font_ = font_; + return a; + +} + - Array a; - a.push(lines); - a.push(print_dimen(wid)); +Atom +Lookup::time_signature (Array a) const +{ + Atom s ((*symtables_p_) ("param")->lookup ("time_signature")); + s.lambda_ = (lambda_scm (s.str_, a)); - s.tex = (*symtables_)("param")->lookup("linestaf").tex; - s.tex = substitute_args(s.tex, a); + return s; +} - return s; +/* + 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; + } + + + 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; } +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; +} -Symbol -Lookup::meter(Array a) const +Atom +Lookup::plet (Real dy , Real dx, Direction dir) const { - Symbol s; - s.dim.x = Interval( 0 PT, 10 PT); - s.dim.y = Interval(0, 20 PT); // todo - String src = (*symtables_)("param")->lookup("meter").tex; - s.tex = substitute_args(src,a); - return s; + 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; } +Atom +Lookup::slur (Array controls) const +{ + assert (controls.size () == 8); -Symbol -Lookup::stem(Real y1,Real y2) const + 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; +} + +Atom +Lookup::vbracket (Real &y) const { - if (y1 > y2) { - Real t = y1; - y1 = y2; - y2 = t; + Atom a; + Real min_y = paper_l_->staffheight_f (); + if (y < min_y) + { + warning (_ ("bracket") + + " " + _ ("too small") + " (" + print_dimen (y) + ")"); + // y = min_y; } - Symbol s; - - s.dim.x = Interval(0,0); - s.dim.y = Interval(y1,y2); - - Array a; - a.push(print_dimen(y1)); - a.push(print_dimen(y2)); - - String src = (*symtables_)("param")->lookup("stem").tex; - s.tex = substitute_args(src,a); - return s; + 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; } + +