X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=48b9c4715da6e4e09631bb7b873812b82e123ddc;hb=ff69d69350ae17cece443b5ef4a666e0bc8b6c84;hp=4922a84d37b29921d1e5a79d29c4ccd1508f1f0d;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 4922a84d37..48b9c4715d 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--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "bar-line.hh" @@ -14,6 +14,7 @@ #include "output-def.hh" #include "paper-column.hh" #include "staff-symbol-referencer.hh" +#include "line-interface.hh" MAKE_SCHEME_CALLBACK (Bar_line, print, 1); SCM @@ -77,37 +78,37 @@ Bar_line::compound_barline (Grob *me, string str, Real h, 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); + m.add_at_edge (X_AXIS, LEFT, thick, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); } 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); + m.add_at_edge (X_AXIS, RIGHT, thick, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, kern); } 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); + m.add_at_edge (X_AXIS, LEFT, thick, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); + m.add_at_edge (X_AXIS, LEFT, colon, kern); } 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, thick, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, kern); + m.add_at_edge (X_AXIS, RIGHT, colon, kern); } 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, LEFT, thick, thinkern); + m.add_at_edge (X_AXIS, LEFT, colon, kern); + m.add_at_edge (X_AXIS, RIGHT, thick, kern); + m.add_at_edge (X_AXIS, RIGHT, colon, kern); } else if (str == ".|.") { - m.add_at_edge (X_AXIS, LEFT, thick, thinkern, 0); - m.add_at_edge (X_AXIS, RIGHT, thick, kern, 0); + m.add_at_edge (X_AXIS, LEFT, thick, thinkern); + m.add_at_edge (X_AXIS, RIGHT, thick, kern); } else if (str == "||") { @@ -115,8 +116,8 @@ Bar_line::compound_barline (Grob *me, string str, Real h, 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); + m.add_at_edge (X_AXIS, RIGHT, thin, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, thinkern); } else if (str == ":") { @@ -124,13 +125,17 @@ Bar_line::compound_barline (Grob *me, string str, Real h, 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); m.add_stencil (d); } } + else if (str == "dashed") + { + m = dashed_bar_line (me, h, hair); + } else if (str == ".") { m = dot; @@ -167,8 +172,100 @@ Bar_line::calc_bar_size (SCM smob) } +Stencil +Bar_line::dashed_bar_line (Grob *me, Real h, Real thick) +{ + Real dash_size + = 1.0 - robust_scm2double (me->get_property ("gap"), 0.3); + /* + this is a tad complex for what we want to achieve, but with a + simple line, the round blotting interferes with staff line + connections. + */ + Real ss = Staff_symbol_referencer::staff_space (me); + int count = Staff_symbol_referencer::line_count (me); + Real line_thick = Staff_symbol_referencer::line_thickness (me); + + if (fabs (line_thick + (count -1) * ss - h) < 0.1) // ugh. + { + Real blot = + me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); + + Real half_space = ss/2; + Stencil bar; + + for (int i = (count-1); i >= -(count-1); i -= 2) + { + Real top_y = min ((i + dash_size) * half_space, + (count-1) * half_space + line_thick / 2); + Real bot_y = max ((i - dash_size) * half_space, + -(count-1) * half_space - line_thick/2); + + bar.add_stencil (Lookup::round_filled_box (Box (Interval (0, thick), + Interval (bot_y, top_y)), + blot)); + } + return bar; + } + else + { + /* + We have to scale the dashing so it starts and ends with half a + dash exactly. + */ + int dashes = int (rint (h / ss)); + Real total_dash_size = h / dashes; + Real factor = (dash_size - thick) / ss; + + SCM at = scm_list_n (ly_symbol2scm ("dashed-line"), + scm_from_double (thick), + scm_from_double (factor * total_dash_size), + scm_from_double ((1-factor) * total_dash_size), + scm_from_double (0), + scm_from_double (h), + scm_from_double (factor * total_dash_size * 0.5), + SCM_UNDEFINED); + + Box box; + box.add_point (Offset (0, 0)); + box.add_point (Offset (0, h)); + + Stencil s (box, at); + s.translate (Offset (thick/2, -h/2)); + return s; + } + return Stencil (); +} + +MAKE_SCHEME_CALLBACK (Bar_line, calc_anchor, 1) +SCM +Bar_line::calc_anchor (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Real kern = robust_scm2double (me->get_property ("kern"), 1); + Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + string str = robust_scm2string (me->get_property ("glyph-name"), ""); + + /* we put the anchor in the center of the barline, unless we are + a repeat bar, in which case we put the anchor in the center of + the barline without the dots. */ + Interval ext = me->extent (me, X_AXIS); + if (ext.is_empty ()) + return scm_from_double (0); + + Real anchor = ext.center (); + + Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots.dot"); + Real dot_width = dot.extent (X_AXIS).length () + kern * staffline; + if (str == "|:") + anchor -= dot_width / 2; + else if (str == ":|") + anchor += dot_width / 2; + + return scm_from_double (anchor); +} + ADD_INTERFACE (Bar_line, - "bar-line-interface", "Bar line.\n" "\n" @@ -182,11 +279,20 @@ ADD_INTERFACE (Bar_line, "\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" + "In addition, there is an option @code{||:} which is equivalent to\n" + "@code{|:} except at line breaks, where it produces a double bar (@code{||})\n" + "at the end of the line and a repeat sign (@code{|:}) at the beginning\n" + "of the new line." "If @var{bartype} is set to @code{empty} then nothing is printed,\n" - "but a line break is allowed at that spot.\n", + "but a line break is allowed at that spot.\n" + "\n\n" + "@code{gap} is used for the gaps in dashed barlines." + + , - /* properties */ + /* properties */ + "gap " "kern " "thin-kern " "hair-thickness " @@ -195,3 +301,5 @@ ADD_INTERFACE (Bar_line, "glyph-name " "bar-size " ); + +