X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=a36d7c01ed071a53bd627c0c4aadd027617b6c60;hb=c77189ccaa4e645850ad61779de7a4c8f3fdbc6f;hp=d16a11e3dbddd9ba2655f44a7c79e67809477f37;hpb=ac6c83f047635535d0481a15654c13e776334dc6;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index d16a11e3db..a36d7c01ed 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -1,9 +1,20 @@ /* - multi-measure-rest.cc -- implement Multi_measure_rest + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2010 Jan Nieuwenhuizen - (c) 1998--2007 Jan Nieuwenhuizen + 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 "multi-measure-rest.hh" @@ -47,7 +58,7 @@ Multi_measure_rest::percent (SCM smob) Grob *me = unsmob_grob (smob); Spanner *sp = dynamic_cast (me); - Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6); + Stencil r = Percent_repeat_item_interface::x_percent (me, 1); // ugh copy & paste. @@ -121,11 +132,9 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) return s; } - SCM alist_chain = Font_interface::music_font_alist_chain (me); - Real staff_space = Staff_symbol_referencer::staff_space (me); - Font_metric *musfont - = select_font (me->layout (), alist_chain); + + Font_metric *musfont = Font_interface::get_default_font (me); SCM sml = me->get_property ("use-breve-rest"); if (measures == 1)