X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=6c1649d7fa0ed9f1b2539d4b20a270d31b5b2cc1;hb=4c15993b92cdf28df5cb12677ca2c79fc8c7449b;hp=aeb2bfd9c18b547c79648b87566738848cd143aa;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index aeb2bfd9c1..6c1649d7fa 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -1,135 +1,195 @@ -/* - system-start-delimiter.cc -- implement System_start_delimiter - +/* + system-start-delimiter.cc -- implement System_start_delimiter + source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ -#include + + (c) 2000--2005 Han-Wen Nienhuys +*/ #include "system-start-delimiter.hh" -#include "paper-def.hh" -#include "molecule.hh" + +#include + +#include "spanner.hh" #include "axis-group-interface.hh" -#include "lookup.hh" +#include "output-def.hh" +#include "font-interface.hh" #include "all-font-metrics.hh" +#include "staff-symbol-referencer.hh" +#include "lookup.hh" +#include "item.hh" + -Molecule -System_start_delimiter::staff_bracket (Real height) const -{ - Paper_def* p= paper_l (); - Real arc_height = p->get_var("bracket_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")), - 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")), - SCM_UNDEFINED); - - Real staff_space = p->get_var ("interline"); - Real h = height + 2 * arc_height; - Box b (Interval (0, 1.5 * staff_space), 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) +Stencil +System_start_delimiter::staff_bracket (Grob *me, Real height) { - set_extent_callback (0, Y_AXIS); - Pointer_group_interface (this).set_interface(); + Font_metric *fm = Font_interface::get_default_font (me); + Drul_array tips (fm->find_by_name ("brackettips.down"), + fm->find_by_name ("brackettips.up")); + + Real thickness = robust_scm2double (me->get_property ("thickness"), 0.25); + + + Real overlap = 0.1 * thickness; + + Stencil bracket = Lookup::filled_box (Box (Interval (0, thickness), + Interval (-1, 1) + * (height/2 + overlap))); + + Direction d = DOWN; + do + { + bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap, 0.0); + } + while (flip (&d) != DOWN); + + return bracket; } -Molecule -System_start_delimiter::simple_bar (Real h) const + +Stencil +System_start_delimiter::simple_bar (Grob *me, Real h) { - Real w = paper_l ()->get_var ("barthick_score"); - return lookup_l ()->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); } -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"); + Spanner *me = dynamic_cast (unsmob_grob (smob)); - if (scm_ilength (get_elt_pointer ("elements")) <= 1 && gl == ly_symbol2scm ("bar-line")) + SCM gl = me->get_property ("glyph"); + if (ly_c_equal_p (gl, scm_makfrom0str ("bar-line"))) { - set_elt_property ("transparent", SCM_BOOL_T); - set_extent_callback (0, X_AXIS); - set_extent_callback (0, Y_AXIS); + int count = 0; + Paper_column *left_column = me->get_bound (LEFT)->get_column (); + + /* + 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)) + { + Spanner *staff = dynamic_cast (unsmob_grob (scm_car (s))); + if (!staff || + staff->get_bound (LEFT)->get_column () != left_column) + continue; + + Interval v = staff->extent (common, Y_AXIS); + + if (!v.is_empty ()) + count++; + } + + if (count <= 1) + { + me->suicide (); + } } + return SCM_UNSPECIFIED; } -Molecule -System_start_delimiter::do_brew_molecule ()const +MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1); +SCM +System_start_delimiter::print (SCM smob) { - Interval ext = Axis_group_interface::group_extent_callback (this, Y_AXIS); - Real l = ext.length (); - Molecule m; + 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); + + Real staff_space = Staff_symbol_referencer::staff_space (me); + + SCM elts = me->get_property ("elements"); + Grob *common = common_refpoint_of_list (elts, me, Y_AXIS); - SCM s = get_elt_property ("collapse-height"); - if (gh_number_p (s) && l < gh_scm2double (s)) + Interval ext; + for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s)) { - System_start_delimiter * me = (System_start_delimiter*)this; - me->set_elt_property ("transparent", SCM_BOOL_T); - me->set_extent_callback (0, X_AXIS); - me->set_extent_callback (0, Y_AXIS); - return m; + 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); + } } - - s = get_elt_property ("glyph"); - if (!gh_symbol_p(s)) - return m; - - if (s == ly_symbol2scm ("bracket")) - m = staff_bracket (l); - else if ( s == ly_symbol2scm ("brace")) - m = staff_brace (l); - else if (s == ly_symbol2scm ("bar-line")) - m = simple_bar (l); - - + ext -= me->relative_coordinate (common, Y_AXIS); + + Real len = ext.length () / staff_space; + + if (ext.is_empty () + || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= len)) + { + me->suicide (); + return SCM_EOL; + } + + Stencil m; + + if (gsym == ly_symbol2scm ("bracket")) + m = staff_bracket (me, len); + else if (gsym == ly_symbol2scm ("brace")) + m = staff_brace (me, len); + else if (gsym == ly_symbol2scm ("bar-line")) + m = simple_bar (me, len); + 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 +Stencil +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); - - Box b (Interval (0,0), Interval (-y/2, y/2)); + 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 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; + int hi = max (fm->count () - 1,2); + Box b; - return Molecule(b, at); + /* do a binary search for each Y, not very efficient, but passable? */ + do + { + 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); + + Stencil stil (fm->find_by_name ("brace" + to_string (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", + "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");