X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fsystem-start-delimiter.cc;h=b28aad5cf7a9c340cd6f18645f035000fadfff61;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=355eab3218e5b985cb9c179d0a8be3f36e1fcfb9;hpb=73c3e44b4e0884a0ea7d227a7c188bc4e2c02c7f;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 355eab3218..b28aad5cf7 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ #include @@ -23,13 +23,13 @@ System_start_delimiter::staff_bracket (Grob*me,Real height) { Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ; - SCM at = gh_list (ly_symbol2scm ("bracket"), + SCM at = scm_list_n (ly_symbol2scm ("bracket"), me->get_grob_property ("arch-angle"), me->get_grob_property ("arch-width"), gh_double2scm (arc_height), gh_double2scm (height), me->get_grob_property ("arch-thick"), - me->get_grob_property ("bracket-thick"), + me->get_grob_property ("thickness"), SCM_UNDEFINED); /* @@ -57,24 +57,15 @@ Will not fix it since I'm not sure. return mol; } -void -System_start_delimiter::set_interface (Grob*me) -{ - me->set_interface (ly_symbol2scm ("system-start-delimiter-interface")); -} -bool -System_start_delimiter::has_interface (Grob*me) -{ - return me->has_interface (ly_symbol2scm ("system-start-delimiter-interface")); -} Molecule System_start_delimiter::simple_bar (Grob*me,Real h) { - 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))); + Real lt =me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness")) ; + Real w = lt * robust_scm2double (me->get_grob_property ("thickness"), 1); + return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), + lt); } MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1); @@ -82,55 +73,65 @@ 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) -{ + Grob * me = unsmob_grob (smob); SCM gl = me->get_grob_property ("glyph"); - - if (scm_ilength (me->get_grob_property ("elements")) <= 1 && gl == ly_symbol2scm ("bar-line")) + if (gh_equal_p (gl,scm_makfrom0str ("bar-line"))) { - me->suicide (); - } + int count = 0; + + /* + Get all coordinates, to trigger Hara kiri. + */ + SCM elts = me->get_grob_property ("elements"); + Grob *common = common_refpoint_of_list (elts, me, Y_AXIS); + for (SCM s = elts; gh_pair_p (s); s = gh_cdr (s)) + { + Interval v = unsmob_grob (gh_car (s))->extent (common, Y_AXIS); + + if (!v.is_empty ()) + count ++; + } + + if (count <= 1) + { + me->suicide (); + } + } + return SCM_UNSPECIFIED; } 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)) + if (!gh_string_p (s)) return SCM_EOL; - - SCM c = me->get_grob_property ((ly_symbol2string (s) + "-collapse-height") - .ch_C ()); + SCM gsym = scm_string_to_symbol (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))) + if (ext.is_empty () + || (robust_scm2double (me->get_grob_property ("collapse-height"), 0.0) >= l)) { me->suicide (); return SCM_EOL; } Molecule m; - if (s == ly_symbol2scm ("bracket")) + + if (gsym== ly_symbol2scm ("bracket")) m = staff_bracket (me,l); - else if (s == ly_symbol2scm ("brace")) + else if (gsym == ly_symbol2scm ("brace")) m = staff_brace (me,l); - else if (s == ly_symbol2scm ("bar-line")) + else if (gsym == ly_symbol2scm ("bar-line")) m = simple_bar (me,l); m.translate_axis (ext.center (), Y_AXIS); @@ -140,75 +141,47 @@ System_start_delimiter::brew_molecule (SCM smob) Molecule System_start_delimiter::staff_brace (Grob*me, Real y) { - Font_metric *fm = Font_interface::get_default_font (me); - SCM font_defaults = gh_cdr (scm_assoc (ly_symbol2scm ("font-defaults"), - me->paper_l ()->style_sheet_)); + 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 ("*")); + + SCM alist = scm_list_n (fam, sz, SCM_UNDEFINED); + fm = select_font (me->get_paper (), scm_list_n (alist, SCM_UNDEFINED)); + - Box b; -#if 0 - b = fm->get_char (0); - int count = fm->count () >? 2; -#else - int count = 255; -#endif int lo = 0; - int hi = count; - int relative_size = 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; - - if (lo == count - 1 && b[Y_AXIS].length () < y && relative_size < 10) - { - /* - 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 +8 are - the real bigger sizes, so worst case we need 11 steps to get - to the font we need. */ - fm = Font_interface::get_font - (me, - gh_list (gh_list (gh_cons (ly_symbol2scm ("font-relative-size"), - gh_int2scm (++relative_size)), - SCM_UNDEFINED), - me->mutable_property_alist_, - me->immutable_property_alist_, - font_defaults, - SCM_UNDEFINED)); -#if 0 - b = fm->get_char (0); - count = fm->count () >? 2; -#else - count = 255; -#endif - lo = 0; - hi = count; - } - } + { + int cmp = (lo + hi) / 2; + b = fm->get_indexed_char (cmp); + if (b[Y_AXIS].is_empty () || b[Y_AXIS].length () > y) + hi = cmp; + else + lo = cmp; + } while (hi - lo > 1); - - // uRGURGU, why doesn't the height calculation work out?? - SCM weird = me->get_grob_property ("weird"); - if (gh_number_p (weird)) - lo += gh_scm2int (weird); - SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED); - at = fontify_atom (fm, at); - - b = fm->get_char (lo); + + Molecule m (fm->get_indexed_char_molecule (lo)); // ugh. ascii? + b=m.extent_box(); b[X_AXIS] = Interval (0,0); - return Molecule (b, at); + 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");