X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=c512fcfb7b0b613238986cafd63362697fc74776;hb=c64a05795e51367c17589a9e7d60bad426305159;hp=ae35e4082ffb1075968eef87d33eef78ac8afd56;hpb=ac618734a373960abd700156b4a4aceb12354e68;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index ae35e4082f..c512fcfb7b 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,73 +3,120 @@ 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 #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 "file-path.hh" +#include "main.hh" +#include "lily-guile.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() +Lookup::Lookup () { paper_l_ = 0; - texsetting = "\\unknowntexsetting"; - symtables_ = new Symtables; + 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_ = new Symtables (*s.symtables_); + 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 () { - symtables_->add (s, p); + delete afm_p_; + delete symtables_p_; +} + +Molecule +Lookup::accidental (int j, bool cautionary) const +{ + 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) { -#ifndef NPRINT - DOUT << "Lookup: " << texsetting << " {\n"; - symtables_->print(); - DOUT << "}\n"; -#endif + symtables_p_->add (s, p); } Atom -Lookup::text (String style, String text, int dir) const +Lookup::afm_find (String s, bool warn) const { - Array a; - - a.push (text); - Atom tsym = (*symtables_)("style")->lookup (style); - a[0] = substitute_args (tsym.tex_,a); - - Atom s = (*symtables_)("align")->lookup (dir); - s.tex_ = substitute_args (s.tex_,a); - s.dim_ = tsym.dim_; - return s; -} + 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); + 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; + + a.lambda_ = gh_list (ly_symbol ("char"), + gh_int2scm (m.code ()), + SCM_UNDEFINED); + a.str_ = "afm_find: " + s; + a.font_ = font_; + return a; +} Atom Lookup::ball (int j) const @@ -77,216 +124,406 @@ Lookup::ball (int j) const if (j > 2) j = 2; - Symtable * st = (*symtables_)("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_)("rests")->lookup (String (j) + (o ? "o" : "")); + + Atom a = (*symtables_p_) ("bars")->lookup (str); + + + a.lambda_ = gh_list (ly_symbol (a.str_.ch_C()), + gh_double2scm (h), + SCM_UNDEFINED); + + + 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_)("param")->lookup ("fill")); - s.dim_ = b; - return s; + Real height = slope * width; + Real min_y = (0 ? height) + thick/2; + + Atom a; + a.lambda_ = gh_list (ly_symbol ("beam"), + gh_double2scm (width), + gh_double2scm (slope), + gh_double2scm (thick), + SCM_UNDEFINED); + + 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_)("accidentals")->lookup (String (j)); + return afm_find (String ("clefs") + String ("-") + st); } +SCM +offset2scm (Offset o) +{ + return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), + SCM_UNDEFINED); +} 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_)("bars")->lookup (s);; - ret.tex_ = substitute_args (ret.tex_, a); - ret.dim_.y() = Interval (0, h); - return ret; + 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]); + } + + a.lambda_ = + gh_list (ly_symbol ("dashed-slur"), + gh_double2scm (thick), + gh_double2scm (dash), + ly_quote_scm (array_to_list (sc, 4)), + SCM_UNDEFINED); + + a.str_ = "dashed_slur"; + return a; } Atom -Lookup::script (String s) const +Lookup::dots () const { - return (*symtables_)("scripts")->lookup (s); + return afm_find (String ("dots") + String ("-") + String ("dot")); } Atom -Lookup::dynamic (String s) const +Lookup::dynamic (String st) const { - return (*symtables_)("dynamics")->lookup (s); + return (*symtables_p_) ("dynamics")->lookup (st); } Atom -Lookup::clef (String s) const +Lookup::extender (Real width) const { - return (*symtables_)("clefs")->lookup (s); + Atom a = (*symtables_p_) ("param")->lookup ("extender"); + a.lambda_ = gh_list (ly_symbol (a.str_), + gh_double2scm (width), + SCM_UNDEFINED); + a.str_ = "extender"; + a.font_ = font_; + return a; } - + Atom -Lookup::dots (int j) const +Lookup::fill (Box b) const { - if (j>3) - { - j = 3; - warning ("max 3 dots"); // todo - } - return (*symtables_)("dots")->lookup (j); + Atom a; + a.dim_ = b; + return a; } Atom Lookup::flag (int j, Direction d) const { char c = (d == UP) ? 'u' : 'd'; - return (*symtables_)("flags")->lookup (c + String (j)); + 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 } Atom -Lookup::streepjes (int type, int i) const +Lookup::rest (int j, bool o) const { - assert (i); - - int arg; - String idx; + return afm_find (String ("rests") + + String ("-") + to_str (j) + (o ? "o" : "")); +} + +Atom +Lookup::rule_symbol (Real height, Real width) const +{ + Atom a; + a.lambda_ = gh_list (ly_symbol ("rulesym"), + gh_double2scm (height), + gh_double2scm (width), + SCM_UNDEFINED); + a.dim_.x () = Interval (0, width); + a.dim_.y () = Interval (0, height); + return a; +} + +Atom +Lookup::script (String str) const +{ + return afm_find (String ("scripts") + String ("-") + str); +} + +Atom +Lookup::special_time_signature (String s, Array arr) const +{ + // First guess: s contains only the signature style + assert (arr.size () >1); + String symbolname = "timesig-" + s + to_str (arr[0]) + "/" + to_str (arr[1]); - if (i < 0) - { - idx = "botlines"; - arg = -i; - } - else + 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) { - arg = i; - idx = "toplines"; + Real t = y1; + y1 = y2; + y2 = t; } + Atom a; - // ugh - Real w = paper_l_->note_width (); - if (type <= 0) - w *= 1.46; + a.dim_.x () = Interval (0,0); + a.dim_.y () = Interval (y1,y2); - Atom ret = (*symtables_)("streepjes")->lookup (idx); - - Array a; - a.push (String (w) + "pt"); - a.push (arg); - ret.tex_ = substitute_args (ret.tex_, a); + Real stem_width = paper_l_->get_var ("stemthickness"); + + a.lambda_ = gh_list (ly_symbol ("stem"), + gh_double2scm(-stem_width /2), + gh_double2scm(stem_width), + gh_double2scm(y2), + gh_double2scm(-y1), + SCM_UNDEFINED); - return ret; + a.font_ = font_; + return a; } Atom -Lookup::hairpin (Real &wid, bool decresc) const +Lookup::streepje (int type) const { - int idx = int (rint (wid / 6 PT)); - if (!idx) idx ++; - wid = idx*6 PT; - String idxstr = (decresc)? "decrescendosym" : "crescendosym"; - Atom 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"); } +Dictionary cmr_dict; +Dictionary afm_p_dict; + Atom -Lookup::linestaff (int lines, Real wid) const +Lookup::text (String style, String text) const { - Real internote_f = paper_l_ ->internote_f(); - Atom s; - Real dy = (lines >0) ? (lines-1)*internote_f : 0; - s.dim_ = Box (Interval (0,wid), Interval (0,dy)); + Atom a = (*symtables_p_) ("style")->lookup (style); - Array a; - a.push (lines); - a.push (print_dimen (wid)); + a.lambda_ = gh_list(ly_symbol (a.str_), + gh_str02scm (text.ch_C()), + SCM_UNDEFINED); + + Real font_w = a.dim_.x ().length (); + Real font_h = a.dim_.y ().length (); - s.tex_ = (*symtables_)("param")->lookup ("linestaf").tex_; - s.tex_ = substitute_args (s.tex_, a); + if (!cmr_dict.elem_b ("roman")) + { + //brrrr + cmr_dict.elem ("bold") = "cmbx"; + cmr_dict.elem ("dynamic") = "feta-din"; + cmr_dict.elem ("finger") = "feta-nummer"; + cmr_dict.elem ("italic") = "cmti"; + cmr_dict.elem ("roman") = "cmr"; + } + if (!afm_p_dict.elem_b (style)) + { + Adobe_font_metric* afm_p = 0; + String cmr_str = cmr_dict.elem (style) + to_str ((int) font_h) + ".afm"; + String font_path = global_path.find (cmr_str); + if (!font_path.length_i ()) + { + warning (_f("can't open file: `%s'", cmr_str.ch_C ())); + warning (_f("guessing dimensions for font style: `%s'", style.ch_C ())); + } + else + { + *mlog << "[" << font_path; + afm_p = new Adobe_font_metric (read_afm (font_path)); + DOUT << afm_p->str (); + *mlog << "]" << flush ; + } + afm_p_dict.elem (style) = afm_p; + } + Real w = 0; + Adobe_font_metric* afm_p = afm_p_dict.elem (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 + { + int c = text[i]; + if (afm_p && ((c >= 0) && (c < afm_p->char_metrics_.size ()))) + { + Adobe_font_char_metric m = afm_p->char_metrics_[c]; + w += m.B_.x ().length (); + DOUT << to_str (m.B_.x ().length ()) << " "; + } + else + w += font_w; + } + } + DOUT << "\n" << to_str (w) << "\n"; + a.dim_.x () = Interval (0, w); + a.font_ = font_; + return a; +} + + +Atom +Lookup::time_signature (Array a) const +{ + Atom s ((*symtables_p_) ("param")->lookup ("time_signature")); + s.lambda_ = gh_list (ly_symbol (s.str_), + gh_int2scm (a[0]), + gh_int2scm (a[1]), + SCM_UNDEFINED); return s; } +Atom +Lookup::vbrace (Real &y) const +{ + Atom a; + a.lambda_ = gh_list (ly_symbol ("pianobrace"), + gh_double2scm (y), + SCM_UNDEFINED + ); + a.dim_[Y_AXIS] = Interval (-y/2,y/2); + a.font_ = font_; + return a; +} Atom -Lookup::meter (Array a) const +Lookup::hairpin (Real width, bool decresc, bool continued) const { - Atom 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; + Atom a; + Real height = paper_l_->staffheight_f () / 6; + + String hairpin = String (decresc ? "de" : "") + "crescendo"; + a.lambda_ = gh_list (ly_symbol (hairpin), + gh_double2scm (width), + gh_double2scm (height), + gh_double2scm (continued ? height/2 : 0.0), + SCM_UNDEFINED); + 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 +{ + Atom a; + a.lambda_ = gh_list(ly_symbol ("tuplet"), + gh_double2scm (dx), + gh_double2scm (dy), + gh_int2scm (dir), SCM_UNDEFINED); + return a; } Atom -Lookup::stem (Real y1,Real y2) const +Lookup::slur (Array controls) const { - if (y1 > y2) - { - Real t = y1; - y1 = y2; - y2 = t; - } - Atom 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; + assert (controls.size () == 8); + 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_list (ly_symbol ("slur"), + ly_quote_scm (array_to_list (scontrols, 8)), + SCM_UNDEFINED); + + a.dim_[X_AXIS] = Interval (0, dx); + a.dim_[Y_AXIS] = Interval (0 ? dy); + a.font_ = font_; + return a; } -/* - should be handled via Tex_ code and Lookup::bar() - */ Atom -Lookup::vbrace (Real &y) const +Lookup::vbracket (Real &y) const { - if (y < 2* 20 PT) - { - warning ("piano brace too small (" + print_dimen (y)+ ")"); - y = 2*20 PT; - } - if (y > 67 * 2 PT) + Atom a; + Real min_y = paper_l_->staffheight_f (); + if (y < min_y) { - warning ("piano brace too big (" + print_dimen (y)+ ")"); - y = 67 *2 PT; + warning (_ ("bracket") + + " " + _ ("too small") + " (" + print_dimen (y) + ")"); + // y = min_y; } - - int idx = int (rint ((y/2.0 - 20) + 148)); - - Atom s = (*symtables_)("param")->lookup ("brace"); - { - Array a; - a.push (idx); - s.tex_ = substitute_args (s.tex_,a); - s.dim_.y() = Interval (0,y); - } - { - Array a; - a.push (print_dimen (y/2)); - a.push (print_dimen (0)); - a.push (s.tex_); - s.tex_ = substitute_args ("\\placebox{%}{%}{%}", a); - } - - - return s; + + a.lambda_ = gh_list (ly_symbol ("bracket"), + gh_double2scm (y), + SCM_UNDEFINED); + a.str_ = "vbracket"; + a.dim_[Y_AXIS] = Interval (-y/2,y/2); + a.dim_[X_AXIS] = Interval (0,4 PT); + return a; +} + +Atom +Lookup::volta (Real w, bool last_b) const +{ + Atom a; + a.lambda_ = gh_list (ly_symbol ("volta"), + gh_double2scm (w), + gh_int2scm (last_b), + SCM_UNDEFINED); + a.str_ = "volta"; + Real interline_f = paper_l_->interline_f (); +// a.dim_[Y_AXIS] = Interval (0, 2 * interline_f); + a.dim_[Y_AXIS] = Interval (-interline_f, interline_f); + a.dim_[X_AXIS] = Interval (0, w); + return a; } +