X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=c9d9159a4cfff26591f12404053947c623ef6cba;hb=805b7d14d56c2597d6f2879ba4c5a12ae5126b86;hp=df97638dba6b9faa9f43e95d1780454e35d0a5c7;hpb=a6a4b3fc2009f17a1a48cca0c11bfd3f38645937;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index df97638dba..c9d9159a4c 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2008 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ #include "bar-line.hh" @@ -198,6 +198,10 @@ Bar_line::compound_barline (Grob *me, string str, Real h, { m = dashed_bar_line (me, h, hair); } + else if (str == "'") + { + m = tick_bar_line (me, h, rounded); + } else if (str == ".") { m = dot; @@ -222,6 +226,22 @@ Bar_line::simple_barline (Grob *me, Interval (-h / 2, h / 2)), blot); } +Stencil +Bar_line::tick_bar_line (Grob *me, Real h, bool rounded) +{ + Real th = Staff_symbol_referencer::staff_space (me) / 2; + Real line_thick = Staff_symbol_referencer::line_thickness (me); + + Real blot + = rounded + ? me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")) + : 0.0; + + return Lookup::round_filled_box (Box (Interval (0, line_thick), + Interval (h / 2 - th, h / 2 + th)), blot); +} + + MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_size, 1); SCM Bar_line::calc_bar_size (SCM smob)