X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=ec7a346dfb894f1ddc1cd02f7f07f8fe62c91ef1;hb=4f5b668a1d61ca95adb60d56f1c771748b5a6446;hp=5ad1bc6c6e68ddb8d7a8aeca8a3de86efa4f93ce;hpb=c380a7abde14a60ebd6d8a6eab91ae4e13677a23;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 5ad1bc6c6e..ec7a346dfb 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -3,33 +3,34 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2002 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ #include +#include "spanner.hh" #include "axis-group-interface.hh" #include "system-start-delimiter.hh" -#include "paper-def.hh" -#include "molecule.hh" +#include "output-def.hh" +#include "stencil.hh" #include "font-interface.hh" #include "all-font-metrics.hh" #include "grob.hh" #include "staff-symbol-referencer.hh" #include "lookup.hh" -Molecule +Stencil System_start_delimiter::staff_bracket (Grob*me,Real height) { - Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ; + Real arc_height = scm_to_double (me->get_property ("arch-height")) ; 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 ("thickness"), + me->get_property ("arch-angle"), + me->get_property ("arch-width"), + scm_make_real (arc_height), + scm_make_real (height), + me->get_property ("arch-thick"), + me->get_property ("thickness"), SCM_UNDEFINED); /* @@ -52,24 +53,20 @@ 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); + Stencil mol (b, at); mol.align_to (X_AXIS, CENTER); return mol; } -bool -System_start_delimiter::has_interface (Grob*me) -{ - return me->has_interface (ly_symbol2scm ("system-start-delimiter-interface")); -} -Molecule +Stencil 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_layout ()->get_dimension (ly_symbol2scm ("linethickness")) ; + Real w = lt * robust_scm2double (me->get_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); @@ -78,43 +75,77 @@ SCM System_start_delimiter::after_line_breaking (SCM smob) { 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,ly_str02scm ("bar-line"))) + SCM gl = me->get_property ("glyph"); + if (ly_c_equal_p (gl,scm_makfrom0str ("bar-line"))) { - me->suicide (); - } + int count = 0; + + /* + Get all coordinates, to trigger Hara kiri. + */ + SCM elts = me->get_property ("elements"); + Grob *common = common_refpoint_of_list (elts, me, Y_AXIS); + for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s)) + { + Interval v = unsmob_grob (scm_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); +MAKE_SCHEME_CALLBACK (System_start_delimiter,print,1); SCM -System_start_delimiter::brew_molecule (SCM smob) +System_start_delimiter::print (SCM smob) { - Grob * me = unsmob_grob (smob); - - SCM s = me->get_grob_property ("glyph"); - if (!gh_string_p (s)) + Spanner * me = unsmob_spanner (smob); + if (!me) + return SCM_EOL; + + SCM s = me->get_property ("glyph"); + if (!scm_is_string (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))); + + SCM elts = me->get_property ("elements"); + Grob * common = common_refpoint_of_list (elts, me, Y_AXIS); + + Interval ext; + for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s)) + { + Spanner * sp = unsmob_spanner (scm_car (s)); + if (sp && + sp->get_bound (LEFT) == me->get_bound (LEFT)) + { + Interval dims = sp->extent (common, Y_AXIS); + if (!dims.is_empty ()) + ext.unite (dims); + } + } + + ext -= me->relative_coordinate (common, 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_property ("collapse-height"), 0.0) >= l)) { me->suicide (); return SCM_EOL; } - Molecule m; + Stencil m; if (gsym== ly_symbol2scm ("bracket")) m = staff_bracket (me,l); @@ -127,32 +158,20 @@ System_start_delimiter::brew_molecule (SCM smob) return m.smobbed_copy (); } -Molecule +Stencil 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; - } + /* 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 fam = scm_cons (ly_symbol2scm ("font-encoding"), ly_symbol2scm ("fetaBraces")); + + SCM alist = scm_list_n (fam, SCM_UNDEFINED); + fm = select_font (me->get_layout (), scm_list_n (alist, SCM_UNDEFINED)); + int lo = 0; @@ -163,26 +182,28 @@ System_start_delimiter::staff_brace (Grob*me, Real y) do { int cmp = (lo + hi) / 2; - b = fm->get_char (cmp); - if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y) + 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); - - 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); + /* FIXME: ascii? */ + Stencil stil (fm->get_indexed_char_stencil (lo)); + b = stil.extent_box (); + b[X_AXIS] = Interval (0, 0); + + return Stencil (b, stil.expr ()); } 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"); + "The brace, bracket or bar in front of the system. " + "It is implemented as a spanner." + , + "collapse-height thickness " + "arch-height arch-angle arch-thick arch-width bracket-thick glyph");