X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=6e3a32d03c5ec69e1789d1919b81758fe5f218f8;hb=42c8f04fe971525561dde0ee757ffebe3e6c0703;hp=23bf7e7facd6a6c17ad572e9c8d5e1f646336930;hpb=3c2f386f1385a10dafbb811be245f5a75d6b132c;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 23bf7e7fac..6e3a32d03c 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -1,153 +1,204 @@ -/* +/* system-start-delimiter.cc -- implement System_start_delimiter - + source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - + + (c) 2000--2004 Han-Wen Nienhuys + */ + +#include "system-start-delimiter.hh" + #include +#include "spanner.hh" #include "axis-group-interface.hh" -#include "system-start-delimiter.hh" -#include "paper-def.hh" -#include "molecule.hh" -#include "lookup.hh" +#include "output-def.hh" +#include "font-interface.hh" #include "all-font-metrics.hh" -#include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "lookup.hh" -Molecule -System_start_delimiter::staff_bracket (Score_element*me,Real height) +Stencil +System_start_delimiter::staff_bracket (Grob*me,Real height) { - Paper_def* p= me->paper_l (); - SCM scmss = p->get_scmvar ("staffspace"); - Real ss = gh_scm2double (scmss); - Real arc_height = gh_scm2double (me->get_elt_property("arch-height")) * ss ; - - SCM at = gh_list (ly_symbol2scm ("bracket"), - scm_product (me->get_elt_property ("arch-angle"), scmss), - scm_product (me->get_elt_property ("arch-width"), scmss), - gh_double2scm (arc_height), - scm_product (me->get_elt_property ("bracket-width"),scmss), - gh_double2scm (height), - scm_product (me->get_elt_property ("arch-thick"),scmss), - scm_product (me->get_elt_property ("bracket-thick"),scmss), + Real arc_height = scm_to_double (me->get_property ("arch-height")) ; + + SCM at = scm_list_n (ly_symbol2scm ("bracket"), + 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); +/* +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 * ss), Interval (-h/2, h/2)); - Molecule mol (b, at); + Box b (Interval (0, 1.5), Interval (-h/2, h/2)); + Stencil mol (b, at); mol.align_to (X_AXIS, CENTER); return mol; } -void -System_start_delimiter::set_interface (Score_element*me) -{ - me->set_extent_callback (0, Y_AXIS); - Pointer_group_interface (me).set_interface(); - me->set_interface (ly_symbol2scm ("system-start-delimiter-interface")); -} -bool -System_start_delimiter::has_interface (Score_element*me) -{ - return me->has_interface (ly_symbol2scm ("system-start-delimiter-interface")); -} -Molecule -System_start_delimiter::simple_bar (Score_element*me,Real h) +Stencil +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 me->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); } -MAKE_SCHEME_CALLBACK(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) { - try_collapse (unsmob_element (smob)); - return SCM_UNDEFINED; -} - -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")) + Grob * me = unsmob_grob (smob); + 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); - +MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1); SCM -System_start_delimiter::brew_molecule (SCM smob) +System_start_delimiter::print (SCM smob) { - Score_element * me = unsmob_element (smob); - Interval ext = Axis_group_interface::group_extent_callback (me, 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 s = me->get_elt_property ("collapse-height"); - if (gh_number_p (s) && l < gh_scm2double (s)) + 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 len = ext.length () / staff_space; + + if (ext.is_empty () + || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= len)) { - 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")) - 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); - - + 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.create_scheme (); + return m.smobbed_copy (); } -/* - Ugh. Suck me plenty. - */ -Molecule -System_start_delimiter::staff_brace (Score_element*me,Real y) +Stencil +System_start_delimiter::staff_brace (Grob *me, Real y) { - Real staffht = me->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_assoc (ly_str02scm ("brace"), - scm_eval (ly_symbol2scm ("cmr-alist"))); - - 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 = (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_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 Molecule(b, at); + 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");