X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=815d94e7cf00b2466fd301f127c5284feea25eae;hb=0e13fe23a0698ae81b9e618b15841b8a88919ed7;hp=884f44e3139efe855669d64086a1d98607cc00fc;hpb=c52973e438ce3490d688860bb71849a7b3c26fef;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 884f44e313..815d94e7cf 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -1,137 +1,212 @@ -/* - system-start-delimiter.cc -- implement System_start_delimiter - - source file of the GNU LilyPond music typesetter - - (c) 2000 Han-Wen Nienhuys - - */ -#include +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 2000--2011 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. + + 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. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #include "system-start-delimiter.hh" -#include "paper-def.hh" -#include "molecule.hh" +#include "text-interface.hh" +#include "all-font-metrics.hh" #include "axis-group-interface.hh" +#include "font-interface.hh" +#include "item.hh" +#include "line-interface.hh" #include "lookup.hh" -#include "all-font-metrics.hh" +#include "output-def.hh" +#include "pointer-group-interface.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" -Molecule -System_start_delimiter::staff_bracket (Real height) const +Stencil +System_start_delimiter::staff_bracket (Grob *me, Real height) { - Paper_def* p= paper_l (); - SCM scmss = p->get_scmvar ("staffspace"); - Real ss = gh_scm2double (scmss); - Real arc_height = gh_scm2double (get_elt_property("arch-height")) * ss ; - - SCM at = gh_list (ly_symbol2scm ("bracket"), - scm_product (get_elt_property ("arch-angle"), scmss), - scm_product (get_elt_property ("arch-width"), scmss), - gh_double2scm (arc_height), - scm_product (get_elt_property ("bracket-width"),scmss), - gh_double2scm (height), - scm_product (get_elt_property ("arch-thick"),scmss), - scm_product (get_elt_property ("bracket-thick"),scmss), - SCM_UNDEFINED); - - Real h = height + 2 * arc_height; - Box b (Interval (0, 1.5 * ss), Interval (-h/2, h/2)); - Molecule mol (b, at); - mol.align_to (X_AXIS, CENTER); - return mol; -} + Font_metric *fm = Font_interface::get_default_font (me); -System_start_delimiter::System_start_delimiter (SCM s) - : Spanner (s) -{ - set_extent_callback (0, Y_AXIS); - Pointer_group_interface (this).set_interface(); + Drul_array tips (fm->find_by_name ("brackettips.down"), + fm->find_by_name ("brackettips.up")); + + Real thickness = robust_scm2double (me->get_property ("thickness"), 0.25); + + Real overlap = 0.1 * thickness; + + 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); + while (flip (&d) != DOWN); + bracket = Stencil (box, bracket.expr ()); + + bracket.translate_axis (-0.8, X_AXIS); + + return bracket; } -Molecule -System_start_delimiter::simple_bar (Real h) const +Stencil +System_start_delimiter::line_bracket (Grob *me, Real height) { - Real w = paper_l ()->get_var ("stafflinethickness") * - gh_scm2double (get_elt_property ("thickness")); - return lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); + 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; } -void -System_start_delimiter::after_line_breaking () +Stencil +System_start_delimiter::simple_bar (Grob *me, Real h) { - SCM gl = get_elt_property ("glyph"); - - if (scm_ilength (get_elt_pointer ("elements")) <= 1 && gl == ly_symbol2scm ("bar-line")) - { - suicide (); - } + 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_SCORE_ELEMENT_NON_DEFAULT_CALLBACKS(System_start_delimiter); - +MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1); SCM -System_start_delimiter::scheme_molecule (SCM smob) +System_start_delimiter::print (SCM smob) { - Score_element * sc = unsmob_element (smob); + Spanner *me = unsmob_spanner (smob); + extract_grob_set (me, "elements", elts); + Grob *common = common_refpoint_of_array (elts, me, Y_AXIS); + + Interval ext; + Real staffspace = 1.0; + int non_empty_count = 0; + for (vsize i = elts.size (); i--;) + { + 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); + } + } + } - System_start_delimiter * ssd= dynamic_cast (sc); - - Interval ext = Axis_group_interface::group_extent_callback (sc, Y_AXIS); - Real l = ext.length (); - Molecule m; + SCM glyph_sym = me->get_property ("style"); + Real len = ext.length (); - SCM s = sc->get_elt_property ("collapse-height"); - if (gh_number_p (s) && l < gh_scm2double (s)) + // Use collapse-height in multiples of the staff-space + if (ext.is_empty () + || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= (len / staffspace))) { - sc->suicide(); - return SCM_EOL; + me->suicide (); + return SCM_UNSPECIFIED; } - s = sc->get_elt_property ("glyph"); - if (!gh_symbol_p(s)) - return SCM_EOL; - - if (s == ly_symbol2scm ("bracket")) - m = ssd->staff_bracket (l); - else if (s == ly_symbol2scm ("brace")) - m = ssd-> staff_brace (l); - else if (s == ly_symbol2scm ("bar-line")) - m = ssd->simple_bar (l); - - + Stencil m; + if (glyph_sym == ly_symbol2scm ("bracket")) + m = staff_bracket (me, len); + else if (glyph_sym == ly_symbol2scm ("brace")) + m = staff_brace (me, len); + 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.create_scheme (); + return m.smobbed_copy (); } -/* - Ugh. Suck me plenty. - */ -Molecule -System_start_delimiter::staff_brace (Real y) const +Stencil +System_start_delimiter::staff_brace (Grob *me, Real y) { - Real staffht = 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)); - - return Molecule(b, at); + Font_metric *fm = 0; + + /* + Find the default brace font if the user overrides it. + */ + fm = Font_interface::get_default_font (me); + + 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_dimensions (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))); + stil.translate_axis (-b[X_AXIS].length () / 2, X_AXIS); + + stil.translate_axis (-0.2, X_AXIS); + + return stil; } - + +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 " + );