X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fsystem-start-delimiter.cc;h=6e3a32d03c5ec69e1789d1919b81758fe5f218f8;hb=eea589c2d7bee6ab38bc611eb205d4c74e2011f7;hp=be97cdcfce057ffd7638c1dcd23b463ee8f4ce58;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index be97cdcfce..6e3a32d03c 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -1,40 +1,41 @@ -/* +/* system-start-delimiter.cc -- implement System_start_delimiter - + source file of the GNU LilyPond music typesetter - + (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 "stencil.hh" +#include "output-def.hh" #include "font-interface.hh" #include "all-font-metrics.hh" -#include "grob.hh" #include "staff-symbol-referencer.hh" #include "lookup.hh" Stencil -System_start_delimiter::staff_bracket (Grob*me,Real height) +System_start_delimiter::staff_bracket (Grob*me,Real height) { - Real arc_height = gh_scm2double (me->get_property ("arch-height")) ; - + 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"), - gh_double2scm (arc_height), - gh_double2scm (height), + 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 @@ -47,7 +48,7 @@ But I really think that you mean (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; @@ -62,7 +63,7 @@ Will not fix it since I'm not sure. Stencil System_start_delimiter::simple_bar (Grob*me,Real h) { - Real lt =me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness")) ; + 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); @@ -75,7 +76,7 @@ System_start_delimiter::after_line_breaking (SCM smob) { Grob * me = unsmob_grob (smob); SCM gl = me->get_property ("glyph"); - if (gh_equal_p (gl,scm_makfrom0str ("bar-line"))) + if (ly_c_equal_p (gl,scm_makfrom0str ("bar-line"))) { int count = 0; @@ -84,15 +85,15 @@ System_start_delimiter::after_line_breaking (SCM smob) */ SCM elts = me->get_property ("elements"); Grob *common = common_refpoint_of_list (elts, me, Y_AXIS); - for (SCM s = elts; gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s)) { - Interval v = unsmob_grob (gh_car (s))->extent (common, Y_AXIS); + Interval v = unsmob_grob (scm_car (s))->extent (common, Y_AXIS); if (!v.is_empty ()) count ++; } - - + + if (count <= 1) { me->suicide (); @@ -102,24 +103,43 @@ System_start_delimiter::after_line_breaking (SCM smob) } -MAKE_SCHEME_CALLBACK (System_start_delimiter,print,1); +MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1); SCM System_start_delimiter::print (SCM smob) { - Grob * me = unsmob_grob (smob); + Spanner *me = unsmob_spanner (smob); + if (!me) + return SCM_EOL; SCM s = me->get_property ("glyph"); - if (!gh_string_p (s)) + if (!scm_is_string (s)) return SCM_EOL; 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; - + + 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) >= l)) + || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= len)) { me->suicide (); return SCM_EOL; @@ -127,34 +147,32 @@ System_start_delimiter::print (SCM smob) Stencil m; - if (gsym== ly_symbol2scm ("bracket")) - m = staff_bracket (me,l); + if (gsym == ly_symbol2scm ("bracket")) + m = staff_bracket (me, len); else if (gsym == ly_symbol2scm ("brace")) - m = staff_brace (me,l); + m = staff_brace (me, len); else if (gsym == ly_symbol2scm ("bar-line")) - m = simple_bar (me,l); - + m = simple_bar (me, len); + m.translate_axis (ext.center (), Y_AXIS); return m.smobbed_copy (); } Stencil -System_start_delimiter::staff_brace (Grob*me, Real y) +System_start_delimiter::staff_brace (Grob *me, Real y) { 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 = gh_cons (ly_symbol2scm ("font-family"), ly_symbol2scm ("braces")); - + SCM fam = scm_cons (ly_symbol2scm ("font-encoding"), + ly_symbol2scm ("fetaBraces")); + SCM alist = scm_list_n (fam, SCM_UNDEFINED); - fm = select_font (me->get_paper (), scm_list_n (alist, 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; @@ -169,15 +187,13 @@ System_start_delimiter::staff_brace (Grob*me, Real y) lo = cmp; } while (hi - lo > 1); - - Stencil m (fm->get_indexed_char_stencil (lo)); // ugh. ascii? - b=m.extent_box(); - b[X_AXIS] = Interval (0,0); - return Stencil (b, m.get_expr()); -} - + 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",