X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=e378f3b22c1b878841931b508619188279fcd200;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=6d0b04dca598cdaa84c4f8eb485fcae7a1ecd925;hpb=5b9067e9603298292b420f27a0a665a836bd3644;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 6d0b04dca5..e378f3b22c 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -1,230 +1,28 @@ /* - bar.cc -- implement Bar + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys -*/ - -#include - -#include "lookup.hh" -#include "paper-column.hh" -#include "grob.hh" -#include "bar-line.hh" -#include "string.hh" -#include "stencil.hh" -#include "output-def.hh" -#include "font-interface.hh" - -#include "all-font-metrics.hh" -#include "item.hh" -#include "staff-symbol-referencer.hh" - -MAKE_SCHEME_CALLBACK (Bar_line,print,1); - -SCM -Bar_line::print (SCM smob) -{ - Grob * me = unsmob_grob (smob); - - SCM s = me->get_property ("glyph"); - SCM barsiz_proc = me->get_property ("bar-size-procedure"); - if (ly_c_string_p (s) && ly_c_procedure_p (barsiz_proc)) - { - String str =ly_scm2string (s); - SCM siz = scm_call_1 (barsiz_proc, me->self_scm ()); - Real sz = robust_scm2double (siz, 0); - if (sz <= 0) - return SCM_EOL; - - return compound_barline (me, str, sz).smobbed_copy (); - } - return SCM_EOL; -} - - -Stencil -Bar_line::compound_barline (Grob*me, String str, Real h) -{ - Real kern = robust_scm2double (me->get_property ("kern"), 1); - Real thinkern = robust_scm2double (me->get_property ("thin-kern"), 1); - Real hair = robust_scm2double (me->get_property ("hair-thickness"), 1); - Real fatline = robust_scm2double (me->get_property ("thick-thickness"), 1); - - Real staffline = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")); - Real staff_space = Staff_symbol_referencer::staff_space (me); - - kern *= staffline; - thinkern *= staffline; - hair *= staffline; - fatline *= staffline; - - Stencil thin = simple_barline (me, hair, h); - Stencil thick = simple_barline (me, fatline, h); - Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot"); - - int lines =Staff_symbol_referencer::line_count (me); - Real dist - = ((lines & 1 || lines == 0) - ? 1 - : (staff_space < 2 ? 2 : .5) ) * staff_space; - Stencil colon (dot); - colon.translate_axis (dist,Y_AXIS); - colon.add_stencil (dot); - colon.translate_axis (-dist/2,Y_AXIS); + 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. - Stencil m; - if (str == "||:") - str = "|:"; - - if (str == "") - { - return Lookup::blank (Box (Interval (0, 0), Interval (-h/2, h/2))); - } - else if (str == "|") - { - return thin; - } - else if (str == "|." || (h == 0 && str == ":|")) - { - m.add_at_edge (X_AXIS, LEFT, thick, 0, 0); - m.add_at_edge (X_AXIS, LEFT, thin, kern,0 ); - } - else if (str == ".|" || (h == 0 && str == "|:")) - { - m.add_at_edge (X_AXIS, RIGHT, thick, 0, 0); - m.add_at_edge (X_AXIS, RIGHT, thin, kern, 0); - } - else if (str == ":|") - { - m.add_at_edge (X_AXIS, LEFT, thick, 0, 0); - m.add_at_edge (X_AXIS, LEFT, thin, kern, 0); - m.add_at_edge (X_AXIS, LEFT, colon, kern, 0); - } - else if (str == "|:") - { - m.add_at_edge (X_AXIS, RIGHT, thick, 0, 0); - m.add_at_edge (X_AXIS, RIGHT, thin, kern, 0); - m.add_at_edge (X_AXIS, RIGHT, colon, kern, 0); - } - else if (str == ":|:") - { - m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0); - m.add_at_edge (X_AXIS, LEFT, colon, kern, 0); - m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0); - m.add_at_edge (X_AXIS, RIGHT, colon, kern, 0); - } - else if (str == ".|.") - { - m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0); - m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0); - } - else if (str == "||") - { - /* - should align to other side? this never appears - on the system-start? - */ - m.add_at_edge (X_AXIS, RIGHT, thin, 0, 0); - m.add_at_edge (X_AXIS, RIGHT, thin, thinkern, 0); - } - else if (str == ":") - { - int c = (Staff_symbol_referencer::line_count (me)); - - for (int i = 0 ; i < c - 1; i++) - { - Real y = (- (c-1.0) / 2 + 0.5 + i * staff_space); - Stencil d (dot); - - d. translate_axis (y,Y_AXIS); - m.add_stencil (d); - } - } - return m; -} - -Stencil -Bar_line::simple_barline (Grob *me, - Real w, - Real h) -{ - Real blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter")); - - return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), blot); -} - -MAKE_SCHEME_CALLBACK (Bar_line,before_line_breaking ,1); - -SCM -Bar_line::before_line_breaking (SCM smob) -{ - Grob*me=unsmob_grob (smob); - Item * item = dynamic_cast (me); - - SCM g = me->get_property ("glyph"); - SCM orig = g; - Direction bsd = item->break_status_dir (); - if (ly_c_string_p (g) && bsd) - { - SCM proc = me->get_property ("break-glyph-function"); - g = scm_call_2 (proc, g, scm_int2num (bsd)); - } - - if (!ly_c_string_p (g)) - { - me->set_property ("print-function", SCM_EOL); - me->set_extent (SCM_EOL, X_AXIS); - // leave y_extent for spanbar? - } - - if (! ly_c_equal_p (g, orig)) - me->set_property ("glyph", g); - - return SCM_UNSPECIFIED; -} - + 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 "bar-line.hh" +#include "paper-column.hh" -MAKE_SCHEME_CALLBACK (Bar_line,get_staff_bar_size,1); -SCM -Bar_line::get_staff_bar_size (SCM smob) +bool +Bar_line::non_empty_barline (Grob *me) { - Grob*me = unsmob_grob (smob); - Real ss = Staff_symbol_referencer::staff_space (me); - SCM size = me->get_property ("bar-size"); - if (ly_c_number_p (size)) - return scm_make_real (ly_scm2double (size)*ss); - else if (Staff_symbol_referencer::get_staff_symbol (me)) - { - /* - If there is no staff-symbol, we get -1 from the next - calculation. That's a nonsense value, which would collapse the - barline so we return 0.0 in the next alternative. - */ - return scm_make_real ((Staff_symbol_referencer::line_count (me) -1) * ss); - } - else - return scm_int2num (0); + return me->internal_has_interface (ly_symbol2scm ("bar-line-interface")) + && !me->extent (me, X_AXIS).is_empty (); } - - - -ADD_INTERFACE (Bar_line, "bar-line-interface", - "Bar line.\n" -"\n" -"Print a special bar symbol. It replaces the \n" -"regular bar symbol with a special\n" -"symbol. The argument @var{bartype} is a string which specifies the\n" -"kind of bar to print. Options are @code{:|},\n" -"@code{|:}, @code{:|:},\n" -"@code{||}, @code{|.},\n" -"@code{.|}, and @code{.|.}. \n" -"\n" -"These produce, respectively, a right repeat, a left repeat, a double\n" -"repeat, a double bar, a start bar, an end bar, and a thick double bar.\n" -"If @var{bartype} is set to @code{empty} then nothing is printed,\n" -"but a line break is allowed at that spot.\n", - "bar-size-procedure kern thin-kern hair-thickness thick-thickness glyph bar-size break-glyph-function");