X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=2be2e3909359e3069d3ff14022a1d684b8a7e83e;hb=4224f67e953b676c16499e931b9bf7b9b9408cbb;hp=7cc0d6b8a070ea45194e8b5468225c2e5504e035;hpb=c5f4a0324c78423d91ccc2dd44823f692256d600;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 7cc0d6b8a0..2be2e39093 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,140 +3,123 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys Jan Nieuwenhuizen TODO Glissando */ - +#include #include #include "lookup.hh" #include "debug.hh" #include "dimensions.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-fonts.hh" +#include "all-font-metrics.hh" #include "afm.hh" #include "scope.hh" #include "molecule.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; -} +#include "lily-guile.hh" Lookup::Lookup () { - paper_l_ = 0; afm_l_ = 0; } Lookup::Lookup (Lookup const& s) { font_name_ = s.font_name_; - paper_l_ = 0; afm_l_ = 0; } -Molecule -Lookup::accidental (int j, bool cautionary) const -{ - Molecule m(afm_find (String ("accidentals") + String ("-") + to_str (j))); - if (cautionary) - { - Atom open = afm_find (String ("accidentals") + String ("-(")); - Atom close = afm_find (String ("accidentals") + String ("-)")); - m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0); - m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0); - } - return m; -} - - -Atom +Molecule Lookup::afm_find (String s, bool warn) const { if (!afm_l_) - ((Lookup*)this)->afm_l_ = all_fonts_global_p->find_afm (font_name_); - - Adobe_font_char_metric m = afm_l_->find_char (s, warn); + { + 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")); + } + } + AFM_CharMetricInfo const *cm = afm_l_->find_char_metric (s, warn); - Atom a; - if (m.code () < 0) - return a; - - a.dim_ = m.dimensions(); + if (!cm) + { + Molecule m; + m.set_empty (false); + return m; + } - a.lambda_ = gh_list (ly_symbol ("char"), - gh_int2scm (m.code ()), - SCM_UNDEFINED); - a.font_ = font_name_; - return a; -} - -Atom -Lookup::ball (int j) const -{ - if (j > 2) - j = 2; + SCM at = (gh_list (ly_symbol2scm ("char"), + gh_int2scm (cm->code), + SCM_UNDEFINED)); - return afm_find (String ("balls") + String ("-") + to_str (j)); + at= fontify_atom (afm_l_,at); + return Molecule ( afm_bbox_to_box (cm->charBBox), at); } -Atom -Lookup::simple_bar (String type, Real h) const +Molecule +Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const { - SCM thick = ly_symbol ("barthick_" + type); - Real w = 0.1 PT; - if (paper_l_->scope_p_->elem_b (thick)) + 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); + w = paper_l->get_realvar (thick); } - - Atom a; - a.lambda_ = gh_list (ly_symbol ("filledbox"), - gh_double2scm (0), - gh_double2scm (w), - gh_double2scm (h/2), - gh_double2scm (h/2), - SCM_UNDEFINED); - - a.dim_[X_AXIS] = Interval(0,w); - a.dim_[Y_AXIS] = Interval (-h/2, h/2); - return a; + else + { + programming_error ("No bar thickness set ! "); + w = 1 PT; + } + return filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); } Molecule -Lookup::bar (String str, Real h) const +Lookup::bar (String str, Real h, Paper_def *paper_l) const { - Real kern = paper_l_->get_var ("bar_kern"); - Real thinkern = paper_l_->get_var ("bar_thinkern"); - Atom thin = simple_bar ("thin", h); - Atom thick = simple_bar ("thick", h); - Atom colon = afm_find ("dots-repeatcolon"); + 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 m; + 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))); + return fill (Box (Interval(0, 0), Interval (-h/2, h/2))); + } + if (str == "scorepostbreak") + { + return simple_bar ("score", h, paper_l); } else if (str == "|") { @@ -145,12 +128,12 @@ Lookup::bar (String str, Real h) const 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, thin, kern); } else if (str == ".|") { - m.add_at_edge (X_AXIS, RIGHT, thick, kern); - m.add_at_edge (X_AXIS, RIGHT, thin, 0); + m.add_at_edge (X_AXIS, RIGHT, thick, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, kern); } else if (str == ":|") { @@ -160,398 +143,538 @@ Lookup::bar (String str, Real h) const } 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); + 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,kern/2); - 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, RIGHT, thin,0); - m.add_at_edge (X_AXIS, RIGHT, thin,thinkern); + 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, RIGHT, thick, 0); + 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; - 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; -} + Box b( Interval (0, width), + Interval (min_y, max_y)); -Atom -Lookup::clef (String st) const -{ - 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); + + 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); - Offset d = controls[3] - controls[0]; - - Real dx = d[X_AXIS]; - Real dy = d[Y_AXIS]; - Atom a; - a.font_ = font_name_; - 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 +Lookup::dashed_slur (Bezier b, Real thick, Real dash) +{ + SCM l = SCM_EOL; + // this is silly, we have array_to_scm + for (int i= 4; i -- ;) { - sc[i] = offset2scm (controls[i]); + l = gh_cons (to_scm (b.control_[i]), l); } - a.lambda_ = - gh_list (ly_symbol ("dashed-slur"), - gh_double2scm (thick), - gh_double2scm (dash), - ly_quote_scm (array_to_list (sc, 4)), - SCM_UNDEFINED); + SCM at = (gh_list (ly_symbol2scm ("dashed-slur"), + gh_double2scm (thick), + gh_double2scm (dash), + ly_quote_scm (l), + SCM_UNDEFINED)); - return a; + Box box (Interval(0,0),Interval( 0,0)); + return Molecule (box, at); } -Atom -Lookup::dots () const -{ - return afm_find (String ("dots") + String ("-") + String ("dot")); -} -Atom -Lookup::extender (Real width) const -{ - Atom a; - a.lambda_ = gh_list (ly_symbol ("extender"), - gh_double2scm (width), - SCM_UNDEFINED); - - a.dim_[X_AXIS] = Interval (0, width); - a.dim_[Y_AXIS] = Interval (0,0); - - a.font_ = font_name_; - return a; -} -Atom -Lookup::fill (Box b) const +Molecule +Lookup::fill (Box b) { - Atom a; - a.dim_ = b; - return a; + Molecule m; + m.dim_ = b; + return m; } -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; -} -Atom -Lookup::rest (int j, bool o) const +Molecule +Lookup::filledbox (Box b ) { - return afm_find (String ("rests") - + String ("-") + to_str (j) + (o ? "o" : "")); + 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::rule_symbol (Real height, Real width) const +Molecule +Lookup::frame (Box b, Real thick) { - 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; + 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 -Lookup::script (String str) const -{ - return afm_find (String ("scripts") + String ("-") + str); -} -Atom -Lookup::special_time_signature (String s, Array arr) 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) { - // First guess: s contains only the signature style - assert (arr.size () >1); - String symbolname = "timesig-" + s + to_str (arr[0]) + "/" + to_str (arr[1]); + 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 --; + } - Atom a = afm_find (symbolname, false); - if (!a.empty ()) - return a; + if(brace_count) + { + warning (_f ("Non-matching braces in text `%s', adding braces", text.ch_C())); - // Second guess: s contains the full signature name - a = afm_find ("timesig-"+s, false); - if (!a.empty ()) - return a; + if (brace_count < 0) + { + text = to_str ('{', -brace_count) + text; + } + else + { + text = text + to_str ('}', brace_count); + } + } + + return text; +} - // Resort to default layout with numbers - return time_signature (arr); +/** + TODO! + */ +String +sanitise_PS_string (String t) +{ + return t; } -Atom -Lookup::stem (Real y1, Real y2) const +/** + +*/ +Molecule +Lookup::text (String style, String text, Paper_def *paper_l) { - if (y1 > y2) + 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)) { - Real t = y1; - y1 = y2; - y2 = t; + font_h = paper_l->get_var ("font_" + style); } - 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 ("filledbox"), - gh_double2scm(stem_width /2), - gh_double2scm(stem_width/2), - gh_double2scm(y2), - gh_double2scm(-y1), - SCM_UNDEFINED); + if (paper_l->scope_p_->elem_b ("magnification_" + style)) + { + font_mag = (int)paper_l->get_var ("magnification_" + style); + } - a.font_ = font_name_; - return a; -} + /* + 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); + } -Atom -Lookup::streepje (int type) const -{ - if (type > 2) - type = 2; + - return afm_find ("balls" + String ("-") +to_str (type) + "l"); -} + Font_metric* metric_l = 0; -static Dict_initialiser cmr_init[] = { - {"bold", "cmbx"}, - {"dynamic", "feta-din"}, - {"finger", "feta-nummer"}, - {"italic", "cmti"}, - {"roman", "cmr"}, - {"large", "cmbx"}, - {"Large", "cmbx"}, - {"mark", "feta-nummer"}, - {"nummer", "feta-nummer"}, - {0,0} -}; - -static Dictionary cmr_dict (cmr_init); - -Atom -Lookup::text (String style, String text) const -{ - Atom a; - a.lambda_ = gh_list(ly_symbol ("set" + style), - gh_str02scm (text.ch_C()), - SCM_UNDEFINED); + if (font_mag) + metric_l = all_fonts_global_p->find_scaled (style, font_mag); + else + metric_l = all_fonts_global_p->find_font (style); + + + - Real font_h = paper_l_->get_var ("font_normal"); - if (paper_l_->scope_p_->elem_b ("font_" + style)) + int i = text.index_i ("\\n"); + while (i >=0 ) { - font_h = paper_l_->get_var ("font_" + style); + text = text.left_str (i) + "\n" + text.right_str (text.length_i () - i - 2); + i = text.index_i ("\\n"); } - if (cmr_dict.elem_b (style)) - { - style = String (cmr_dict [style]) + to_str ((int)font_h); // ugh - } - - Real w = 0; - Real h = 0; - Real d = 0; - - Font_metric* afm_l = all_fonts_global_p->find_font (style); - DOUT << "\nChars: "; + Array lines = String_convert::split_arr (text, '\n'); + + Molecule mol; - for (int i = 0; i < text.length_i (); i++) + Real kern = paper_l->get_var ("line_kern"); + + for (i = 0; i< lines.size (); i++) { - if (text[i]=='\\') - for (i++; (i < text.length_i ()) && isalpha(text[i]); i++) - ; - else - { - Character_metric *c = afm_l->get_char (text[i],false); - w += c->dimensions()[X_AXIS].length (); - h = h >? c->dimensions()[Y_AXIS].max (); - d = d dimensions()[Y_AXIS].min (); - } + /* + 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); } - DOUT << "\n" << to_str (w) << "\n"; - a.dim_.x () = Interval (0, w); - a.dim_.y () = Interval (d, h); - a.font_ = font_name_; - return a; + return mol; } -/* - TODO: should return a molecule with 2 stacked nums. - */ -Atom -Lookup::time_signature (Array a) const -{ - Atom s; - s.lambda_ = gh_list (ly_symbol ("generalmeter"), - gh_int2scm (a[0]), - gh_int2scm (a[1]), - SCM_UNDEFINED); - - Real r = paper_l_->interline_f () ; - s.dim_[Y_AXIS] = Interval (-2*r, 2*r); - s.dim_[X_AXIS] = Interval (0, 2*r); - return s; -} -Atom -Lookup::vbrace (Real &y) const +Molecule +Lookup::staff_brace (Real y, int staff_size) { - Atom a; - a.lambda_ = gh_list (ly_symbol ("pianobrace"), - gh_double2scm (y), - SCM_UNDEFINED - ); - a.dim_[Y_AXIS] = Interval (-y/2,y/2); - a.dim_[X_AXIS] = Interval (0,0); - a.font_ = font_name_; - 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::hairpin (Real width, bool decresc, bool continued) const +/* + Make a smooth curve along the points + */ +Molecule +Lookup::slur (Bezier curve, Real curvethick, Real linethick) { - 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_name_; - return a; -} + 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); + } + + + SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + gh_double2scm (linethick), + SCM_UNDEFINED)); -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; + 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); - 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_name_; - 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 -{ - Atom a; - a.lambda_ = gh_list (ly_symbol ("bracket"), - gh_double2scm (y), - SCM_UNDEFINED); - 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 +Molecule +Lookup::accordion (SCM s, Real staff_space) const { - Atom a; - a.lambda_ = gh_list (ly_symbol ("volta"), - gh_double2scm (w), - gh_int2scm (last_b), - SCM_UNDEFINED); - - Real interline_f = paper_l_->interline_f (); + Molecule m; + String sym = ly_scm2string(gh_car (s)); + String reg = ly_scm2string(gh_car (gh_cdr(s))); - a.dim_[Y_AXIS] = Interval (-interline_f, interline_f); - a.dim_[X_AXIS] = Interval (0, w); - return a; + 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; } - -Atom -Lookup::special_ball (int j, String kind_of_ball) const -{ - if (j > 2) - j = 2; - - return afm_find (String ("balls") + String ("-") + kind_of_ball); -}