X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fsystem-start-delimiter.cc;h=22b993ba3122e8607e820a1cf6b2765f28f718b4;hb=0c1ce854cfb2b9ad594526e359ec206fdd9b21fe;hp=bc942774434830452eb5a34b5f4944898b12f918;hpb=6b6a34e929bf1d5a8859fe77e66396c3c15ef37c;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index bc94277443..22b993ba31 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -3,117 +3,198 @@ source file of the GNU LilyPond music typesetter - (c) 2000 Han-Wen Nienhuys + (c) 2000--2001 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 (); - Real arc_height = p->get_var("bracket_arch_height"); + Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ; + SCM at = gh_list (ly_symbol2scm ("bracket"), - gh_double2scm (p->get_var("bracket_arch_angle")), - gh_double2scm (p->get_var("bracket_arch_width")), + me->get_grob_property ("arch-angle"), + me->get_grob_property ("arch-width"), gh_double2scm (arc_height), - gh_double2scm (p->get_var("bracket_width")), gh_double2scm (height), - gh_double2scm (p->get_var("bracket_arch_thick")), - gh_double2scm (p->get_var("bracket_thick")), + me->get_grob_property ("arch-thick"), + me->get_grob_property ("bracket-thick"), SCM_UNDEFINED); - Real staff_space = p->get_var ("interline"); +/* +TODO: sort this out. + +Another thing: +In system-start-delimiter.cc I see the line + Real h = height + 2 * arc_height; - Box b (Interval (0, 1.5 * staff_space), Interval (-h/2, h/2)); - Molecule mol (b, at); + +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. - mol.translate_axis (- mol.dim_[X_AXIS].length () / 2, X_AXIS); + */ + + Real h = height + 2 * arc_height; + 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 () +void +System_start_delimiter::set_interface (Grob*me) { - set_empty (Y_AXIS); + me->set_interface (ly_symbol2scm ("system-start-delimiter-interface")); } -Molecule -System_start_delimiter::simple_bar (Real h) const +bool +System_start_delimiter::has_interface (Grob*me) { - Real w = paper_l ()->get_var ("barthick_score"); - return lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); + return me->has_interface (ly_symbol2scm ("system-start-delimiter-interface")); } - Molecule -System_start_delimiter::do_brew_molecule ()const +System_start_delimiter::simple_bar (Grob*me,Real h) { - Interval ext = Axis_group_interface::group_extent_callback (dim_cache_[Y_AXIS]); - Real l = ext.length (); - Molecule m; + Real w = me->paper_l ()->get_var ("stafflinethickness") * + gh_scm2double (me->get_grob_property ("thickness")); + return Lookup::filledbox (Box (Interval (0,w), Interval (-h/2, h/2))); +} - SCM s = get_elt_property ("collapse-height"); - if (gh_number_p (s) && l < gh_scm2double (s)) +MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1); + +SCM +System_start_delimiter::after_line_breaking (SCM smob) +{ + try_collapse (unsmob_grob (smob)); + return SCM_UNSPECIFIED; +} + +void +System_start_delimiter::try_collapse (Grob*me) +{ + SCM gl = me->get_grob_property ("glyph"); + + if (scm_ilength (me->get_grob_property ("elements")) <= 1 && gl == ly_symbol2scm ("bar-line")) { - System_start_delimiter * me = (System_start_delimiter*)this; - me->set_elt_property ("transparent", SCM_BOOL_T); - me->set_empty (X_AXIS); - me->set_empty (Y_AXIS); - return m; + me->suicide (); } + +} + +MAKE_SCHEME_CALLBACK (System_start_delimiter,brew_molecule,1); + +SCM +System_start_delimiter::brew_molecule (SCM smob) +{ + Grob * me = unsmob_grob (smob); + + SCM s = me->get_grob_property ("glyph"); + if (!gh_symbol_p (s)) + return SCM_EOL; - s = get_elt_property ("glyph"); - if (gh_symbol_p (s) && s == ly_symbol2scm ("bracket")) - m = staff_bracket (l); - else if (gh_symbol_p (s) && s == ly_symbol2scm ("brace")) - m = staff_brace (l); - else - m = simple_bar (l); + SCM c = me->get_grob_property ((ly_symbol2string (s) + "-collapse-height") + .ch_C ()); + 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))) + { + me->suicide (); + return SCM_EOL; + } + + Molecule m; + if (s == ly_symbol2scm ("bracket")) + m = staff_bracket (me,l); + else if (s == ly_symbol2scm ("brace")) + m = staff_brace (me,l); + else if (s == ly_symbol2scm ("bar-line")) + m = simple_bar (me,l); m.translate_axis (ext.center (), Y_AXIS); - return m; + 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_eval (gh_list (ly_symbol2scm ("style-to-cmr"), - ly_str02scm ("brace"), - SCM_UNDEFINED)); - - 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); + Font_metric *fm = Font_interface::get_default_font (me); + Box b; + int lo = 0; + int hi = 255; //arg, urg == 0: fm->count () >? 2; + + int big = 1; + SCM bigger = gh_list (me->mutable_property_alist_, + me->immutable_property_alist_, + SCM_UNDEFINED); + + /* 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 + { + /* + ugh: 7 + We have four fonts: feta-braces0-3.mf + + In the style-sheet, all paper relative sizes need to start + looking at the feta-braces0 font. + + The smallest paper size, feta11 or -3, has to make 5 steps + to get to feta26 or +2. Only after that, from +3 to +5 are + the real bigger sizes, so worst case we need 8 steps to get + to the font we need. */ + if (big < 8) + { + bigger = gh_cons (gh_cons (ly_symbol2scm ("font-relative-size"), + gh_int2scm (big++)), + bigger); + me->set_grob_property ("font", bigger); + fm = Font_interface::get_default_font (me); + lo = 0; + hi = 255; //fm->count () >? 2; + } + else + lo = cmp; + } + } + while (hi - lo > 1); + + SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED); + at = fontify_atom (fm, at); - Box b (Interval (0,0), Interval (-y/2, y/2)); + b = fm->get_char (lo); + b[X_AXIS] = Interval (0,0); - return Molecule(b, at); + return Molecule (b, at); }