X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flookup.cc;h=c3d2213592630ba3b37ed7cf0e2064683b2cbb44;hb=fd7e615444cf58b38283a59b56d3457c07778397;hp=76255075541ea97b08a04c145e92575f3aad7024;hpb=fd67592c6acb9b8e9ac10135d688b3f4938ac0b1;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 7625507554..c3d2213592 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,412 +3,756 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--1999 Han-Wen Nienhuys - TODO - This doth suck. We should have PS output, and read spacing info from AFMs - - Glissando, + Jan Nieuwenhuizen + TODO + Glissando */ - +#include +#include #include "lookup.hh" #include "debug.hh" -#include "symtable.hh" -#include "dimension.hh" -#include "tex.hh" -#include "scalar.hh" +#include "dimensions.hh" + #include "paper-def.hh" #include "string-convert.hh" +#include "file-path.hh" #include "main.hh" +#include "lily-guile.hh" +#include "all-font-metrics.hh" +#include "afm.hh" +#include "scope.hh" +#include "molecule.hh" +#include "atom.hh" +#include "lily-guile.hh" -Lookup::Lookup() -{ - paper_l_ = 0; - symtables_p_ = new Symtables; - afm_p_ =0; -} -Lookup::Lookup (Lookup const &s) +Lookup::Lookup () { - font_ = s.font_; - font_path_ = s.font_path_; - paper_l_ = s.paper_l_; - symtables_p_ = new Symtables (*s.symtables_p_); - afm_p_ = 0; + afm_l_ = 0; } -Lookup::~Lookup() +Lookup::Lookup (Lookup const& s) { - delete afm_p_; - delete symtables_p_; + font_name_ = s.font_name_; + afm_l_ = 0; } -Atom -Lookup::afm_find (String s) const -{ - 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 a; - a.tex_ = String_convert::form_str ("\\char%d", m.code ()); - a.dim_ = m.B_; - a.dim_[X_AXIS] *= 1 / 1000.0; - a.dim_[Y_AXIS] *= 1 / 1000.0; - a.font_ = font_; - return a; -} -void -Lookup::add (String s, Symtable*p) +/* + build a ledger line for small pieces. + */ +Molecule +Lookup::ledger_line (Interval xwid) const { - symtables_p_->add (s, p); -} + Drul_array endings; + endings[LEFT] = afm_find ("noteheads-ledgerending"); + Molecule * e = &endings[LEFT]; + endings[RIGHT] = *e; + + Real thick = e->dim_[Y_AXIS].length(); + Real len = e->dim_[X_AXIS].length () - thick; -void -Lookup::print() const -{ -#ifndef NPRINT - DOUT << "Lookup {\n"; - symtables_p_->print(); - DOUT << "}\n"; -#endif -} + Molecule total; + Direction d = LEFT; + do { + endings[d].translate_axis (xwid[d] - endings[d].dim_[X_AXIS][d], X_AXIS); + total.add_molecule (endings[d]); + } while ((flip(&d)) != LEFT); -Atom -Lookup::text (String style, String text) const -{ - Array a; + Real xpos = xwid [LEFT] + len; - a.push (text); - Atom tsym = (*symtables_p_)("style")->lookup (style); - tsym.tex_ = substitute_args (tsym.tex_,a); - tsym.font_ = font_; + while (xpos + len + thick /2 <= xwid[RIGHT]) + { + e->translate_axis (len, X_AXIS); + total.add_molecule (*e); + xpos += len; + } - return tsym; + return total; } -Atom -Lookup::ball (int j) const -{ - if (j > 2) - j = 2; - Atom s = afm_find (String ("balls") + String ("-") + to_str (j)); - return s; +Molecule +Lookup::afm_find (String s, bool warn) const +{ + if (!afm_l_) + { + Lookup * me = (Lookup*)(this); + me->afm_l_ = all_fonts_global_p->find_afm (font_name_); + if (!me->afm_l_) + { + warning (_f ("Can't find font: `%s'", font_name_)); + warning (_f ("(search path: `%s')", global_path.str ().ch_C())); + error (_ ("Aborting")); + } + } + Adobe_font_char_metric cm = afm_l_->find_char (s, warn); + Molecule m; + if (cm.code () < 0) + { + /* + don't want people relying on this kind of dimension. + */ + m.set_empty (false); + return m; + } + + Atom at (gh_list (ly_symbol2scm ("char"), + gh_int2scm (cm.code ()), + SCM_UNDEFINED)); + + at.fontify (afm_l_); + m.dim_ = cm.dimensions(); + m.add_atom (&at); + return m; } -Atom -Lookup::rest (int j, bool o) const +Molecule +Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const { - Atom s =afm_find (String ("rests") - + String ("-") + to_str (j) + (o ? "o" : "")); - - return s; + SCM thick = ly_symbol2scm (("barthick_" + type).ch_C()); + Real w = 0.0; + + if (paper_l->scope_p_->elem_b (thick)) + { + w = paper_l->get_realvar (thick); + } + else + { + programming_error ("No bar thickness set ! "); + w = 1 PT; + } + return filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); } -Atom -Lookup::fill (Box b) const + +Molecule +Lookup::bar (String str, Real h, Paper_def *paper_l) const { - Atom s; - s.tex_ = ""; - s.dim_ = b; + if (str == "bracket") + return staff_bracket (h, paper_l); + else if (str == "brace") + { + Real staffht = paper_l->get_var ("staffheight"); + return staff_brace (h,staffht); + } + Real kern = paper_l->get_var ("bar_kern"); + Real thinkern = paper_l->get_var ("bar_thinkern"); - return s; + Molecule thin = simple_bar ("thin", h, paper_l); + Molecule thick = simple_bar ("thick", h, paper_l); + Molecule colon = afm_find ("dots-repeatcolon", paper_l); + + Molecule m; + + if (str == "") + { + return fill (Box (Interval(0, 0), Interval (-h/2, h/2))); + } + if (str == "scorepostbreak") + { + return simple_bar ("score", h, paper_l); + } + 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 -Lookup::accidental (int j) const +Molecule +Lookup::beam (Real slope, Real width, Real thick) const { - Atom s= afm_find (String ("accidentals") + String ("-") + to_str (j)); - return s; -} + Real height = slope * width; + Real min_y = (0 ? height) + thick/2; + + Molecule m; + Atom at + (gh_list (ly_symbol2scm ("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 -Lookup::bar (String s, Real h) const +SCM +offset2scm (Offset o) { - 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); - ret.font_ = font_; - return ret; + return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), + SCM_UNDEFINED); } -Atom -Lookup::script (String st) const +Molecule +Lookup::dashed_slur (Array controls, Real thick, Real dash) const { - Atom s= afm_find (String ("scripts") + String ("-") + st); + assert (controls.size () == 8); + Offset d = controls[3] - controls[0]; + + Real dx = d[X_AXIS]; + Real dy = d[Y_AXIS]; + + Molecule m; + + + 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]); + } - return s; + Atom at + (gh_list (ly_symbol2scm ("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 -Lookup::dynamic (String st) const + + + +Molecule +Lookup::fill (Box b) const { - return (*symtables_p_) ("dynamics")->lookup (st); + Molecule m; + m.dim_ = b; + return m; } -Atom -Lookup::clef (String st) const -{ - Atom s=afm_find (String ("clefs") + String ("-") + st); - return s; -} -Atom -Lookup::dots () const +Molecule +Lookup::special_time_signature (String s, int n, int d, Paper_def*pap) const { - Atom s=afm_find (String ("dots") + String ("-") + String("dot")); + // First guess: s contains only the signature style + String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d); - return s; -} + Molecule m = afm_find (symbolname, false); + if (!m.empty_b()) + return m; -Atom -Lookup::flag (int j, Direction d) const -{ - char c = (d == UP) ? 'u' : 'd'; - Atom s=afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j)); + // Second guess: s contains the full signature name + m = afm_find ("timesig-"+s, false); + if (!m.empty_b ()) + return m; - return s; + // Resort to default layout with numbers + return time_signature (n,d,pap); } -Atom -Lookup::dashed_slur (Array controls, Real thick, Real dash) const +Molecule +Lookup::filledbox (Box b ) const { - assert (controls.size () == 8); - - String ps = "\\embeddedps{\n"; + Molecule m; - Real dx = controls[3].x () - controls[0].x (); - Real dy = controls[3].y () - controls[0].y (); - - for (int i = 1; i < 4; i++) - ps += String_convert::double_str (controls[i].x ()) + " " - + String_convert::double_str (controls[i].y ()) + " "; - - ps += String_convert::double_str (controls[0].x ()) + " " - + String_convert::double_str (controls[0].y ()) + " "; - - ps += String_convert::double_str (thick) + " "; - Real on = dash > 1? thick * dash - thick : 0; - Real off = 2 * thick; - ps += "[" + String_convert::double_str (on) + " "; - ps += String_convert::double_str (off) + "] "; - ps += String_convert::int_str (0) + " "; - ps += " draw_dashed_slur}"; - - Atom s; - s.tex_ = ps; + Atom 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)); + + m.dim_ = b; + m.add_atom (&at); + return m; +} + +/* + TODO: THIS IS UGLY. Since the user has direct access to TeX + strings, we try some halfbaked attempt to detect TeX trickery. + */ +String +sanitise_TeX_string (String text) +{ + int brace_count =0; + for (int i= 0; i < text.length_i (); i++) + { + if (text[i] == '\\') + continue; + + if (text[i] == '{') + brace_count ++; + else if (text[i] == '}') + brace_count --; + } - s.dim_[X_AXIS] = Interval (0, dx); - s.dim_[Y_AXIS] = Interval (0 ? dy); - s.font_ = font_; - return s; + if(brace_count) + { + warning (_f ("Non-matching braces in text `%s', adding braces", text.ch_C())); + + if (brace_count < 0) + { + text = to_str ('{', -brace_count) + text; + } + else + { + text = text + to_str ('}', brace_count); + } + } + + return text; } -Atom -Lookup::slur (Array controls) const +/** + TODO! + */ +String +sanitise_PS_string (String t) { - assert (controls.size () == 8); + return t; +} + +/** - String ps = "\\embeddedps{\n"; +*/ +Molecule +Lookup::text (String style, String text, Paper_def *paper_l) const +{ + Molecule m; + if (style.empty_b ()) + style = "roman"; - Real dx = controls[3].x () - controls[0].x (); - Real dy = controls[3].y () - controls[0].y (); + int font_mag = 0; + 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); + } - for (int i = 5; i < 8; i++) - ps += String_convert::double_str (controls[i].x ()) + " " - + String_convert::double_str (controls[i].y ()) + " "; - ps += String_convert::double_str (controls[4].x ()) + " " - + String_convert::double_str (controls[4].y ()) + " "; - - for (int i = 1; i < 4; i++) - ps += String_convert::double_str (controls[i].x ()) + " " - + String_convert::double_str (controls[i].y ()) + " "; + if (paper_l->scope_p_->elem_b ("magnification_" + style)) + { + font_mag = (int)paper_l->get_var ("magnification_" + style); + } + + /* + UGH. + */ + SCM l = ly_eval_str (("(style-to-cmr \"" + style + "\")").ch_C()); + if (l != SCM_BOOL_F) + { + style = ly_scm2string (gh_cdr(l)) +to_str ((int)font_h); + } - ps += String_convert::double_str (controls[0].x ()) + " " - + String_convert::double_str (controls[0].y ()) + " "; + - ps += " draw_slur}"; + Font_metric* metric_l = 0; - Atom s; - s.tex_ = ps; + if (font_mag) + metric_l = all_fonts_global_p->find_scaled (style, font_mag); + else + metric_l = all_fonts_global_p->find_font (style); + + + if (output_global_ch == "tex") + text = sanitise_TeX_string (text); + else if (output_global_ch == "ps") + text = sanitise_PS_string (text); + + m.dim_ = metric_l->text_dimension (text); - s.dim_[X_AXIS] = Interval (0, dx); - s.dim_[Y_AXIS] = Interval (0 ? dy); - s.font_ = font_; - return s; + Atom at (gh_list (ly_symbol2scm ("text"), + ly_str02scm (text.ch_C()), + SCM_UNDEFINED)); + at.fontify (metric_l); + + m.add_atom (&at); + return m; +} + + + +Molecule +Lookup::time_signature (int num, int den, Paper_def *paper_l) const +{ + String sty = "number"; + Molecule n (text (sty, to_str (num), paper_l)); + Molecule d (text (sty, to_str (den), paper_l)); + n.align_to (X_AXIS, CENTER); + d.align_to (X_AXIS, CENTER); + Molecule m; + if (den) + { + m.add_at_edge (Y_AXIS, UP, n, 0.0); + m.add_at_edge (Y_AXIS, DOWN, d, 0.0); + } + else + { + m = n; + m.align_to (Y_AXIS, CENTER); + } + return m; } -Atom -Lookup::streepje (int type) const +Molecule +Lookup::staff_brace (Real y, int staff_size) const { - if (type > 2) - type = 2; + Molecule m; + + Real step = 1.0; + int minht = 2 * staff_size; + int maxht = 7 * minht; + int idx = int (((maxht - step) ? 0; + - return afm_find ("balls" + String ("-") +to_str (type) + "l"); + String nm = String ("feta-braces" + to_str (staff_size)); + SCM e =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED); + Atom at (e); + + at.fontify (all_fonts_global_p->find_font (nm)); + + m.dim_[Y_AXIS] = Interval (-y/2,y/2); + m.dim_[X_AXIS] = Interval (0,0); + m.add_atom (&at); + return m; } -Atom -Lookup::hairpin (Real width, bool decresc, bool continued) const + + +Molecule +Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap, + Real height, Direction dir) const { - String embed; - Atom ret; - Real height = paper_l_->staffheight_f () / 6; - embed = "\\embeddedps{\n" ; - embed += to_str (width) + " " - + to_str (height) + " " - + to_str (continued ? height/2 : 0) + - + " draw_" + String(decresc ? "de" : "") + "cresc}\n"; - ret.tex_ = embed; - - - ret.dim_.x () = Interval (0, width); - ret.dim_.y () = Interval (-2*height, 2*height); - ret.font_ = font_; - return ret; + Molecule m; + + Atom at (gh_list(ly_symbol2scm ("tuplet"), + gh_double2scm (height), + gh_double2scm (gap), + gh_double2scm (dx), + gh_double2scm (dy), + gh_double2scm (thick), + gh_int2scm (dir), + SCM_UNDEFINED)); + m.add_atom (&at); + + return m; } -Atom -Lookup::time_signature (Array a) const +/* + Make a smooth curve along the points + */ +Molecule +Lookup::slur (Array controls, Real linethick) const { - Atom s((*symtables_p_)("param")->lookup ("time_signature")); - s.tex_ = substitute_args (s.tex_,a); + Offset delta_off = controls[3]- controls[0]; + Molecule m; - return s; -} + 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 -Lookup::stem (Real y1,Real y2) 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); + Atom at (gh_list (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (array_to_list (scontrols, 8)), + gh_double2scm (linethick), + SCM_UNDEFINED)); - Array a; + 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; +} +Molecule +Lookup::staff_bracket (Real height, Paper_def* paper_l) const +{ + Molecule m; + Atom at ( gh_list (ly_symbol2scm ("bracket"), + gh_double2scm (paper_l->get_var("bracket_arch_angle")), + gh_double2scm (paper_l->get_var("bracket_arch_width")), + gh_double2scm (paper_l->get_var("bracket_arch_height")), + gh_double2scm (paper_l->get_var("bracket_width")), + gh_double2scm (height), + gh_double2scm (paper_l->get_var("bracket_arch_thick")), + gh_double2scm (paper_l->get_var("bracket_thick")), + SCM_UNDEFINED)); - Real stem_width = paper_l_->get_var ("stemthickness"); - a.push (print_dimen (-stem_width /2)); - a.push (print_dimen (stem_width)); - a.push (print_dimen (y2)); - a.push (print_dimen (-y1)); - - String src = "\\kern %\\vrule width % height % depth %"; - s.tex_ = substitute_args (src,a); - s.font_ = font_; - return s; + m.add_atom (&at); + m.dim_[Y_AXIS] = Interval (-height/2,height/2); + m.dim_[X_AXIS] = Interval (0,4 PT); + + m.translate_axis (- 4. / 3. * m.dim_[X_AXIS].length (), X_AXIS); + return m; } -/* - should be handled via Tex_ code and Lookup::bar() - */ -Atom -Lookup::vbrace (Real &y) const +Molecule +Lookup::volta (Real h, Real w, Real thick, bool vert_start, bool vert_end) const { - 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 = 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; - } + Molecule m; - - int idx = int (rint ((y- min_y)/step)) + 1; - - { - Array a; - a.push (to_str (idx)); - brace.tex_ = substitute_args (brace.tex_,a); - brace.dim_[Y_AXIS] = Interval (-y/2,y/2); - } + Atom at (gh_list (ly_symbol2scm ("volta"), + gh_double2scm (h), + gh_double2scm (w), + gh_double2scm (thick), + gh_int2scm (vert_start), + gh_int2scm (vert_end), + SCM_UNDEFINED)); - brace.font_ = font_; + m.dim_[Y_AXIS] = Interval (- h/2, h/2); + m.dim_[X_AXIS] = Interval (0, w); - return brace; + m.add_atom (&at); + return m; } -Atom -Lookup::vbracket (Real &y) const +Molecule +Lookup::accordion (SCM s, Real interline_f) const { - Atom psbracket; - Real min_y = paper_l_->staffheight_f (); - if (y < min_y) + Molecule m; + String sym = ly_scm2string(gh_car (s)); + String reg = ly_scm2string(gh_car (gh_cdr(s))); + + if (sym == "Discant") { - warning (_ ("bracket") - + " " + _ ("too small") + "(" + print_dimen (y) + ")"); -// y = min_y; + Molecule r = afm_find("scripts-accDiscant"); + m.add_molecule(r); + if (reg.left_str(1) == "F") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 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 = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 1.5 PT, Y_AXIS); + m.add_molecule(d); + } + if (eflag & 0x04) + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 1.5 PT, Y_AXIS); + d.translate_axis(0.8 * interline_f PT, X_AXIS); + m.add_molecule(d); + } + if (eflag & 0x01) + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 1.5 PT, Y_AXIS); + d.translate_axis(-0.8 * interline_f PT, X_AXIS); + m.add_molecule(d); + } + if (reg.left_str(2) == "SS") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(0.5 * interline_f PT, Y_AXIS); + d.translate_axis(0.4 * interline_f PT, X_AXIS); + m.add_molecule(d); + d.translate_axis(-0.8 * interline_f PT, X_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-2); + } + if (reg.left_str(1) == "S") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(0.5 * interline_f PT, Y_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-1); + } } - psbracket.tex_ = String ("\\embeddedps{ ") + to_str (y) + " draw_bracket}"; - psbracket.dim_[Y_AXIS] = Interval (-y/2,y/2); - psbracket.dim_[X_AXIS] = Interval (0,4 PT); - return psbracket; -#if 0 - Atom bracket = afm_find (String ("param") + "bracket"); - Interval ydims = bracket.dim_[Y_AXIS]; - - Real min_y = ydims[LEFT]; - Real max_y = ydims[RIGHT]; - Real step = 1.0 PT; - - if (y < min_y) + else if (sym == "Freebase") { - warning (_ ("bracket") - + " " + _ ("too small") + "(" + print_dimen (y) + ")"); - y = min_y; + Molecule r = afm_find("scripts-accFreebase"); + m.add_molecule(r); + if (reg.left_str(1) == "F") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 1.5 PT, Y_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-1); + } + if (reg == "E") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 0.5 PT, Y_AXIS); + m.add_molecule(d); + } } - if (y > max_y) + else if (sym == "Bayanbase") { - warning (_ ("bracket") - + " " + _ ("too big") + "(" + print_dimen (y)+ ")"); - y = max_y; + Molecule r = afm_find("scripts-accBayanbase"); + m.add_molecule(r); + if (reg.left_str(1) == "T") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 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 = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 1.5 PT, Y_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-1); + } + if (reg.left_str(2) == "EE") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 0.5 PT, Y_AXIS); + d.translate_axis(0.4 * interline_f PT, X_AXIS); + m.add_molecule(d); + d.translate_axis(-0.8 * interline_f PT, X_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-2); + } + if (reg.left_str(1) == "E") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 0.5 PT, Y_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-1); + } } - - - int idx = int (rint ((y- min_y)/step)) + 1; - - { - Array a; - a.push (to_str (idx)); - bracket.tex_ = substitute_args (bracket.tex_,a); - bracket.dim_[Y_AXIS] = Interval (-y/2,y/2); - } - - return bracket; -#endif + else if (sym == "Stdbase") + { + Molecule r = afm_find("scripts-accStdbase"); + m.add_molecule(r); + if (reg.left_str(1) == "T") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 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 = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 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 = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 2 PT, Y_AXIS); + d.translate_axis(interline_f PT, X_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-1); + } + if (reg.left_str(1) == "E") + { + Molecule d = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 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 = afm_find("scripts-accDot"); + d.translate_axis(interline_f * 0.5 PT, Y_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-1); + } + } + /* 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 = afm_find("scripts-accSB"); + m.add_molecule(r); + } + else if (sym == "BB") + { + Molecule r = afm_find("scripts-accBB"); + m.add_molecule(r); + } + else if (sym == "OldEE") + { + Molecule r = afm_find("scripts-accOldEE"); + m.add_molecule(r); + } + else if (sym == "OldEES") + { + Molecule r = afm_find("scripts-accOldEES"); + m.add_molecule(r); + } + return m; }