X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=b07c6619b1e3d28d85a4026be337ff3836d18b05;hb=2210b90dc27efb3abd756dfccd9048785130ad4a;hp=544492852a2034bf69fde9e6ffea0f3e86da3994;hpb=7776d4901caa57e1d0f3ab7cf01348b930a6dbee;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 544492852a..b07c6619b1 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 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ #include @@ -14,24 +14,42 @@ #include "molecule.hh" #include "font-interface.hh" #include "all-font-metrics.hh" -#include "score-element.hh" +#include "grob.hh" +#include "staff-symbol-referencer.hh" #include "lookup.hh" Molecule -System_start_delimiter::staff_bracket (Score_element*me,Real height) +System_start_delimiter::staff_bracket (Grob*me,Real height) { - Real arc_height = gh_scm2double (me->get_elt_property("arch-height")) ; + Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ; - SCM at = gh_list (ly_symbol2scm ("bracket"), - me->get_elt_property ("arch-angle"), - me->get_elt_property ("arch-width"), + SCM at = scm_list_n (ly_symbol2scm ("bracket"), + me->get_grob_property ("arch-angle"), + me->get_grob_property ("arch-width"), gh_double2scm (arc_height), - me->get_elt_property ("bracket-width"), gh_double2scm (height), - me->get_elt_property ("arch-thick"), - me->get_elt_property ("bracket-thick"), + 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), Interval (-h/2, h/2)); Molecule mol (b, at); @@ -39,108 +57,132 @@ System_start_delimiter::staff_bracket (Score_element*me,Real height) return mol; } -void -System_start_delimiter::set_interface (Score_element*me) -{ - me->set_interface (ly_symbol2scm ("system-start-delimiter-interface")); -} bool -System_start_delimiter::has_interface (Score_element*me) +System_start_delimiter::has_interface (Grob*me) { return me->has_interface (ly_symbol2scm ("system-start-delimiter-interface")); } Molecule -System_start_delimiter::simple_bar (Score_element*me,Real h) +System_start_delimiter::simple_bar (Grob*me,Real h) { - Real w = me->paper_l ()->get_var ("stafflinethickness") * - gh_scm2double (me->get_elt_property ("thickness")); - return Lookup::filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); + Real w = me->paper_l ()->get_var ("linethickness") * + gh_scm2double (me->get_grob_property ("thickness")); + return Lookup::filledbox (Box (Interval (0,w), Interval (-h/2, h/2))); } -MAKE_SCHEME_CALLBACK(System_start_delimiter,after_line_breaking,1); +MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1); SCM System_start_delimiter::after_line_breaking (SCM smob) { - try_collapse (unsmob_element (smob)); - return SCM_UNSPECIFIED; -} + Grob * me = unsmob_grob (smob); + SCM gl = me->get_grob_property ("glyph"); -void -System_start_delimiter::try_collapse (Score_element*me) -{ - SCM gl = me->get_elt_property ("glyph"); - - if (scm_ilength (me->get_elt_property ("elements")) <= 1 && gl == ly_symbol2scm ("bar-line")) + if (scm_ilength (me->get_grob_property ("elements")) <= 1 + && gh_equal_p (gl,ly_str02scm ("bar-line"))) { me->suicide (); } - -} + return SCM_UNSPECIFIED; +} -MAKE_SCHEME_CALLBACK(System_start_delimiter,brew_molecule,1); +MAKE_SCHEME_CALLBACK (System_start_delimiter,brew_molecule,1); SCM System_start_delimiter::brew_molecule (SCM smob) { - Score_element * me = unsmob_element (smob); - Interval ext = ly_scm2interval (Axis_group_interface::group_extent_callback (me->self_scm(), gh_int2scm (Y_AXIS))); - Real l = ext.length (); - Molecule m; + Grob * me = unsmob_grob (smob); - SCM s = me->get_elt_property ("collapse-height"); - if (gh_number_p (s) && l < gh_scm2double (s)) + 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"); + + 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(); + me->suicide (); return SCM_EOL; } - s = me->get_elt_property ("glyph"); - if (!gh_symbol_p(s)) - return SCM_EOL; - - if (s == ly_symbol2scm ("bracket")) + Molecule m; + + 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); - return m.create_scheme (); + return m.smobbed_copy (); } Molecule -System_start_delimiter::staff_brace (Score_element*me,Real y) +System_start_delimiter::staff_brace (Grob*me, Real y) { + Font_metric *fm = 0; + + for (int i = 0; ; i++) + { + if (!fm || y > fm->get_char (fm->count ()-1)[Y_AXIS].length ()) + { + /* 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"), gh_int2scm (i)); + + SCM alist = scm_list_n (fam, sz, SCM_UNDEFINED); + fm = Font_interface::get_font (me, scm_list_n (alist, SCM_UNDEFINED)); + /* Hmm, if lookup fails, we get cmr10 anyway */ + if (ly_scm2string (ly_car (fm->description_)) == "cmr10") + break; + } + else + break; + } + int lo = 0; - int hi = 255; - Font_metric *fm = Font_interface::get_default_font (me); + + 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; + { + 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); - - SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED); + + SCM at = scm_list_n (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED); at = fontify_atom (fm, at); b = fm->get_char (lo); b[X_AXIS] = Interval (0,0); - return Molecule(b, at); + return Molecule (b, at); } + + + +ADD_INTERFACE (System_start_delimiter,"system-start-delimiter-interface", + "#'style can be bar-line, bracket or brace", + "bar-line-collapse-height brace-collapse-height bracket-collapse-height thickness arch-height arch-angle arch-thick arch-width bracket-thick glyph");