X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsystem-start-delimiter.cc;h=3f671e3316135f60c593753eab550e545cb1395f;hb=e94c4a66c9d565749d8a121fc0267ddeb423ca13;hp=306d9289f6b26fe922fbc655f27d03bddc3a508b;hpb=d0b5f90a96daeede26ca3d0949de71c4ef0a5073;p=lilypond.git diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 306d9289f6..3f671e3316 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -1,13 +1,24 @@ /* - system-start-delimiter.cc -- implement System_start_delimiter + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2011 Han-Wen Nienhuys - (c) 2000--2006 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 "text-interface.hh" +#include "text-interface.hh" #include "all-font-metrics.hh" #include "axis-group-interface.hh" #include "font-interface.hh" @@ -22,11 +33,7 @@ Stencil System_start_delimiter::staff_bracket (Grob *me, Real height) { - 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)); + Font_metric *fm = Font_interface::get_default_font (me); Drul_array tips (fm->find_by_name ("brackettips.down"), fm->find_by_name ("brackettips.up")); @@ -42,7 +49,7 @@ System_start_delimiter::staff_bracket (Grob *me, Real height) Stencil bracket = Lookup::filled_box (box); Direction d = DOWN; do - bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap, 0.0); + bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap); while (flip (&d) != DOWN); bracket = Stencil (box, bracket.expr ()); @@ -75,25 +82,6 @@ System_start_delimiter::line_bracket (Grob *me, Real height) return vline; } -Stencil -System_start_delimiter::text (Grob *me_grob, Real h) -{ - (void) h; - - Spanner *me = dynamic_cast (me_grob); - SCM t = me->get_property ("text"); - if (me->get_break_index () == 0) - t = me->get_property ("long-text"); - - - SCM chain = Font_interface::text_font_alist_chain (me); - - SCM scm_stencil = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, t); - if (Stencil *p = unsmob_stencil (scm_stencil)) - return *p; - return Stencil(); -} - Stencil System_start_delimiter::simple_bar (Grob *me, Real h) { @@ -132,9 +120,7 @@ System_start_delimiter::print (SCM smob) SCM glyph_sym = me->get_property ("style"); Real len = ext.length (); if (ext.is_empty () - || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= ext.length ()) - || (glyph_sym == ly_symbol2scm ("bar-line") - && non_empty_count <= 1)) + || (robust_scm2double (me->get_property ("collapse-height"), 0.0) >= ext.length ())) { me->suicide (); return SCM_UNSPECIFIED; @@ -149,8 +135,6 @@ System_start_delimiter::print (SCM smob) m = simple_bar (me, len); else if (glyph_sym == ly_symbol2scm ("line-bracket")) m = line_bracket (me, len); - else if (glyph_sym == ly_symbol2scm ("text")) - m = text (me, len); m.translate_axis (ext.center (), Y_AXIS); return m.smobbed_copy (); @@ -160,15 +144,11 @@ 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 -> fonts. */ - SCM fam = scm_cons (ly_symbol2scm ("font-encoding"), - ly_symbol2scm ("fetaBraces")); - SCM alist = scm_list_n (fam, SCM_UNDEFINED); - fm = select_font (me->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; @@ -179,7 +159,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y) 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; else @@ -188,21 +168,41 @@ 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. " - , +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 " - "text " - "long-text " "thickness " );