X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=1e24db5da75f95619e93c0dbbbe94f46545412a5;hb=6f96331d77b66f223cd9f4f68b857b53a2dd6c03;hp=c6ce6f6297695c029ea744f83d5de844367e77a0;hpb=dc9082a408724f100eb54ec80fbb0c8d0decb898;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index c6ce6f6297..1e24db5da7 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,526 +3,355 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys Jan Nieuwenhuizen TODO - Read spacing info from AFMs Glissando */ - +#include #include -#include "lookup.hh" -#include "debug.hh" + +#include "warn.hh" #include "dimensions.hh" -#include "symtable.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 "molecule.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; - symtables_p_ = new Symtables; - afm_p_ =0; -} + Box b( Interval (0, width), + Interval (min_y, max_y)); -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; + + SCM at = gh_list (ly_symbol2scm ("beam"), + gh_double2scm (width), + gh_double2scm (slope), + gh_double2scm (thick), + SCM_UNDEFINED); + return Molecule (b, at); } -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 () -{ - delete afm_p_; - delete symtables_p_; -} Molecule -Lookup::accidental (int j, bool cautionary) const +Lookup::dashed_slur (Bezier b, Real thick, Real dash) { - 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::add (String s, Symtable*p) -{ - symtables_p_->add (s, p); -} + SCM l = SCM_EOL; -Atom -Lookup::afm_find (String s, bool warn) const -{ - if (!afm_p_) + for (int i= 4; i -- ;) { - *mlog << "[" << font_path_; - ( (Lookup*)this)->afm_p_ = new Adobe_font_metric (read_afm (font_path_)); - *mlog << "]" << flush ; - DOUT << this->afm_p_->str (); + l = gh_cons (ly_offset2scm (b.control_[i]), l); } - 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 -{ - 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 ("balls") + String ("-") + to_str (j)); + Box box (Interval(0,0),Interval( 0,0)); + return Molecule (box, at); } -Atom -Lookup::bar (String str, Real h) const -{ - - 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::beam (Real slope, Real width, Real thick) const +Molecule +Lookup::blank (Box b) { - 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; + return Molecule (b, SCM_EOL); } -Atom -Lookup::clef (String st) const -{ - return afm_find (String ("clefs") + String ("-") + st); -} -SCM -offset2scm (Offset o) +Molecule +Lookup::filledbox (Box b ) { - return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), - SCM_UNDEFINED); + 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)); + + return Molecule ( b,at); } -Atom -Lookup::dashed_slur (Array controls, Real thick, Real dash) const +Molecule +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]; - - 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++) + Molecule m; + 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); } - - 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::dots () const -{ - return afm_find (String ("dots") + String ("-") + String ("dot")); -} - -Atom -Lookup::dynamic (String st) const -{ - return (*symtables_p_) ("dynamics")->lookup (st); -} - -Atom -Lookup::extender (Real width) const -{ - 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::fill (Box b) const -{ - Atom a; - a.dim_ = b; - return a; -} - -Atom -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 -} - -Atom -Lookup::rest (int j, bool o) const -{ - return afm_find (String ("rests") - + String ("-") + to_str (j) + (o ? "o" : "")); + return m; + } -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 +/* + Make a smooth curve along the points + */ +Molecule +Lookup::slur (Bezier curve, Real curvethick, Real linethick) { - return afm_find (String ("scripts") + String ("-") + str); -} + Real alpha = (curve.control_[3] - curve.control_[0]).arg (); + Bezier back = curve; -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]); - - Atom a = afm_find (symbolname, false); - if (!a.empty ()) - return a; + 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)); - // Second guess: s contains the full signature name - a = afm_find ("timesig-"+s, false); - if (!a.empty ()) - return a; + SCM scontrols[8]; - // Resort to default layout with numbers - return time_signature (arr); -} + 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]); -Atom -Lookup::stem (Real y1, Real y2) const -{ - if (y1 > y2) + /* + 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--; ) { - Real t = y1; - y1 = y2; - y2 = t; + list = gh_cons (scontrols[indices[i]], list); } - Atom a; - - a.dim_.x () = Interval (0,0); - a.dim_.y () = Interval (y1,y2); - - 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); - - a.font_ = font_; - return a; -} - -Atom -Lookup::streepje (int type) const -{ - if (type > 2) - type = 2; + + + SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + gh_double2scm (linethick), + SCM_UNDEFINED)); - return afm_find ("balls" + String ("-") +to_str (type) + "l"); + Box b ( curve.extent (X_AXIS), curve.extent (Y_AXIS)); + return Molecule (b, at); } -Dictionary cmr_dict; -Dictionary afm_p_dict; - -Atom -Lookup::text (String style, String text) const +Molecule +Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { - Atom a = (*symtables_p_) ("style")->lookup (style); + Molecule m; + String sym = ly_scm2string(gh_car (s)); + String reg = ly_scm2string(gh_car (gh_cdr(s))); - 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 (); - - if (!cmr_dict.elem_b ("roman")) + if (sym == "Discant") { - //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"; + 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 (!afm_p_dict.elem_b (style)) + else if (sym == "Freebase") { - 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 ())); + 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); } - else - { - *mlog << "[" << font_path; - afm_p = new Adobe_font_metric (read_afm (font_path)); - DOUT << afm_p->str (); - *mlog << "]" << flush ; + 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); } - 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++) + else if (sym == "Bayanbase") { - if (text[i]=='\\') - for (i++; (i < text.length_i ()) && isalpha(text[i]); i++) - ; - else + 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") { - 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; + 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); } } - 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::hairpin (Real width, bool decresc, bool continued) const -{ - 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)); - return a; -} - - -Atom -Lookup::slur (Array controls) const -{ - 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; -} - -Atom -Lookup::vbracket (Real &y) const -{ - Atom a; - Real min_y = paper_l_->staffheight_f (); - if (y < min_y) + else if (sym == "Stdbase") { - warning (_ ("bracket") - + " " + _ ("too small") + " (" + print_dimen (y) + ")"); - // y = min_y; + 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") + { + 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); + } } - - 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 (-interline_f / 2, interline_f / 2); - a.dim_[X_AXIS] = Interval (0, w); - return a; + /* 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") + { + Molecule r = fm->find_by_name ("accordion-accSB"); + m.add_molecule(r); + } + else if (sym == "BB") + { + Molecule r = fm->find_by_name ("accordion-accBB"); + m.add_molecule(r); + } + else if (sym == "OldEE") + { + Molecule r = fm->find_by_name ("accordion-accOldEE"); + m.add_molecule(r); + } + else if (sym == "OldEES") + { + Molecule r = fm->find_by_name ("accordion-accOldEES"); + m.add_molecule(r); + } + return m; }