X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=2be2e3909359e3069d3ff14022a1d684b8a7e83e;hb=4224f67e953b676c16499e931b9bf7b9b9408cbb;hp=c763bb56e1a97ad8093477232ae0fd5bd2faca02;hpb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index c763bb56e1..2be2e39093 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,435 +3,678 @@ 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 "dimensions.hh" -#include "symtable.hh" -#include "scalar.hh" + +#include "bezier.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 "lily-guile.hh" + Lookup::Lookup () { - paper_l_ = 0; - symtables_p_ = new Symtables; - afm_p_ =0; + afm_l_ = 0; } 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; + font_name_ = s.font_name_; + afm_l_ = 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 () -{ - delete afm_p_; - delete symtables_p_; -} -Atom -Lookup::accidental (int j) const -{ - return afm_find (String ("accidentals") + String ("-") + to_str (j)); -} -void -Lookup::add (String s, Symtable*p) -{ - symtables_p_->add (s, p); -} -Atom -Lookup::afm_find (String s) const +Molecule +Lookup::afm_find (String s, bool warn) const { - if (!afm_p_) + if (!afm_l_) { - *mlog << "[" << font_path_; - ( (Lookup*)this)->afm_p_ = new Adobe_font_metric (read_afm (font_path_)); - *mlog << "]" << flush ; - DOUT << this->afm_p_->str (); + 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 m = afm_p_->find_char (s); + AFM_CharMetricInfo const *cm = afm_l_->find_char_metric (s, warn); - Atom a; - if (m.code () < 0) - return a; + if (!cm) + { + Molecule m; + m.set_empty (false); + return m; + } - 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; + SCM at = (gh_list (ly_symbol2scm ("char"), + gh_int2scm (cm->code), + SCM_UNDEFINED)); + + at= fontify_atom (afm_l_,at); + return Molecule ( afm_bbox_to_box (cm->charBBox), at); } -Atom -Lookup::ball (int j) const +Molecule +Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const { - if (j > 2) - j = 2; - - return afm_find (String ("balls") + String ("-") + to_str (j)); + 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::bar (String str, Real h) const + +Molecule +Lookup::bar (String str, Real h, Paper_def *paper_l) const { - 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; + 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"); + + 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::beam (Real slope, Real width, Real thick) const +Molecule +Lookup::beam (Real slope, Real width, Real thick) { 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.dim_[X_AXIS] = Interval (0, width); - a.dim_[Y_AXIS] = Interval (min_y, max_y); - return a; -} + Box b( Interval (0, width), + Interval (min_y, max_y)); -Atom -Lookup::clef (String st) const -{ - return afm_find (String ("clefs") + String ("-") + st); + + SCM at = gh_list (ly_symbol2scm ("beam"), + gh_double2scm (width), + gh_double2scm (slope), + gh_double2scm (thick), + SCM_UNDEFINED); + return Molecule (b, at); } -Atom -Lookup::dashed_slur (Array controls, Real thick, Real dash) const -{ - 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::dots () const -{ - return afm_find (String ("dots") + String ("-") + String ("dot")); -} -Atom -Lookup::dynamic (String st) const +Molecule +Lookup::dashed_slur (Bezier b, Real thick, Real dash) { - return (*symtables_p_) ("dynamics")->lookup (st); -} + SCM l = SCM_EOL; + // this is silly, we have array_to_scm + for (int i= 4; i -- ;) + { + l = gh_cons (to_scm (b.control_[i]), l); + } -Atom -Lookup::fill (Box b) const -{ - Atom a; - a.dim_ = b; - return a; -} + SCM at = (gh_list (ly_symbol2scm ("dashed-slur"), + gh_double2scm (thick), + gh_double2scm (dash), + ly_quote_scm (l), + SCM_UNDEFINED)); -Atom -Lookup::flag (int j, Direction d) const -{ - char c = (d == UP) ? 'u' : 'd'; - return afm_find (String ("flags") + String ("-") + to_str (c) + to_str (j)); + Box box (Interval(0,0),Interval( 0,0)); + return Molecule (box, at); } -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" : "")); -} -Atom -Lookup::rule_symbol (Real height, Real width) const + +Molecule +Lookup::fill (Box b) { - 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; + Molecule m; + m.dim_ = b; + return m; } -Atom -Lookup::script (String str) const + +Molecule +Lookup::filledbox (Box b ) { - return afm_find (String ("scripts") + String ("-") + str); + 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::special_time_signature (String s, Array arr) const +Molecule +Lookup::frame (Box b, Real thick) { - String symbolname = "timesig-" + s; - if (!arr.empty ()) - symbolname += to_str (arr[0]); - if (arr.size () >1) - symbolname += "/" + to_str (arr[1]); + Molecule m; + Direction d = LEFT; + Axis a = X_AXIS; + while (a < NO_AXES) + { + 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); + } + return m; - Atom a = afm_find (symbolname); - if (!a.empty ()) - return a; - -#if 0 //guess we covered this - // Try if the full name was given - a = afm_find ("timesig-"+s); - if (!a.empty ()) - return a; -#endif - - // Resort to default layout with numbers - return time_signature (arr); } -Atom -Lookup::stem (Real y1, Real y2) const + +/* + TODO: THIS IS UGLY. + Since the user has direct access to TeX marcos, + that currently provide the only way to do + font selection, accents etc, + we try some halfbaked attempt to detect this TeX trickery. + */ +String +sanitise_TeX_string (String text) { - if (y1 > y2) + int brace_count =0; + for (int i= 0; i < text.length_i (); i++) { - Real t = y1; - y1 = y2; - y2 = t; + if (text[i] == '\\') + continue; + + if (text[i] == '{') + brace_count ++; + else if (text[i] == '}') + brace_count --; } - Atom s; - - s.dim_.x () = Interval (0,0); - s.dim_.y () = Interval (y1,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; + + 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::streepje (int type) const +/** + TODO! + */ +String +sanitise_PS_string (String t) { - if (type > 2) - type = 2; - - return afm_find ("balls" + String ("-") +to_str (type) + "l"); + return t; } -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 +*/ +Molecule +Lookup::text (String style, String text, Paper_def *paper_l) { - Atom s ((*symtables_p_) ("param")->lookup ("time_signature")); - s.lambda_ = (lambda_scm (s.str_, a)); + if (style.empty_b ()) + style = "roman"; + + 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); + } - return s; -} -/* - should be handled via Tex_ code and Lookup::bar () - */ -Atom -Lookup::vbrace (Real &y) 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) + if (paper_l->scope_p_->elem_b ("magnification_" + style)) { - warning (_ ("piano brace") - + " " + _ ("too small") + " (" + print_dimen (y) + ")"); - y = min_y; + font_mag = (int)paper_l->get_var ("magnification_" + style); } - if (y > max_y) + + /* + UGH. + */ + SCM l = ly_eval_str (("(style-to-cmr \"" + style + "\")").ch_C()); + if (l != SCM_BOOL_F) { - warning (_ ("piano brace") - + " " + _ ("too big") + " (" + print_dimen (y) + ")"); - y = max_y; + style = ly_scm2string (gh_cdr(l)) +to_str ((int)font_h); } - int idx = int (rint ( (y- min_y)/step)) + 1; + + Font_metric* metric_l = 0; + + if (font_mag) + metric_l = all_fonts_global_p->find_scaled (style, font_mag); + else + metric_l = all_fonts_global_p->find_font (style); + - Array a; - a.push (idx); - brace.lambda_ = (lambda_scm (brace.str_, a)); - brace.dim_[Y_AXIS] = Interval (-y/2,y/2); + - brace.font_ = font_; + int i = text.index_i ("\\n"); + while (i >=0 ) + { + text = text.left_str (i) + "\n" + text.right_str (text.length_i () - i - 2); + i = text.index_i ("\\n"); + } + + Array lines = String_convert::split_arr (text, '\n'); + + Molecule mol; + + Real kern = paper_l->get_var ("line_kern"); + + for (i = 0; i< lines.size (); i++) + { + /* + Huh? This way we'll still see \foo sequences in ps output. + */ + String str = lines[i]; + if (output_global_ch == "tex") + str = sanitise_TeX_string (str); + else if (output_global_ch == "ps") + str = sanitise_PS_string (str); + + SCM line = (gh_list (ly_symbol2scm ("text"), + ly_str02scm (str.ch_C ()), + SCM_UNDEFINED)); + line = fontify_atom (metric_l, line); + mol.add_at_edge (Y_AXIS, DOWN, + Molecule (metric_l->text_dimension (str), line), + kern); + } - return brace; + return mol; } + -Atom -Lookup::hairpin (Real width, bool decresc, bool continued) const + +Molecule +Lookup::staff_brace (Real y, int staff_size) { - 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; + // URG + Real step = 1.0; + int minht = 2 * staff_size; + int maxht = 7 * minht; + int idx = int (((maxht - step) ? 0; + + SCM l = ly_eval_str ("(style-to-cmr \"brace\")"); + String nm = "feta-braces"; + if (l != SCM_BOOL_F) + nm = ly_scm2string (gh_cdr (l)); + nm += to_str (staff_size); + SCM e =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED); + SCM at = (e); + + at = fontify_atom (all_fonts_global_p->find_font (nm), at); + + Box b ( Interval (-y/2,y/2), + Interval (0,0)); + return Molecule(b, at); } + -Atom -Lookup::plet (Real dy , Real dx, Direction dir) const +/* + Make a smooth curve along the points + */ +Molecule +Lookup::slur (Bezier curve, Real curvethick, Real linethick) { - String ps; + Real alpha = (curve.control_[3] - curve.control_[0]).arg (); + Bezier back = curve; + + 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)); + + SCM scontrols[8]; + // this is silly, we have array_to_scm + for (int i=4; i--;) + scontrols[ i ] = to_scm (back.control_[i]); + for (int i=4 ; i--;) + scontrols[i+4] = to_scm (curve.control_[i]); + + /* + 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--; ) + { + list = gh_cons (scontrols[indices[i]], list); + } - 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; + SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + gh_double2scm (linethick), + SCM_UNDEFINED)); + + Box b ( curve.extent (X_AXIS), curve.extent (Y_AXIS)); + return Molecule (b, at); } -Atom -Lookup::slur (Array controls) const +Molecule +Lookup::staff_bracket (Real height, Paper_def* paper_l) { - 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; + SCM 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 staff_space = paper_l->get_var ("interline"); + Box b (Interval (0, 1.5 * staff_space), Interval (-height/2,height/2)); + Molecule mol (b, at); + + mol.translate_axis (- mol.dim_[X_AXIS].length () / 2, X_AXIS); + return mol; } -Atom -Lookup::vbracket (Real &y) const + +Molecule +Lookup::accordion (SCM s, Real staff_space) 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; -} + Molecule m; + String sym = ly_scm2string(gh_car (s)); + String reg = ly_scm2string(gh_car (gh_cdr(s))); + if (sym == "Discant") + { + 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(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 = afm_find("scripts-accDot"); + d.translate_axis(staff_space * 1.5 PT, Y_AXIS); + m.add_molecule(d); + } + if (eflag & 0x04) + { + Molecule d = afm_find("scripts-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 = afm_find("scripts-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 = afm_find("scripts-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 = afm_find("scripts-accDot"); + d.translate_axis(0.5 * staff_space PT, Y_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-1); + } + } + else if (sym == "Freebase") + { + 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(staff_space * 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(staff_space * 0.5 PT, Y_AXIS); + m.add_molecule(d); + } + } + else if (sym == "Bayanbase") + { + 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(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 = afm_find("scripts-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") + { + Molecule d = afm_find("scripts-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 = afm_find("scripts-accDot"); + d.translate_axis(staff_space * 0.5 PT, Y_AXIS); + m.add_molecule(d); + reg = reg.right_str(reg.length_i()-1); + } + } + 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(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 = afm_find("scripts-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 = afm_find("scripts-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 = afm_find("scripts-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 = afm_find("scripts-accDot"); + d.translate_axis(staff_space * 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; +}