X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=a6c24eddd35692b5f4f5b328090fd4d2806d00af;hb=027f1aab2ec8fbbc8a20cf421510f8b9a259d6d2;hp=812460e0fc10f062cf0ec98e7cfb46b0f2fd9d5d;hpb=f6e3a77381e8eb67aa01195ec3945bd978f86aa8;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 812460e0fc..a6c24eddd3 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys Jan Nieuwenhuizen @@ -12,10 +12,10 @@ */ #include #include + #include "lookup.hh" -#include "debug.hh" +#include "warn.hh" #include "dimensions.hh" - #include "bezier.hh" #include "paper-def.hh" #include "string-convert.hh" @@ -26,15 +26,10 @@ #include "afm.hh" #include "scope.hh" #include "molecule.hh" -#include "atom.hh" -#include "lily-guile.hh" -SCM -ly_offset2scm (Offset o) -{ - return gh_list (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]), - SCM_UNDEFINED); -} + +#include "ly-smobs.icc" + Lookup::Lookup () { @@ -44,46 +39,35 @@ Lookup::Lookup () Lookup::Lookup (Lookup const& s) { font_name_ = s.font_name_; - afm_l_ = 0; + afm_l_ = 0; } - -/* - build a ledger line for small pieces. - */ -Molecule -Lookup::ledger_line (Interval xwid) const +SCM +Lookup::mark_smob (SCM s) { - 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; + return s; +} - 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); +int +Lookup::print_smob (SCM s, SCM p, scm_print_state*) +{ + scm_puts ("##", p); + return 1; +} - Real xpos = xwid [LEFT] + len; - while (xpos + len + thick /2 <= xwid[RIGHT]) - { - e->translate_axis (len, X_AXIS); - total.add_molecule (*e); - xpos += len; - } +IMPLEMENT_UNSMOB(Lookup, lookup); +IMPLEMENT_SIMPLE_SMOBS(Lookup); +IMPLEMENT_DEFAULT_EQUAL_P(Lookup); - return total; +SCM +Lookup::make_lookup () +{ + Lookup * l = new Lookup; + return l->smobbed_self(); } - - Molecule Lookup::afm_find (String s, bool warn) const { @@ -93,223 +77,131 @@ Lookup::afm_find (String s, bool warn) const 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 ("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) + AFM_CharMetricInfo const *cm = afm_l_->find_char_metric (s, warn); + + if (!cm) { - /* - don't want people relying on this kind of dimension. - */ + Molecule m; m.set_empty (false); return m; } - Atom at (gh_list (ly_symbol2scm ("char"), - gh_int2scm (cm.code ()), + SCM 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; -} -Molecule -Lookup::simple_bar (String type, Real h, Paper_def* paper_l) const -{ - 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))); + at= fontify_atom (afm_l_,at); + return Molecule ( afm_bbox_to_box (cm->charBBox), at); } -Molecule -Lookup::bar (String str, Real h, Paper_def *paper_l) const -{ - 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; -} Molecule -Lookup::beam (Real slope, Real width, Real thick) const +Lookup::beam (Real slope, Real width, Real thick) { 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; + + Box b( Interval (0, width), + Interval (min_y, max_y)); + + + SCM at = gh_list (ly_symbol2scm ("beam"), + gh_double2scm (width), + gh_double2scm (slope), + gh_double2scm (thick), + SCM_UNDEFINED); + return Molecule (b, at); } -/* - FIXME. - */ Molecule -Lookup::dashed_slur (Bezier b, Real thick, Real dash) const +Lookup::dashed_slur (Bezier b, Real thick, Real dash) { SCM l = SCM_EOL; + for (int i= 4; i -- ;) { l = gh_cons (ly_offset2scm (b.control_[i]), l); } - Atom at (gh_list (ly_symbol2scm ("dashed-slur"), - gh_double2scm (thick), - gh_double2scm (dash), - ly_quote_scm (l), - SCM_UNDEFINED)); - Molecule m; - m.add_atom (&at); - return m; + SCM at = (gh_list (ly_symbol2scm ("dashed-slur"), + gh_double2scm (thick), + gh_double2scm (dash), + ly_quote_scm (l), + SCM_UNDEFINED)); + + Box box (Interval(0,0),Interval( 0,0)); + return Molecule (box, at); } Molecule -Lookup::fill (Box b) const +Lookup::blank (Box b) { - Molecule m; - m.dim_ = b; - return m; + return Molecule (b, SCM_EOL); } - Molecule -Lookup::special_time_signature (String s, int n, int d, Paper_def*pap) const +Lookup::filledbox (Box b ) { - // First guess: s contains only the signature style - String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d); - - Molecule m = afm_find (symbolname, false); - if (!m.empty_b()) - return m; - - // Second guess: s contains the full signature name - m = afm_find ("timesig-"+s, false); - if (!m.empty_b ()) - return m; - - // Resort to default layout with numbers - return time_signature (n,d,pap); -} - -Molecule -Lookup::filledbox (Box b ) const -{ - Molecule m; - - Atom at (gh_list (ly_symbol2scm ("filledbox"), + 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)); - m.dim_ = b; - m.add_atom (&at); + return Molecule ( b,at); +} + +Molecule +Lookup::frame (Box b, Real thick) +{ + 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; + } + /* - TODO: THIS IS UGLY. Since the user has direct access to TeX - strings, we try some halfbaked attempt to detect TeX trickery. + 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) @@ -353,12 +245,11 @@ sanitise_PS_string (String t) } /** - +TODO: move into Text_item. UGH: paper_l argument shoudl be junked. */ Molecule -Lookup::text (String style, String text, Paper_def *paper_l) const +Lookup::text (String style, String text, Paper_def *paper_l) { - Molecule m; if (style.empty_b ()) style = "roman"; @@ -375,17 +266,14 @@ Lookup::text (String style, String text, Paper_def *paper_l) const font_mag = (int)paper_l->get_var ("magnification_" + style); } - /* - UGH. - */ - SCM l = ly_eval_str (("(style-to-cmr \"" + style + "\")").ch_C()); + SCM l = scm_assoc (ly_str02scm (style.ch_C()), + scm_eval (ly_symbol2scm ("cmr-alist"))); + if (l != SCM_BOOL_F) { style = ly_scm2string (gh_cdr(l)) +to_str ((int)font_h); } - - Font_metric* metric_l = 0; if (font_mag) @@ -394,97 +282,62 @@ Lookup::text (String style, String text, Paper_def *paper_l) const 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); - - 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) + int i = text.index_i ("\\n"); + while (i >=0 ) { - m.add_at_edge (Y_AXIS, UP, n, 0.0); - m.add_at_edge (Y_AXIS, DOWN, d, 0.0); + text = text.left_str (i) + "\n" + text.right_str (text.length_i () - i - 2); + i = text.index_i ("\\n"); } - else + + Array lines = String_convert::split_arr (text, '\n'); + + Real kern = paper_l->get_var ("line_kern"); + + for (int i=0; i < lines.size (); i++) { - m = n; - m.align_to (Y_AXIS, CENTER); + 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); + lines[i] = str; } - return m; -} - -Molecule -Lookup::staff_brace (Real y, int staff_size) const -{ - Molecule m; - - Real step = 1.0; - int minht = 2 * staff_size; - int maxht = 7 * minht; - int idx = int (((maxht - step) ? 0; + if (!lines.size()) + return Molecule(); - String nm = String ("feta-braces" + to_str (staff_size)); - SCM e =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED); - Atom at (e); + SCM first = gh_list (ly_symbol2scm ("text"), + ly_str02scm (lines[0].ch_C()), + SCM_UNDEFINED); + first = fontify_atom (metric_l, first); - 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; -} + Molecule mol (metric_l->text_dimension (lines[0]), first); + for (i = 1; i < lines.size (); i++) + { + SCM line = (gh_list (ly_symbol2scm ("text"), + ly_str02scm (lines[i].ch_C ()), + SCM_UNDEFINED)); + line = fontify_atom (metric_l, line); + mol.add_at_edge (Y_AXIS, DOWN, + Molecule (metric_l->text_dimension (lines[i]), line), + kern); + } -Molecule -Lookup::tuplet_bracket (Real dy , Real dx, Real thick, Real gap, - Real height, Direction dir) const -{ - 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; + return mol; } + + /* Make a smooth curve along the points */ Molecule -Lookup::slur (Bezier curve, Real curvethick, Real linethick) const +Lookup::slur (Bezier curve, Real curvethick, Real linethick) { Real alpha = (curve.control_[3] - curve.control_[0]).arg (); Bezier back = curve; @@ -494,8 +347,9 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) const back.control_[2] += curvethick * complex_exp (Offset (0, alpha + M_PI/2)); SCM scontrols[8]; + for (int i=4; i--;) - scontrols[ i ] = ly_offset2scm (back.control_[i]); + scontrols[ i ] = ly_offset2scm(back.control_[i]); for (int i=4 ; i--;) scontrols[i+4] = ly_offset2scm (curve.control_[i]); @@ -510,58 +364,13 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) const } - Atom at (gh_list (ly_symbol2scm ("bezier-sandwich"), + SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"), ly_quote_scm (list), gh_double2scm (linethick), SCM_UNDEFINED)); - Molecule m; - m.dim_[X_AXIS] = curve.extent (X_AXIS); - m.dim_[Y_AXIS] = curve.extent (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)); - - 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; -} - -Molecule -Lookup::volta (Real h, Real w, Real thick, bool vert_start, bool vert_end) const -{ - Molecule m; - - 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)); - - m.dim_[Y_AXIS] = Interval (- h/2, h/2); - m.dim_[X_AXIS] = Interval (0, w); - - m.add_atom (&at); - return m; + Box b ( curve.extent (X_AXIS), curve.extent (Y_AXIS)); + return Molecule (b, at); } Molecule @@ -573,11 +382,11 @@ Lookup::accordion (SCM s, Real staff_space) const if (sym == "Discant") { - Molecule r = afm_find("scripts-accDiscant"); + Molecule r = afm_find("accordion-accDiscant"); m.add_molecule(r); if (reg.left_str(1) == "F") { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("accordion-accDot"); d.translate_axis(staff_space * 2.5 PT, Y_AXIS); m.add_molecule(d); reg = reg.right_str(reg.length_i()-1); @@ -605,27 +414,27 @@ Lookup::accordion (SCM s, Real staff_space) const } if (eflag & 0x02) { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("accordion-accDot"); d.translate_axis(staff_space * 1.5 PT, Y_AXIS); m.add_molecule(d); } if (eflag & 0x04) { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("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 = afm_find("scripts-accDot"); + Molecule d = afm_find("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 = afm_find("scripts-accDot"); + Molecule d = afm_find("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); @@ -635,7 +444,7 @@ Lookup::accordion (SCM s, Real staff_space) const } if (reg.left_str(1) == "S") { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("accordion-accDot"); d.translate_axis(0.5 * staff_space PT, Y_AXIS); m.add_molecule(d); reg = reg.right_str(reg.length_i()-1); @@ -643,29 +452,29 @@ Lookup::accordion (SCM s, Real staff_space) const } else if (sym == "Freebase") { - Molecule r = afm_find("scripts-accFreebase"); + Molecule r = afm_find("accordion-accFreebase"); m.add_molecule(r); if (reg.left_str(1) == "F") { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("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 == "E") { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("accordion-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"); + Molecule r = afm_find("accordion-accBayanbase"); m.add_molecule(r); if (reg.left_str(1) == "T") { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("accordion-accDot"); d.translate_axis(staff_space * 2.5 PT, Y_AXIS); m.add_molecule(d); reg = reg.right_str(reg.length_i()-1); @@ -673,14 +482,14 @@ Lookup::accordion (SCM s, Real staff_space) const /* 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"); + Molecule d = afm_find("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") { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("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); @@ -690,7 +499,7 @@ Lookup::accordion (SCM s, Real staff_space) const } if (reg.left_str(1) == "E") { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("accordion-accDot"); d.translate_axis(staff_space * 0.5 PT, Y_AXIS); m.add_molecule(d); reg = reg.right_str(reg.length_i()-1); @@ -698,25 +507,25 @@ Lookup::accordion (SCM s, Real staff_space) const } else if (sym == "Stdbase") { - Molecule r = afm_find("scripts-accStdbase"); + Molecule r = afm_find("accordion-accStdbase"); m.add_molecule(r); if (reg.left_str(1) == "T") { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("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 = afm_find("scripts-accDot"); + Molecule d = afm_find("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 = afm_find("scripts-accDot"); + Molecule d = afm_find("accordion-accDot"); d.translate_axis(staff_space * 2 PT, Y_AXIS); d.translate_axis(staff_space PT, X_AXIS); m.add_molecule(d); @@ -724,14 +533,14 @@ Lookup::accordion (SCM s, Real staff_space) const } if (reg.left_str(1) == "E") { - Molecule d = afm_find("scripts-accDot"); + Molecule d = afm_find("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 = afm_find("scripts-accDot"); + Molecule d = afm_find("accordion-accDot"); d.translate_axis(staff_space * 0.5 PT, Y_AXIS); m.add_molecule(d); reg = reg.right_str(reg.length_i()-1); @@ -741,22 +550,22 @@ Lookup::accordion (SCM s, Real staff_space) const for the rectangle */ else if (sym == "SB") { - Molecule r = afm_find("scripts-accSB"); + Molecule r = afm_find("accordion-accSB"); m.add_molecule(r); } else if (sym == "BB") { - Molecule r = afm_find("scripts-accBB"); + Molecule r = afm_find("accordion-accBB"); m.add_molecule(r); } else if (sym == "OldEE") { - Molecule r = afm_find("scripts-accOldEE"); + Molecule r = afm_find("accordion-accOldEE"); m.add_molecule(r); } else if (sym == "OldEES") { - Molecule r = afm_find("scripts-accOldEES"); + Molecule r = afm_find("accordion-accOldEES"); m.add_molecule(r); } return m;