X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=7a90ebb7297e321d77d18ebb23fa793ee8927ad0;hb=7e79448be56dad04b97e89e0c49dce64bf16100e;hp=56609b231f9e7b940d5aa27310c3d1d1fb3e2766;hpb=faaee71fb44c8e1040239797aad336f4e46c2c21;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 56609b231f..7a90ebb729 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -1,58 +1,54 @@ /* - bar.cc -- implement Bar + bar-line.cc -- implement Bar_line source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ +#include "bar-line.hh" + #include +#include "all-font-metrics.hh" +#include "font-interface.hh" #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 "paper-column.hh" #include "staff-symbol-referencer.hh" -MAKE_SCHEME_CALLBACK (Bar_line,print,1); +MAKE_SCHEME_CALLBACK (Bar_line, print, 1); -SCM -Bar_line::print (SCM smob) +SCM +Bar_line::print (SCM smob) { - Grob * me = unsmob_grob (smob); + Grob *me = unsmob_grob (smob); SCM s = me->get_property ("glyph"); SCM barsiz_proc = me->get_property ("bar-size-procedure"); if (scm_is_string (s) && ly_c_procedure_p (barsiz_proc)) { - String str =ly_scm2string (s); + 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 compound_barline (me, str, sz, true).smobbed_copy (); } return SCM_EOL; } - Stencil -Bar_line::compound_barline (Grob*me, String str, Real h) +Bar_line::compound_barline (Grob *me, String str, Real h, + bool rounded) { 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 staffline = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); Real staff_space = Staff_symbol_referencer::staff_space (me); kern *= staffline; @@ -60,27 +56,27 @@ Bar_line::compound_barline (Grob*me, String str, Real h) 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"); + Stencil thin = simple_barline (me, hair, h, rounded); + Stencil thick = simple_barline (me, fatline, h, rounded); + Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots.dot"); - int lines =Staff_symbol_referencer::line_count (me); - Real dist + int lines = Staff_symbol_referencer::line_count (me); + Real dist = ((lines & 1 || lines == 0) ? 1 - : (staff_space < 2 ? 2 : .5) ) * staff_space; + : (staff_space < 2 ? 2 : .5)) * staff_space; Stencil colon (dot); - colon.translate_axis (dist,Y_AXIS); + colon.translate_axis (dist, Y_AXIS); colon.add_stencil (dot); - colon.translate_axis (-dist/2,Y_AXIS); + colon.translate_axis (-dist / 2, Y_AXIS); Stencil m; if (str == "||:") str = "|:"; - + if (str == "") { - return Lookup::blank (Box (Interval (0, 0), Interval (-h/2, h/2))); + return Lookup::blank (Box (Interval (0, 0), Interval (-h / 2, h / 2))); } else if (str == "|") { @@ -88,8 +84,8 @@ Bar_line::compound_barline (Grob*me, String str, Real h) } 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 ); + 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 == "|:")) { @@ -100,20 +96,20 @@ Bar_line::compound_barline (Grob*me, String str, Real h) { 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); + 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); + 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); + m.add_at_edge (X_AXIS, RIGHT, colon, kern, 0); } else if (str == ".|.") { @@ -132,13 +128,13 @@ Bar_line::compound_barline (Grob*me, String str, Real h) else if (str == ":") { int c = (Staff_symbol_referencer::line_count (me)); - - for (int i = 0 ; i < c - 1; i++) + + for (int i = 0; i < c - 1; i++) { - Real y = (- (c-1.0) / 2 + 0.5 + i * staff_space); + Real y = (- (c - 1.0) / 2 + 0.5 + i * staff_space); Stencil d (dot); - d. translate_axis (y,Y_AXIS); + d.translate_axis (y, Y_AXIS); m.add_stencil (d); } } @@ -148,21 +144,26 @@ Bar_line::compound_barline (Grob*me, String str, Real h) Stencil Bar_line::simple_barline (Grob *me, Real w, - Real h) + Real h, + bool rounded) { - 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); + Real blot + = rounded + ? me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")) + : 0.0; + + return Lookup::round_filled_box (Box (Interval (0, w), + Interval (-h / 2, h / 2)), blot); } -MAKE_SCHEME_CALLBACK (Bar_line,before_line_breaking ,1); +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); - + 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 (); @@ -171,7 +172,7 @@ Bar_line::before_line_breaking (SCM smob) SCM proc = me->get_property ("break-glyph-function"); g = scm_call_2 (proc, g, scm_int2num (bsd)); } - + if (!scm_is_string (g)) { me->set_property ("print-function", SCM_EOL); @@ -184,19 +185,16 @@ Bar_line::before_line_breaking (SCM smob) return SCM_UNSPECIFIED; } - - - -MAKE_SCHEME_CALLBACK (Bar_line,get_staff_bar_size,1); +MAKE_SCHEME_CALLBACK (Bar_line, get_staff_bar_size, 1); SCM -Bar_line::get_staff_bar_size (SCM smob) +Bar_line::get_staff_bar_size (SCM smob) { - Grob*me = unsmob_grob (smob); + 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 (scm_to_double (size)*ss); + if (scm_is_number (size)) + return scm_make_real (scm_to_double (size) * ss); else if (Staff_symbol_referencer::get_staff_symbol (me)) { /* @@ -204,27 +202,26 @@ Bar_line::get_staff_bar_size (SCM smob) 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); + Real ysize = (Staff_symbol_referencer::line_count (me) -1); + ysize = ysize * ss + Staff_symbol_referencer::line_thickness (me); + return scm_make_real (ysize); } - else - return scm_int2num (0); + return scm_int2num (0); } - - 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"); + "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");