X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=e5460a0f0485521356c5f5a1dfeecc60379b5084;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=22b993ba3122e8607e820a1cf6b2765f28f718b4;hpb=0c1ce854cfb2b9ad594526e359ec206fdd9b21fe;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 22b993ba31..e5460a0f04 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -1,200 +1,210 @@ -/* - system-start-delimiter.cc -- implement System_start_delimiter - - source file of the GNU LilyPond music typesetter - - (c) 2000--2001 Han-Wen Nienhuys - - */ -#include +/* + This file is part of LilyPond, the GNU music typesetter. + + 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. + + 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 "axis-group-interface.hh" #include "system-start-delimiter.hh" -#include "paper-def.hh" -#include "molecule.hh" -#include "font-interface.hh" +#include "text-interface.hh" #include "all-font-metrics.hh" -#include "grob.hh" -#include "staff-symbol-referencer.hh" +#include "axis-group-interface.hh" +#include "font-interface.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" -Molecule -System_start_delimiter::staff_bracket (Grob*me,Real height) +Stencil +System_start_delimiter::staff_bracket (Grob *me, Real height) { - Real arc_height = gh_scm2double (me->get_grob_property ("arch-height")) ; - - SCM at = gh_list (ly_symbol2scm ("bracket"), - me->get_grob_property ("arch-angle"), - me->get_grob_property ("arch-width"), - gh_double2scm (arc_height), - gh_double2scm (height), - me->get_grob_property ("arch-thick"), - me->get_grob_property ("bracket-thick"), - 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 ()); - Real h = height + 2 * arc_height; - Box b (Interval (0, 1.5), Interval (-h/2, h/2)); - Molecule mol (b, at); - mol.align_to (X_AXIS, CENTER); - return mol; -} + bracket.translate_axis (-0.8, X_AXIS); -void -System_start_delimiter::set_interface (Grob*me) -{ - me->set_interface (ly_symbol2scm ("system-start-delimiter-interface")); + return bracket; } -bool -System_start_delimiter::has_interface (Grob*me) +Stencil +System_start_delimiter::line_bracket (Grob *me, Real height) { - return me->has_interface (ly_symbol2scm ("system-start-delimiter-interface")); + 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; } -Molecule -System_start_delimiter::simple_bar (Grob*me,Real h) +Stencil +System_start_delimiter::simple_bar (Grob *me, Real h) { - Real w = me->paper_l ()->get_var ("stafflinethickness") * - gh_scm2double (me->get_grob_property ("thickness")); - return Lookup::filledbox (Box (Interval (0,w), Interval (-h/2, h/2))); + 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,after_line_breaking,1); - +MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1); SCM -System_start_delimiter::after_line_breaking (SCM smob) +System_start_delimiter::print (SCM smob) { - try_collapse (unsmob_grob (smob)); - return SCM_UNSPECIFIED; -} - -void -System_start_delimiter::try_collapse (Grob*me) -{ - SCM gl = me->get_grob_property ("glyph"); - - if (scm_ilength (me->get_grob_property ("elements")) <= 1 && gl == ly_symbol2scm ("bar-line")) + Spanner *me = unsmob (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--;) { - me->suicide (); + 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); + } + } } - -} - -MAKE_SCHEME_CALLBACK (System_start_delimiter,brew_molecule,1); + SCM glyph_sym = me->get_property ("style"); + Real len = ext.length (); -SCM -System_start_delimiter::brew_molecule (SCM smob) -{ - Grob * me = unsmob_grob (smob); - - SCM s = me->get_grob_property ("glyph"); - if (!gh_symbol_p (s)) - return SCM_EOL; - - SCM c = me->get_grob_property ((ly_symbol2string (s) + "-collapse-height") - .ch_C ()); - - 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; - - if (ext.empty_b () - || (gh_number_p (c) && l <= gh_scm2double (c))) + // Use collapse-height in multiples of the staff-space + if (ext.is_empty () + || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= (len / staffspace))) { me->suicide (); - return SCM_EOL; + return SCM_UNSPECIFIED; } - Molecule m; - if (s == ly_symbol2scm ("bracket")) - m = staff_bracket (me,l); - else if (s == ly_symbol2scm ("brace")) - m = staff_brace (me,l); - else if (s == ly_symbol2scm ("bar-line")) - m = simple_bar (me,l); - + Stencil m; + if (scm_is_eq (glyph_sym, ly_symbol2scm ("bracket"))) + m = staff_bracket (me, len); + else if (scm_is_eq (glyph_sym, ly_symbol2scm ("brace"))) + m = staff_brace (me, len); + 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 (); } -Molecule -System_start_delimiter::staff_brace (Grob*me, Real y) +Stencil +System_start_delimiter::staff_brace (Grob *me, Real y) { - Font_metric *fm = Font_interface::get_default_font (me); - Box b; - int lo = 0; - int hi = 255; //arg, urg == 0: fm->count () >? 2; + Font_metric *fm = 0; + + /* + Find the default brace font if the user overrides it. + */ + fm = Font_interface::get_default_font (me); - int big = 1; - SCM bigger = gh_list (me->mutable_property_alist_, - me->immutable_property_alist_, - SCM_UNDEFINED); + 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_char (cmp); - if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y) - { - hi = cmp; - } - else - { - /* - ugh: 7 - We have four fonts: feta-braces0-3.mf - - In the style-sheet, all paper relative sizes need to start - looking at the feta-braces0 font. - - The smallest paper size, feta11 or -3, has to make 5 steps - to get to feta26 or +2. Only after that, from +3 to +5 are - the real bigger sizes, so worst case we need 8 steps to get - to the font we need. */ - if (big < 8) - { - bigger = gh_cons (gh_cons (ly_symbol2scm ("font-relative-size"), - gh_int2scm (big++)), - bigger); - me->set_grob_property ("font", bigger); - fm = Font_interface::get_default_font (me); - lo = 0; - hi = 255; //fm->count () >? 2; - } - else - lo = cmp; - } + { + 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); - SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED); - at = fontify_atom (fm, at); - - b = fm->get_char (lo); - 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 Molecule (b, at); + 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 " + );