X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=9d85d63ba9ec3282c8703e3e2174dfc515f4e861;hb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;hp=319b038bad1a0d6396edc5a8e5781f700de5f247;hpb=946c135a338e2daadfed8da3026f0ed9d29bf9ad;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 319b038bad..9d85d63ba9 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,209 +3,244 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--1998 Han-Wen Nienhuys - TODO - This doth suck. We should have PS output, and read spacing info from TFMs - - Glissando, bracket + Jan Nieuwenhuizen + TODO + 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 () { paper_l_ = 0; - texsetting = "\\unknowntexsetting"; symtables_p_ = new Symtables; + afm_p_ =0; } -Lookup::Lookup (Lookup const &s) +Lookup::Lookup (Lookup const& s) { + font_ = s.font_; + font_path_ = s.font_path_; paper_l_ = s.paper_l_; - texsetting = s.texsetting; 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() + +Lookup::~Lookup () { + delete afm_p_; delete symtables_p_; } -void -Lookup::add (String s, Symtable*p) +Atom +Lookup::accidental (int j) const { - symtables_p_->add (s, p); + return afm_find (String ("accidentals") + String ("-") + to_str (j)); } void -Lookup::print() const +Lookup::add (String s, Symtable*p) { -#ifndef NPRINT - DOUT << "Lookup: " << texsetting << " {\n"; - symtables_p_->print(); - DOUT << "}\n"; -#endif + symtables_p_->add (s, p); } Atom -Lookup::text (String style, String text, int dir) const +Lookup::afm_find (String s) const { - Array a; - - a.push (text); - Atom tsym = (*symtables_p_)("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); - Atom s = (*symtables_p_)("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.font_ = font_; + return a; } - - Atom Lookup::ball (int j) const { if (j > 2) j = 2; - Symtable * st = (*symtables_p_)("balls"); - return st->lookup (String (j)); + return afm_find (String ("balls") + String ("-") + to_str (j)); } Atom -Lookup::rest (int j, bool o) const +Lookup::bar (String str, Real h) const { - return (*symtables_p_)("rests")->lookup (String (j) + (o ? "o" : "")); + Array arr; + arr.push (h); + Atom a = (*symtables_p_) ("bars")->lookup (str); + a.lambda_ = lambda_scm (a.str_, arr); + a.dim_.y () = Interval (-h/2, h/2); + a.font_ = font_; + return a; } -Atom -Lookup::fill (Box b) const +Atom +Lookup::beam (Real slope, Real width, Real thick) const { - Atom s ((*symtables_p_)("param")->lookup ("fill")); - s.dim_ = b; - return s; + Atom a (ps_beam (slope, width, thick)); + Real height = slope * width; + Real min_y = (0 ? height) + thick/2; + + a.dim_[X_AXIS] = Interval (0, width); + a.dim_[Y_AXIS] = Interval (min_y, max_y); + return a; } Atom -Lookup::accidental (int j) const +Lookup::clef (String st) const { - return (*symtables_p_)("accidentals")->lookup (String (j)); + return afm_find (String ("clefs") + String ("-") + st); } - Atom -Lookup::bar (String s, Real h) const +Lookup::dashed_slur (Array controls, Real thick, Real dash) const { - Array a; - a.push (print_dimen (h)); - Atom ret=(*symtables_p_)("bars")->lookup (s); - ret.tex_ = substitute_args (ret.tex_, a); - ret.dim_.y() = Interval (-h/2, h/2); - return ret; + assert (controls.size () == 8); + + 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))))))))))); + + return a; } Atom -Lookup::script (String s) const +Lookup::dots () const { - return (*symtables_p_)("scripts")->lookup (s); + return afm_find (String ("dots") + String ("-") + String ("dot")); } Atom -Lookup::dynamic (String s) const +Lookup::dynamic (String st) const { - return (*symtables_p_)("dynamics")->lookup (s); + return (*symtables_p_) ("dynamics")->lookup (st); } Atom -Lookup::clef (String s) const +Lookup::fill (Box b) const { - return (*symtables_p_)("clefs")->lookup (s); + Atom a; + a.dim_ = b; + return a; } Atom -Lookup::dots () const +Lookup::flag (int j, Direction d) const { - return (*symtables_p_)("dots")->lookup ("dot"); + char c = (d == UP) ? 'u' : 'd'; + return afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j)); } -Atom -Lookup::flag (int j, Direction d) const +void +Lookup::print () const { - char c = (d == UP) ? 'u' : 'd'; - return (*symtables_p_)("flags")->lookup (c + String (j)); +#ifndef NPRINT + DOUT << "Lookup {\n"; + symtables_p_->print (); + DOUT << "}\n"; +#endif } Atom -Lookup::streepje (int type) const +Lookup::rest (int j, bool o) const { - if (type > 2) - type = 2; - - Symtable * st = (*symtables_p_)("balls"); - - return st->lookup (String (type) + 'l'); + return afm_find (String ("rests") + + String ("-") + to_str (j) + (o ? "o" : "")); } Atom -Lookup::hairpin (Real &wid, bool decresc) const +Lookup::rule_symbol (Real height, Real width) const { - bool embedded_b = postscript_global_b; - String embed; - Atom ret; - if (embedded_b) - { - Real height = 2 PT; - embed = "\\embeddedps{\n" ; - embed += String (wid) + " " - + String (height) - + " draw_" + String(decresc ? "de" : "") + "cresc}\n"; - ret.tex_ = embed; - } - else - { - if (wid > 32 * 6 PT) - { - warning (_("Crescendo too long (") + print_dimen (wid) - +_( ") shrinking (ugh)")); - wid = 32*6 PT; - } - int idx = int (rint (wid / 6 PT)); - if (!idx) idx ++; - wid = idx*6 PT; - String idxstr = (decresc)? "decrescendosym" : "crescendosym"; - ret=(*symtables_p_)("param")->lookup (idxstr); - - Array a; - a.push (idx); - ret.tex_ = substitute_args (ret.tex_, a); - } - - ret.dim_.x() = Interval (0,wid); - // ret.translate_axis (-ret.dim_[Y_AXIS][DOWN], Y_AXIS); - return ret; + Atom bs= (*symtables_p_) ("param")->lookup ("rule"); + Array args; + args.push (height); + args.push (width); + bs.lambda_ = lambda_scm (bs.str_, args); + bs.dim_.x () = Interval (0, width); + bs.dim_.y () = Interval (0, height); + return bs; } Atom -Lookup::meter (Array a) const +Lookup::script (String str) const { - Atom s((*symtables_p_)("param")->lookup ("meter")); - s.tex_ = substitute_args (s.tex_,a); - return s; + return afm_find (String ("scripts") + String ("-") + str); } +Atom +Lookup::special_time_signature (String s, Array arr) const +{ +#if 0 + String symbolname = "timesig-"+s+"%/%"; + Atom a (afm_find (lambda_scm (symbolname, arr))); + if (!a.empty ()) + return a; + // Try if the full name was given + a = afm_find ("timesig-"+s); + if (!a.empty ()) + return a; + // Resort to default layout with numbers +#endif + return time_signature (arr); +} Atom -Lookup::stem (Real y1,Real y2) const +Lookup::stem (Real y1, Real y2) const { if (y1 > y2) { @@ -215,50 +250,187 @@ Lookup::stem (Real y1,Real y2) const } Atom s; - s.dim_.x() = Interval (0,0); - s.dim_.y() = Interval (y1,y2); + s.dim_.x () = Interval (0,0); + s.dim_.y () = Interval (y1,y2); - Array a; - a.push (print_dimen (y1)); - a.push (print_dimen (y2)); + Array a; + + Real stem_width = paper_l_->get_var ("stemthickness"); + a.push (-stem_width /2); + a.push (stem_width); + a.push (y2); + a.push (-y1); + + s.lambda_ = lambda_scm ("stem", a); + s.font_ = font_; + return s; +} + +Atom +Lookup::streepje (int type) const +{ + if (type > 2) + type = 2; + + return afm_find ("balls" + String ("-") +to_str (type) + "l"); +} + +Atom +Lookup::text (String style, String text) const +{ + Array a; + + a.push (text); + Atom s = (*symtables_p_) ("style")->lookup (style); + s.lambda_ = lambda_scm (s.str_, a); + s.font_ = font_; + + return s; +} + +Atom +Lookup::time_signature (Array a) const +{ + Atom s ((*symtables_p_) ("param")->lookup ("time_signature")); + s.lambda_ = lambda_scm (s.str_, a); - String src = (*symtables_p_)("param")->lookup ("stem").tex_; - s.tex_ = substitute_args (src,a); return s; } /* - should be handled via Tex_ code and Lookup::bar() + should be handled via Tex_ code and Lookup::bar () */ Atom Lookup::vbrace (Real &y) const { - Atom brace = (*symtables_p_)("param")->lookup ("brace"); + Atom brace = (*symtables_p_) ("param")->lookup ( "brace"); Interval ydims = brace.dim_[Y_AXIS]; Real min_y = ydims[LEFT]; Real max_y = ydims[RIGHT]; - Real step = 2.0 PT; + Real step = 1.0 PT; if (y < min_y) { - warning (_("piano brace too small (") + print_dimen (y)+ ")"); + warning (_ ("piano brace") + + " " + _ ("too small") + " (" + print_dimen (y) + ")"); y = min_y; } if (y > max_y) { - warning (_("piano brace too big (") + print_dimen (y)+ ")"); + warning (_ ("piano brace") + + " " + _ ("too big") + " (" + print_dimen (y) + ")"); y = max_y; } - int idx = int (rint ((y- min_y)/step)) + 1; + int idx = int (rint ( (y- min_y)/step)) + 1; - { - Array a; - a.push (idx); - brace.tex_ = substitute_args (brace.tex_,a); - brace.dim_[Y_AXIS] = Interval (-y/2,y/2); - } + Array a; + a.push (idx); + brace.lambda_ = lambda_scm (brace.str_, a); + brace.dim_[Y_AXIS] = Interval (-y/2,y/2); + + brace.font_ = font_; return brace; } + +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; +} + +Atom +Lookup::plet (Real dy , Real dx, Direction dir) const +{ + String ps; + + + ps += String_convert::double_str (dx) + " " + + String_convert::double_str (dy) + " " + + String_convert::int_str ( (int)dir) + + " draw_plet "; + + Atom s; + s.str_ = ps; + return s; +} + +Atom +Lookup::ps_beam (Real slope, Real width, Real thick) const +{ + String ps; + ps += to_str (width) + " "+ to_str (slope) + " " + to_str (thick) + + " draw_beam "; + + Atom s; + s.str_ = ps; + return s; +} + +Atom +Lookup::slur (Array controls) const +{ + assert (controls.size () == 8); + + 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.dim_[X_AXIS] = Interval (0, dx); + a.dim_[Y_AXIS] = Interval (0 ? dy); + a.font_ = font_; + return a; +} + +Atom +Lookup::vbracket (Real &y) const +{ + 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.dim_[Y_AXIS] = Interval (-y/2,y/2); + a.dim_[X_AXIS] = Interval (0,4 PT); + return a; +} + +