X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=1fe945693066d322f697381866644d92624587b8;hb=526bdfea303c7fe33e016932f1dd19389b8c334f;hp=5e4bb58e189e21031e9f071e68c3f8fab00070d6;hpb=8f8b3fb62d5d0776335de899b32aada69457810a;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 5e4bb58e18..1fe9456930 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -3,27 +3,31 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Han-Wen Nienhuys + (c) 2000--2007 Han-Wen Nienhuys */ #include "system-start-delimiter.hh" - - -#include "spanner.hh" +#include "text-interface.hh" +#include "all-font-metrics.hh" #include "axis-group-interface.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" - +#include "line-interface.hh" +#include "lookup.hh" +#include "output-def.hh" #include "pointer-group-interface.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" Stencil System_start_delimiter::staff_bracket (Grob *me, Real height) { - Font_metric *fm = Font_interface::get_default_font (me); + SCM fam = scm_cons (ly_symbol2scm ("font-encoding"), + ly_symbol2scm ("fetaMusic")); + + SCM alist = scm_list_n (fam, SCM_UNDEFINED); + Font_metric *fm = select_font (me->layout (), scm_list_n (alist, SCM_UNDEFINED)); + Drul_array tips (fm->find_by_name ("brackettips.down"), fm->find_by_name ("brackettips.up")); @@ -31,23 +35,50 @@ System_start_delimiter::staff_bracket (Grob *me, Real height) Real overlap = 0.1 * thickness; - Stencil bracket = Lookup::filled_box (Box (Interval (0, thickness), - Interval (-1, 1) - * (height / 2 + overlap))); - + Box box (Interval (0, thickness), + Interval (-1, 1) + * (height / 2 + overlap)); + + Stencil bracket = Lookup::filled_box (box); Direction d = DOWN; do - bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap, 0.0); - while (flip (&d) != DOWN) - ; + bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap); + while (flip (&d) != DOWN); + bracket = Stencil (box, bracket.expr ()); + bracket.translate_axis (-0.8, X_AXIS); + return bracket; } +Stencil +System_start_delimiter::line_bracket (Grob *me, Real height) +{ + Real thick + = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")) + * robust_scm2double (me->get_property ("thickness"), 1); + Real w = 0.8; + + Stencil tip1 = Line_interface::make_line (thick, + Offset (0, -height/2), + Offset (w, -height/2)); + Stencil tip2 = Line_interface::make_line (thick, + Offset (0, height/2), + Offset (w, height/2)); + Stencil vline = Line_interface::make_line (thick, + Offset (0, -height/2), + Offset (0, height/2)); + + vline.add_stencil (tip1); + vline.add_stencil (tip2); + vline.translate_axis (-w, X_AXIS); + return vline; +} + Stencil System_start_delimiter::simple_bar (Grob *me, Real h) { - Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness")); + Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); 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); @@ -58,23 +89,12 @@ SCM System_start_delimiter::print (SCM smob) { 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); - extract_grob_set (me, "elements", elts); Grob *common = common_refpoint_of_array (elts, me, Y_AXIS); Interval ext; - int non_empty_count = 0; - for (int i = elts.size (); i--;) + for (vsize i = elts.size (); i--;) { Spanner *sp = dynamic_cast (elts[i]); @@ -90,32 +110,24 @@ System_start_delimiter::print (SCM smob) } } - if (gsym == ly_symbol2scm ("bar-line") - && non_empty_count <= 1) - { - me->suicide (); - return SCM_EOL; - } - - ext -= me->relative_coordinate (common, Y_AXIS); - - Real len = ext.length () / staff_space; - + SCM glyph_sym = me->get_property ("style"); + Real len = ext.length (); if (ext.is_empty () - || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= len)) + || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= ext.length ())) { me->suicide (); - return SCM_EOL; + return SCM_UNSPECIFIED; } Stencil m; - - if (gsym == ly_symbol2scm ("bracket")) + if (glyph_sym == ly_symbol2scm ("bracket")) m = staff_bracket (me, len); - else if (gsym == ly_symbol2scm ("brace")) + else if (glyph_sym == ly_symbol2scm ("brace")) m = staff_brace (me, len); - else if (gsym == ly_symbol2scm ("bar-line")) + else if (glyph_sym == ly_symbol2scm ("bar-line")) m = simple_bar (me, len); + else if (glyph_sym == ly_symbol2scm ("line-bracket")) + m = line_bracket (me, len); m.translate_axis (ext.center (), Y_AXIS); return m.smobbed_copy (); @@ -135,8 +147,9 @@ System_start_delimiter::staff_brace (Grob *me, Real y) SCM alist = scm_list_n (fam, SCM_UNDEFINED); fm = select_font (me->layout (), scm_list_n (alist, SCM_UNDEFINED)); - int lo = 0; - int hi = max (fm->count () - 1, 2); + int + lo = 0; + int hi = max ((int) fm->count () - 1, 2); /* do a binary search for each Y, not very efficient, but passable? */ Box b; @@ -152,17 +165,43 @@ System_start_delimiter::staff_brace (Grob *me, Real y) while (hi - lo > 1); Stencil stil (fm->find_by_name ("brace" + to_string (lo))); - stil.translate_axis (-b[X_AXIS].length()/2, X_AXIS); + stil.translate_axis (-b[X_AXIS].length ()/2, X_AXIS); + stil.translate_axis (-0.2, X_AXIS); + return stil; } -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.", +ADD_INTERFACE (System_start_delimiter, + "The brace, bracket or bar in front of the system. The following " + "values for @code{style} are recognized:\n" + "\n" + " @table @samp\n" + " @item @code{bracket}\n" + " A thick bracket, normally used to group similar\n" + " instruments in a score. Default for StaffGroup.\n" + " SystemStartBracket use this style.\n" + "\n" + " @item @code{brace}\n" + " A \"piano style\" brace normally used for an instrument\n" + " that use two staffs. The default style for GrandStaff.\n" + " SystemStartBrace use this style.\n" + "\n" + " @item @code{bar-line}\n" + " A simple line between the staffs in a score. Default\n" + " for staffs enclosed in << >>.\n" + " SystemStartBar use this style.\n" + "\n" + " @item @code{line-bracket}\n" + " A simple square, normally used for subgrouping\n" + " instruments in a score.\n" + " SystemStartSquare use this style.\n" + " @end table\n" + "\n" + "See also @file{input/regression/system-start-nesting.ly}. ", /* properties */ "collapse-height " - "glyph " + "style " "thickness " );