X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=0a5b6fe532e60ae6375201b02ab12be6fa4cc26a;hb=84aa0dad3e436409f734cca40f475d3808cfdfeb;hp=fde98b9db1c6e2c38b790c7989ba1355a40b8ff0;hpb=9dcd24ee22d12fa3867ca87e03483b4247b7f58d;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index fde98b9db1..0a5b6fe532 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -1,87 +1,84 @@ -/* - 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--2004 Han-Wen Nienhuys + (c) 2000--2005 Han-Wen Nienhuys +*/ + +#include "system-start-delimiter.hh" - */ #include #include "spanner.hh" #include "axis-group-interface.hh" -#include "system-start-delimiter.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" Stencil -System_start_delimiter::staff_bracket (Grob*me,Real height) +System_start_delimiter::staff_bracket (Grob *me, Real height) { - Real arc_height = scm_to_double (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"), - scm_make_real (arc_height), - scm_make_real (height), - me->get_property ("arch-thick"), - me->get_property ("thickness"), - SCM_UNDEFINED); + 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 + /* + TODO: sort this out. - Real h = height + 2 * arc_height; + Another thing: + In system-start-delimiter.cc I see the line + + Real h = height + 2 * arc_height; -But I really think that you mean + But I really think that you mean - Real h = height + 2 * arc_width; + 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. + (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)); + Box b (Interval (0, 1.5), Interval (-h / 2, h / 2)); Stencil mol (b, at); mol.align_to (X_AXIS, CENTER); return mol; } - - Stencil -System_start_delimiter::simple_bar (Grob*me,Real h) +System_start_delimiter::simple_bar (Grob *me, Real h) { - Real lt =me->get_layout ()->get_dimension (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)), + 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); +MAKE_SCHEME_CALLBACK (System_start_delimiter, after_line_breaking, 1); SCM System_start_delimiter::after_line_breaking (SCM smob) { - Grob * me = unsmob_grob (smob); - SCM gl = me->get_property ("glyph"); - if (ly_c_equal_p (gl,scm_makfrom0str ("bar-line"))) + Grob *me = unsmob_grob (smob); + SCM gl = me->get_property ("glyph"); + if (ly_c_equal_p (gl, scm_makfrom0str ("bar-line"))) { int count = 0; /* - Get all coordinates, to trigger Hara kiri. + Get all coordinates, to trigger Hara kiri. */ SCM elts = me->get_property ("elements"); Grob *common = common_refpoint_of_list (elts, me, Y_AXIS); @@ -90,11 +87,10 @@ System_start_delimiter::after_line_breaking (SCM smob) Interval v = unsmob_grob (scm_car (s))->extent (common, Y_AXIS); if (!v.is_empty ()) - count ++; + count++; } - - if (count <= 1) + if (count <= 1) { me->suicide (); } @@ -102,7 +98,6 @@ System_start_delimiter::after_line_breaking (SCM smob) return SCM_UNSPECIFIED; } - MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1); SCM System_start_delimiter::print (SCM smob) @@ -114,19 +109,19 @@ System_start_delimiter::print (SCM smob) SCM s = me->get_property ("glyph"); if (!scm_is_string (s)) return SCM_EOL; - SCM gsym = scm_string_to_symbol (s) ; + 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); + 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)) + 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 ()) @@ -147,7 +142,7 @@ System_start_delimiter::print (SCM smob) Stencil m; - if (gsym== ly_symbol2scm ("bracket")) + if (gsym == ly_symbol2scm ("bracket")) m = staff_bracket (me, len); else if (gsym == ly_symbol2scm ("brace")) m = staff_brace (me, len); @@ -162,7 +157,6 @@ Stencil 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 @@ -189,18 +183,15 @@ System_start_delimiter::staff_brace (Grob *me, Real y) } while (hi - lo > 1); - /* FIXME: ascii? */ - Stencil stil (fm->get_indexed_char_stencil (lo)); + 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", +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." - , + "It is implemented as a spanner.", "collapse-height thickness " "arch-height arch-angle arch-thick arch-width bracket-thick glyph");