X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=e5460a0f0485521356c5f5a1dfeecc60379b5084;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=add49a7ca3a0d960f6cda60efd42d60373a2d5f1;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index add49a7ca3..e5460a0f04 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -1,158 +1,142 @@ -/* - system-start-delimiter.cc -- implement System_start_delimiter - - source file of the GNU LilyPond music typesetter +/* + This file is part of LilyPond, the GNU music typesetter. - (c) 2000--2004 Han-Wen Nienhuys + Copyright (C) 2000--2015 Han-Wen Nienhuys - */ + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -#include "system-start-delimiter.hh" + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -#include + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ -#include "spanner.hh" +#include "system-start-delimiter.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 "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) +System_start_delimiter::staff_bracket (Grob *me, Real 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); + Font_metric *fm = Font_interface::get_default_font (me); -/* -TODO: sort this out. - -Another thing: -In system-start-delimiter.cc I see the line + Drul_array tips (fm->find_by_name ("brackettips.down"), + fm->find_by_name ("brackettips.up")); - Real h = height + 2 * arc_height; + Real thickness = robust_scm2double (me->get_property ("thickness"), 0.25); -But I really think that you mean + Real overlap = 0.1 * thickness; - Real h = height + 2 * arc_width; + Box box (Interval (0, thickness), + Interval (-1, 1) + * (height / 2 + overlap)); -(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. + Stencil bracket = Lookup::filled_box (box); + for (DOWN_and_UP (d)) + bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap); + bracket = Stencil (box, bracket.expr ()); - */ + bracket.translate_axis (-0.8, X_AXIS); - Real h = height + 2 * arc_height; - Box b (Interval (0, 1.5), Interval (-h/2, h/2)); - Stencil mol (b, at); - mol.align_to (X_AXIS, CENTER); - return mol; + return bracket; } - - Stencil -System_start_delimiter::simple_bar (Grob*me,Real h) +System_start_delimiter::line_bracket (Grob *me, Real height) { - 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); + 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; } -MAKE_SCHEME_CALLBACK (System_start_delimiter,after_line_breaking,1); - -SCM -System_start_delimiter::after_line_breaking (SCM smob) +Stencil +System_start_delimiter::simple_bar (Grob *me, Real h) { - 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. - */ - 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; + 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); } - MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1); 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); - - SCM elts = me->get_property ("elements"); - Grob * common = common_refpoint_of_list (elts, me, Y_AXIS); + Spanner *me = unsmob (smob); + extract_grob_set (me, "elements", elts); + Grob *common = common_refpoint_of_array (elts, me, Y_AXIS); Interval ext; - for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s)) + Real staffspace = 1.0; + int non_empty_count = 0; + for (vsize i = elts.size (); i--;) { - 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); - } + Spanner *sp = dynamic_cast (elts[i]); + + if (sp + && sp->get_bound (LEFT) == me->get_bound (LEFT)) + { + Interval dims = sp->extent (common, Y_AXIS); + if (!dims.is_empty ()) + { + non_empty_count++; + ext.unite (dims); + staffspace = Staff_symbol_referencer::staff_space (sp); + } + } } - ext -= me->relative_coordinate (common, Y_AXIS); - - Real len = ext.length () / staff_space; + SCM glyph_sym = me->get_property ("style"); + Real len = ext.length (); + // Use collapse-height in multiples of the staff-space if (ext.is_empty () - || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= len)) + || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= (len / staffspace))) { me->suicide (); - return SCM_EOL; + return SCM_UNSPECIFIED; } Stencil m; - - if (gsym == ly_symbol2scm ("bracket")) + if (scm_is_eq (glyph_sym, ly_symbol2scm ("bracket"))) m = staff_bracket (me, len); - else if (gsym == ly_symbol2scm ("brace")) + else if (scm_is_eq (glyph_sym, ly_symbol2scm ("brace"))) m = staff_brace (me, len); - else if (gsym == ly_symbol2scm ("bar-line")) + else if (scm_is_eq (glyph_sym, ly_symbol2scm ("bar-line"))) m = simple_bar (me, len); + else if (scm_is_eq (glyph_sym, ly_symbol2scm ("line-bracket"))) + m = line_bracket (me, len); m.translate_axis (ext.center (), Y_AXIS); return m.smobbed_copy (); @@ -163,44 +147,64 @@ 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 = 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)); + /* + Find the default brace font if the user overrides it. + */ + fm = Font_interface::get_default_font (me); - int lo = 0; - int hi = (fm->count () - 1) >? 2; - Box b; + 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; do { int cmp = (lo + hi) / 2; - b = fm->get_indexed_char (cmp); + b = fm->get_indexed_char_dimensions (cmp); if (b[Y_AXIS].is_empty () || b[Y_AXIS].length () > y) - hi = cmp; + hi = cmp; else - lo = cmp; + lo = cmp; } while (hi - lo > 1); - /* FIXME: ascii? */ - Stencil stil (fm->get_indexed_char_stencil (lo)); - b = stil.extent_box (); - b[X_AXIS] = Interval (0, 0); + Stencil stil (fm->find_by_name ("brace" + ::to_string (lo))); + stil.translate_axis (-b[X_AXIS].length () / 2, X_AXIS); - return Stencil (b, stil.expr ()); -} + 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." - , - "collapse-height thickness " - "arch-height arch-angle arch-thick arch-width bracket-thick glyph"); +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 @code\n" + "@item bracket\n" + "A thick bracket, normally used to group similar" + " instruments in a score. Default for @code{StaffGroup}." + " @code{SystemStartBracket} uses this style.\n" + "@item brace\n" + "A @q{piano style} brace normally used for an instrument" + " that uses two staves. The default style for" + " @code{GrandStaff}. @code{SystemStartBrace} uses this" + " style.\n" + "@item bar-line\n" + "A simple line between the staves in a score. Default" + " for staves enclosed in @code{<<} and @code{>>}." + " @code{SystemStartBar} uses this style.\n" + "@item line-bracket\n" + "A simple square, normally used for subgrouping" + " instruments in a score. @code{SystemStartSquare} uses" + " this style.\n" + "@end table\n" + "\n" + "See also @file{input/regression/system-start-nesting.ly}.", + + /* properties */ + "collapse-height " + "style " + "thickness " + );