X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fsystem-start-delimiter.cc;h=94aa817bb15be18e900a62747736af9d69f64b48;hb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;hp=884f44e3139efe855669d64086a1d98607cc00fc;hpb=c52973e438ce3490d688860bb71849a7b3c26fef;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 884f44e313..94aa817bb1 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -3,135 +3,169 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2003 Han-Wen Nienhuys */ #include +#include "axis-group-interface.hh" #include "system-start-delimiter.hh" #include "paper-def.hh" #include "molecule.hh" -#include "axis-group-interface.hh" -#include "lookup.hh" +#include "font-interface.hh" #include "all-font-metrics.hh" +#include "grob.hh" +#include "staff-symbol-referencer.hh" +#include "lookup.hh" Molecule -System_start_delimiter::staff_bracket (Real height) const +System_start_delimiter::staff_bracket (Grob*me,Real height) { - Paper_def* p= paper_l (); - SCM scmss = p->get_scmvar ("staffspace"); - Real ss = gh_scm2double (scmss); - Real arc_height = gh_scm2double (get_elt_property("arch-height")) * ss ; + Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ; - SCM at = gh_list (ly_symbol2scm ("bracket"), - scm_product (get_elt_property ("arch-angle"), scmss), - scm_product (get_elt_property ("arch-width"), scmss), + SCM at = scm_list_n (ly_symbol2scm ("bracket"), + me->get_grob_property ("arch-angle"), + me->get_grob_property ("arch-width"), gh_double2scm (arc_height), - scm_product (get_elt_property ("bracket-width"),scmss), gh_double2scm (height), - scm_product (get_elt_property ("arch-thick"),scmss), - scm_product (get_elt_property ("bracket-thick"),scmss), + me->get_grob_property ("arch-thick"), + me->get_grob_property ("thickness"), SCM_UNDEFINED); +/* +TODO: sort this out. + +Another thing: +In system-start-delimiter.cc I see the line + + Real h = height + 2 * arc_height; + +But I really think that you mean + + Real h = height + 2 * arc_width; + +(arc_height changes the x-axis-size of arc ; arc_width changes the +y-axis-size) +Will not fix it since I'm not sure. + + */ + Real h = height + 2 * arc_height; - Box b (Interval (0, 1.5 * ss), Interval (-h/2, h/2)); + Box b (Interval (0, 1.5), Interval (-h/2, h/2)); Molecule mol (b, at); mol.align_to (X_AXIS, CENTER); return mol; } -System_start_delimiter::System_start_delimiter (SCM s) - : Spanner (s) -{ - set_extent_callback (0, Y_AXIS); - Pointer_group_interface (this).set_interface(); -} + Molecule -System_start_delimiter::simple_bar (Real h) const +System_start_delimiter::simple_bar (Grob*me,Real h) { - Real w = paper_l ()->get_var ("stafflinethickness") * - gh_scm2double (get_elt_property ("thickness")); - return lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); + Real w = me->get_paper ()->get_var ("linethickness") * + gh_scm2double (me->get_grob_property ("thickness")); + return Lookup::filledbox (Box (Interval (0,w), Interval (-h/2, h/2))); } -void -System_start_delimiter::after_line_breaking () +MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1); + +SCM +System_start_delimiter::after_line_breaking (SCM smob) { - SCM gl = get_elt_property ("glyph"); - - if (scm_ilength (get_elt_pointer ("elements")) <= 1 && gl == ly_symbol2scm ("bar-line")) + Grob * me = unsmob_grob (smob); + SCM gl = me->get_grob_property ("glyph"); + + if (scm_ilength (me->get_grob_property ("elements")) <= 1 + && gh_equal_p (gl,scm_makfrom0str ("bar-line"))) { - suicide (); + me->suicide (); } + + return SCM_UNSPECIFIED; } -MAKE_SCHEME_SCORE_ELEMENT_NON_DEFAULT_CALLBACKS(System_start_delimiter); +MAKE_SCHEME_CALLBACK (System_start_delimiter,brew_molecule,1); SCM -System_start_delimiter::scheme_molecule (SCM smob) +System_start_delimiter::brew_molecule (SCM smob) { - Score_element * sc = unsmob_element (smob); + Grob * me = unsmob_grob (smob); - System_start_delimiter * ssd= dynamic_cast (sc); + SCM s = me->get_grob_property ("glyph"); + if (!gh_string_p (s)) + return SCM_EOL; + SCM gsym = scm_string_to_symbol (s) ; + SCM c = me->get_grob_property ("collapse-height"); - Interval ext = Axis_group_interface::group_extent_callback (sc, Y_AXIS); - Real l = ext.length (); - Molecule m; - - SCM s = sc->get_elt_property ("collapse-height"); - if (gh_number_p (s) && l < gh_scm2double (s)) + Real staff_space = Staff_symbol_referencer::staff_space (me); + Interval ext = ly_scm2interval (Axis_group_interface::group_extent_callback + (me->self_scm (), gh_int2scm (Y_AXIS))); + Real l = ext.length () / staff_space; + + if (ext.empty_b () + || (gh_number_p (c) && l <= gh_scm2double (c))) { - sc->suicide(); + me->suicide (); return SCM_EOL; } - s = sc->get_elt_property ("glyph"); - if (!gh_symbol_p(s)) - return SCM_EOL; - - if (s == ly_symbol2scm ("bracket")) - m = ssd->staff_bracket (l); - else if (s == ly_symbol2scm ("brace")) - m = ssd-> staff_brace (l); - else if (s == ly_symbol2scm ("bar-line")) - m = ssd->simple_bar (l); - + Molecule m; + + if (gsym== ly_symbol2scm ("bracket")) + m = staff_bracket (me,l); + else if (gsym == ly_symbol2scm ("brace")) + m = staff_brace (me,l); + else if (gsym == ly_symbol2scm ("bar-line")) + m = simple_bar (me,l); m.translate_axis (ext.center (), Y_AXIS); - return m.create_scheme (); + return m.smobbed_copy (); } -/* - Ugh. Suck me plenty. - */ Molecule -System_start_delimiter::staff_brace (Real y) const +System_start_delimiter::staff_brace (Grob*me, Real y) { - Real staffht = paper_l ()->get_var ("staffheight"); - int staff_size = int (rint (staffht )); - - // URG - Real step = 1.0; - int minht = 2 * staff_size; - int maxht = 7 * minht; - int idx = int (((maxht - step) ? 0; - - SCM l = scm_assoc (ly_str02scm ("brace"), - scm_eval (ly_symbol2scm ("cmr-alist"))); + Font_metric *fm = 0; + + /* We go through the style sheet to lookup the font file + name. This is better than using find_font directly, + esp. because that triggers mktextfm for non-existent + fonts. */ + SCM br = ly_symbol2scm ("braces"); + SCM fam = gh_cons (ly_symbol2scm ("font-family"), br); + SCM sz = gh_cons (ly_symbol2scm ("font-relative-size"), ly_symbol2scm ("*")); - 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 (find_font (nm), at); + SCM alist = scm_list_n (fam, sz, SCM_UNDEFINED); + fm = Font_interface::get_font (me, scm_list_n (alist, SCM_UNDEFINED)); - Box b (Interval (0,0), Interval (-y/2, y/2)); - return Molecule(b, at); + int lo = 0; + + int hi = (fm->count () - 1) >? 2; + Box b; + + /* do a binary search for each Y, not very efficient, but passable? */ + do + { + int cmp = (lo + hi) / 2; + b = fm->get_char (cmp); + if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y) + hi = cmp; + else + lo = cmp; + } + while (hi - lo > 1); + + Molecule m (fm->get_char_molecule (lo)); + b=m.extent_box(); + b[X_AXIS] = Interval (0,0); + + return Molecule (b, m.get_expr()); } + + + +ADD_INTERFACE (System_start_delimiter,"system-start-delimiter-interface", + "#'style can be bar-line, bracket or brace", + "collapse-height thickness arch-height arch-angle arch-thick arch-width bracket-thick glyph");