X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=f25983e47ca7c4a4ea4dd56bcc5ab2f345c860af;hb=refs%2Fremotes%2Forigin%2Ftarball%2Fmaster;hp=2b90ce5a79be8c4ecd5dcf7ce0a538a2c1a479cf;hpb=bc1e5cfa4aef13a1b9bd2d251dd9cb25dbaf9d03;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 2b90ce5a79..f25983e47c 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen @@ -13,110 +13,16 @@ #include #include -#include "lookup.hh" #include "warn.hh" #include "dimensions.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 "ly-smobs.icc" - - -Lookup::Lookup () -{ - afm_l_ = 0; - self_scm_ = SCM_EOL; - smobify_self (); -} - -Lookup::Lookup (Lookup const& s) -{ - font_name_ = s.font_name_; - self_scm_ = SCM_EOL; - afm_l_ = 0; - smobify_self (); -} - -SCM -Lookup::mark_smob (SCM s) -{ - return s; -} - -int -Lookup::print_smob (SCM s, SCM p, scm_print_state*) -{ - scm_puts ("##", p); - return 1; -} - -SCM -Lookup::equal_p (SCM a , SCM b) -{ - return a == b ? SCM_BOOL_T : SCM_BOOL_F; -} - -void -Lookup::do_smobify_self () -{ - -} - -IMPLEMENT_UNSMOB(Lookup, lookup); -IMPLEMENT_SMOBS(Lookup); - -SCM -Lookup::make_lookup () -{ - Lookup * l = new Lookup; - SCM ls = l->self_scm_; - scm_unprotect_object (ls); - return ls; -} - - -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")); - } - } - AFM_CharMetricInfo const *cm = afm_l_->find_char_metric (s, warn); - - if (!cm) - { - Molecule m; - m.set_empty (false); - return m; - } - - 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); -} - - - +#include "lookup.hh" +#include "font-metric.hh" Molecule Lookup::beam (Real slope, Real width, Real thick) @@ -127,11 +33,11 @@ Lookup::beam (Real slope, Real width, Real thick) - Box b( Interval (0, width), + Box b (Interval (0, width), Interval (min_y, max_y)); - SCM at = gh_list (ly_symbol2scm ("beam"), + SCM at = scm_list_n (ly_symbol2scm ("beam"), gh_double2scm (width), gh_double2scm (slope), gh_double2scm (thick), @@ -139,8 +45,6 @@ Lookup::beam (Real slope, Real width, Real thick) return Molecule (b, at); } - - Molecule Lookup::dashed_slur (Bezier b, Real thick, Real dash) { @@ -151,37 +55,74 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash) l = gh_cons (ly_offset2scm (b.control_[i]), l); } - SCM at = (gh_list (ly_symbol2scm ("dashed-slur"), + SCM at = (scm_list_n (ly_symbol2scm ("dashed-slur"), gh_double2scm (thick), gh_double2scm (dash), ly_quote_scm (l), SCM_UNDEFINED)); - Box box (Interval(0,0),Interval( 0,0)); + Box box (Interval (0,0),Interval (0,0)); return Molecule (box, at); } - - - Molecule Lookup::blank (Box b) { return Molecule (b, SCM_EOL); } - Molecule -Lookup::filledbox (Box b ) +Lookup::filledbox (Box b) { - SCM at = (gh_list (ly_symbol2scm ("filledbox"), + SCM at = (scm_list_n (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); + return Molecule (b,at); +} + +/* + * round filled box: + * + * __________________________ + * / \ ^ / \ + * | |blot | + * | + | |dia | +---|------ + * | |meter | ^ + * |\ _ _ / v \ _ _ /| | + * | | | + * | | | Box + * | <------>| | extent + * | blot | | (Y_AXIS) + * | diameter| | + * | | | + * | _ _ _ _ | | + * |/ \ / \| | + * | (0,0) | v + * | x | | +---|------ + * | | | | + * \__|__/______________\__|__/ + * | | + * | | + * | | + * |<------------------>| + * Box extent(X_AXIS) + */ +Molecule +Lookup::roundfilledbox (Box b, Real blotdiameter) +{ + SCM at = (scm_list_n (ly_symbol2scm ("roundfilledbox"), + gh_double2scm (-b[X_AXIS][LEFT]), + gh_double2scm (b[X_AXIS][RIGHT]), + gh_double2scm (-b[Y_AXIS][DOWN]), + gh_double2scm (b[Y_AXIS][UP]), + gh_double2scm (blotdiameter), + SCM_UNDEFINED)); + + return Molecule (b,at); } Molecule @@ -201,7 +142,6 @@ Lookup::frame (Box b, Real thick) 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); @@ -210,144 +150,6 @@ Lookup::frame (Box b, Real thick) } - -/* - 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) -{ - 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 --; - } - - 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; -} - -/** - TODO! - */ -String -sanitise_PS_string (String t) -{ - return t; -} - -/** -TODO: move into Text_item. UGH: paper_l argument shoudl be junked. -*/ -Molecule -Lookup::text (String style, String text, Paper_def *paper_l) -{ - 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); - } - - - if (paper_l->scope_p_->elem_b ("magnification_" + style)) - { - font_mag = (int)paper_l->get_var ("magnification_" + style); - } - - 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) - metric_l = all_fonts_global_p->find_scaled (style, font_mag); - else - metric_l = all_fonts_global_p->find_font (style); - - - - - 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'); - - Real kern = paper_l->get_var ("line_kern"); - - for (int i=0; i < lines.size (); i++) - { - 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; - } - - if (!lines.size()) - return Molecule(); - - SCM first = gh_list (ly_symbol2scm ("text"), - ly_str02scm (lines[0].ch_C()), - SCM_UNDEFINED); - first = fontify_atom (metric_l, first); - - - - 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); - } - - return mol; -} - - - /* Make a smooth curve along the points */ @@ -356,15 +158,18 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) { Real alpha = (curve.control_[3] - curve.control_[0]).arg (); Bezier back = curve; - + Offset perp = curvethick * complex_exp (Offset (0, alpha + M_PI/2)) * 0.5; 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)); + back.control_[1] += perp; + back.control_[2] += perp; + curve.control_[1] -= perp; + curve.control_[2] -= perp; + 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]); @@ -373,216 +178,365 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick) */ int indices[]= {5, 6, 7, 4, 1, 2, 3, 0}; SCM list = SCM_EOL; - for (int i= 8; i--; ) + for (int i= 8; i--;) { list = gh_cons (scontrols[indices[i]], list); } - SCM at = (gh_list (ly_symbol2scm ("bezier-sandwich"), + SCM at = (scm_list_n (ly_symbol2scm ("bezier-sandwich"), ly_quote_scm (list), gh_double2scm (linethick), SCM_UNDEFINED)); + Box b(curve.extent (X_AXIS), + curve.extent (Y_AXIS)); + + b[X_AXIS].unite (back.extent (X_AXIS)); + b[Y_AXIS].unite (back.extent (Y_AXIS)); - Box b ( curve.extent (X_AXIS), curve.extent (Y_AXIS)); return Molecule (b, at); } +/* + * Bezier Sandwich: + * + * .| + * . | + * top . | + * . curve | + * . | + * . | + * . | + * | | + * | .| + * | . + * | bottom . + * | . curve + * | . + * | . + * | . + * | . + * |. + * | + * + */ +Molecule +Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve) +{ + /* + Need the weird order b.o. the way PS want its arguments + */ + SCM list = SCM_EOL; + list = gh_cons (ly_offset2scm (bottom_curve.control_[3]), list); + list = gh_cons (ly_offset2scm (bottom_curve.control_[0]), list); + list = gh_cons (ly_offset2scm (bottom_curve.control_[1]), list); + list = gh_cons (ly_offset2scm (bottom_curve.control_[2]), list); + list = gh_cons (ly_offset2scm (top_curve.control_[0]), list); + list = gh_cons (ly_offset2scm (top_curve.control_[3]), list); + list = gh_cons (ly_offset2scm (top_curve.control_[2]), list); + list = gh_cons (ly_offset2scm (top_curve.control_[1]), list); + + SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"), + ly_quote_scm (list), + gh_double2scm (0.0), + SCM_UNDEFINED); + + Interval x_extent = top_curve.extent (X_AXIS); + x_extent.unite (bottom_curve.extent (X_AXIS)); + Interval y_extent = top_curve.extent (Y_AXIS); + y_extent.unite (bottom_curve.extent (Y_AXIS)); + Box b (x_extent, y_extent); + + return Molecule (b, horizontal_bend); +} + +/* + * Horizontal Slope: + * + * /| ^ + * / | | + * / | | height + * / | | + * / | v + * | / + * | / + * (0,0) x /slope=dy/dx + * | / + * |/ + * + * <-----> + * width + */ Molecule -Lookup::accordion (SCM s, Real staff_space) const +Lookup::horizontal_slope (Real width, Real slope, Real height) +{ + SCM width_scm = gh_double2scm (width); + SCM slope_scm = gh_double2scm (slope); + SCM height_scm = gh_double2scm (height); + SCM horizontal_slope = scm_list_n (ly_symbol2scm ("beam"), + width_scm, slope_scm, + height_scm, SCM_UNDEFINED); + Box b (Interval (0, width), + Interval (-height/2, height/2 + width*slope)); + return Molecule (b, horizontal_slope); +} + +/* + TODO: junk me. + */ +Molecule +Lookup::accordion (SCM s, Real staff_space, Font_metric *fm) { Molecule m; - String sym = ly_scm2string(gh_car (s)); - String reg = ly_scm2string(gh_car (gh_cdr(s))); + String sym = ly_scm2string (ly_car (s)); + String reg = ly_scm2string (ly_car (ly_cdr (s))); if (sym == "Discant") { - Molecule r = afm_find("accordion-accDiscant"); - m.add_molecule(r); - if (reg.left_str(1) == "F") + Molecule r = fm->find_by_name ("accordion-accDiscant"); + m.add_molecule (r); + if (reg.left_str (1) == "F") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 2.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } int eflag = 0x00; - if (reg.left_str(3) == "EEE") + if (reg.left_str (3) == "EEE") { eflag = 0x07; - reg = reg.right_str(reg.length_i()-3); + reg = reg.right_str (reg.length_i ()-3); } - else if (reg.left_str(2) == "EE") + else if (reg.left_str (2) == "EE") { eflag = 0x05; - reg = reg.right_str(reg.length_i()-2); + reg = reg.right_str (reg.length_i ()-2); } - else if (reg.left_str(2) == "Eh") + else if (reg.left_str (2) == "Eh") { eflag = 0x04; - reg = reg.right_str(reg.length_i()-2); + reg = reg.right_str (reg.length_i ()-2); } - else if (reg.left_str(1) == "E") + else if (reg.left_str (1) == "E") { eflag = 0x02; - reg = reg.right_str(reg.length_i()-1); + reg = reg.right_str (reg.length_i ()-1); } if (eflag & 0x02) { - Molecule d = afm_find("accordion-accDot"); - d.translate_axis(staff_space * 1.5 PT, Y_AXIS); - m.add_molecule(d); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + m.add_molecule (d); } if (eflag & 0x04) { - Molecule d = 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + d.translate_axis (0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); } if (eflag & 0x01) { - Molecule d = 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + d.translate_axis (-0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); } - if (reg.left_str(2) == "SS") + if (reg.left_str (2) == "SS") { - 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); - d.translate_axis(-0.8 * staff_space PT, X_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-2); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (0.5 * staff_space PT, Y_AXIS); + d.translate_axis (0.4 * staff_space PT, X_AXIS); + m.add_molecule (d); + d.translate_axis (-0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-2); } - if (reg.left_str(1) == "S") + if (reg.left_str (1) == "S") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (0.5 * staff_space PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } } else if (sym == "Freebase") { - Molecule r = afm_find("accordion-accFreebase"); - m.add_molecule(r); - if (reg.left_str(1) == "F") + Molecule r = fm->find_by_name ("accordion-accFreebase"); + m.add_molecule (r); + if (reg.left_str (1) == "F") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } if (reg == "E") { - Molecule d = afm_find("accordion-accDot"); - d.translate_axis(staff_space * 0.5 PT, Y_AXIS); - m.add_molecule(d); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + m.add_molecule (d); } } else if (sym == "Bayanbase") { - Molecule r = afm_find("accordion-accBayanbase"); - m.add_molecule(r); - if (reg.left_str(1) == "T") + Molecule r = fm->find_by_name ("accordion-accBayanbase"); + m.add_molecule (r); + if (reg.left_str (1) == "T") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 2.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } /* include 4' reed just for completeness. You don't want to use this. */ - if (reg.left_str(1) == "F") + if (reg.left_str (1) == "F") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(2) == "EE") + if (reg.left_str (2) == "EE") { - 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); - d.translate_axis(-0.8 * staff_space PT, X_AXIS); - m.add_molecule(d); - reg = reg.right_str(reg.length_i()-2); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + d.translate_axis (0.4 * staff_space PT, X_AXIS); + m.add_molecule (d); + d.translate_axis (-0.8 * staff_space PT, X_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-2); } - if (reg.left_str(1) == "E") + if (reg.left_str (1) == "E") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } } else if (sym == "Stdbase") { - Molecule r = afm_find("accordion-accStdbase"); - m.add_molecule(r); - if (reg.left_str(1) == "T") + Molecule r = fm->find_by_name ("accordion-accStdbase"); + m.add_molecule (r); + if (reg.left_str (1) == "T") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 3.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(1) == "F") + if (reg.left_str (1) == "F") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 2.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(1) == "M") + if (reg.left_str (1) == "M") { - 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); - reg = reg.right_str(reg.length_i()-1); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 2 PT, Y_AXIS); + d.translate_axis (staff_space PT, X_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(1) == "E") + if (reg.left_str (1) == "E") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 1.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } - if (reg.left_str(1) == "S") + if (reg.left_str (1) == "S") { - 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); + Molecule d = fm->find_by_name ("accordion-accDot"); + d.translate_axis (staff_space * 0.5 PT, Y_AXIS); + m.add_molecule (d); + reg = reg.right_str (reg.length_i ()-1); } } /* 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("accordion-accSB"); - m.add_molecule(r); + Molecule r = fm->find_by_name ("accordion-accSB"); + m.add_molecule (r); } else if (sym == "BB") { - Molecule r = afm_find("accordion-accBB"); - m.add_molecule(r); + Molecule r = fm->find_by_name ("accordion-accBB"); + m.add_molecule (r); } else if (sym == "OldEE") { - Molecule r = afm_find("accordion-accOldEE"); - m.add_molecule(r); + Molecule r = fm->find_by_name ("accordion-accOldEE"); + m.add_molecule (r); } else if (sym == "OldEES") { - Molecule r = afm_find("accordion-accOldEES"); - m.add_molecule(r); + Molecule r = fm->find_by_name ("accordion-accOldEES"); + m.add_molecule (r); } return m; } +Molecule +Lookup::repeat_slash (Real w, Real s, Real t) +{ + SCM wid = gh_double2scm (w); + SCM sl = gh_double2scm (s); + SCM thick = gh_double2scm (t); + SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"), + wid, sl, thick, SCM_UNDEFINED); + + Box b (Interval (0, w + sqrt (sqr(t/s) + sqr (t))), + Interval (0, w * s)); + + return Molecule (b, slashnodot); // http://slashnodot.org +} + +Molecule +Lookup::bracket (Axis a, Interval iv, Direction d, Real thick, Real protude) +{ + Box b; + Axis other = Axis((a+1)%2); + b[a] = iv; + b[other] = Interval(-1, 1) * thick * 0.5; + + Molecule m = filledbox (b); + + b[a] = Interval (iv[UP] - thick, iv[UP]); + Interval oi = Interval (-thick/2, thick/2 + protude) ; + oi *= d; + b[other] = oi; + m.add_molecule (filledbox (b)); + b[a] = Interval (iv[DOWN], iv[DOWN] +thick); + m.add_molecule (filledbox(b)); + + return m; +} + +SCM +ly_bracket (SCM a, SCM iv, SCM d, SCM t, SCM p) +{ + SCM_ASSERT_TYPE(ly_axis_p (a), a, SCM_ARG1, __FUNCTION__, "axis") ; + SCM_ASSERT_TYPE(ly_number_pair_p (iv), iv, SCM_ARG1, __FUNCTION__, "number pair") ; + SCM_ASSERT_TYPE(ly_dir_p (d), a, SCM_ARG1, __FUNCTION__, "direction") ; + SCM_ASSERT_TYPE(gh_number_p (t), a, SCM_ARG1, __FUNCTION__, "number") ; + SCM_ASSERT_TYPE(gh_number_p(p), a, SCM_ARG1, __FUNCTION__, "number") ; + + + return Lookup::bracket ((Axis)gh_scm2int (a), ly_scm2interval (iv), + (Direction)gh_scm2int (d), gh_scm2double (t), gh_scm2double (p)).smobbed_copy (); +} + +static void +lookup_init () +{ + scm_c_define_gsubr ("ly-bracket", 5, 0, 0, (Scheme_function_unknown) ly_bracket); +} + +ADD_SCM_INIT_FUNC (lookup,lookup_init); +