X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=0c5c768f22248dc081242bf834c59275b80922cb;hb=3512ac1f9e6ac4d96f0a486ba8f5968ccf0ce507;hp=6762b21864d217b791a374230fa1af39646541e6;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 6762b21864..0c5c768f22 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -1,54 +1,52 @@ /* - 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--2006 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 "output-def.hh" -#include "font-interface.hh" -#include "all-font-metrics.hh" +#include "paper-column.hh" #include "staff-symbol-referencer.hh" +#include "line-interface.hh" -MAKE_SCHEME_CALLBACK (Bar_line,print,1); - -SCM -Bar_line::print (SCM smob) +MAKE_SCHEME_CALLBACK (Bar_line, print, 1); +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)) + SCM s = me->get_property ("glyph-name"); + SCM barsize = me->get_property ("bar-size"); + + if (scm_is_string (s) && scm_is_number (barsize)) { - String str =ly_scm2string (s); - SCM siz = scm_call_1 (barsiz_proc, me->self_scm ()); - Real sz = robust_scm2double (siz, 0); + string str = ly_scm2string (s); + Real sz = robust_scm2double (barsize, 0); if (sz <= 0) return SCM_EOL; - - return compound_barline (me, str, sz).smobbed_copy (); + + return compound_barline (me, str, sz, false).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_layout ()->get_dimension (ly_symbol2scm ("linethickness")); + Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); Real staff_space = Staff_symbol_referencer::staff_space (me); kern *= staffline; @@ -56,36 +54,32 @@ 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 == "|") - { - return thin; - } + 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, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern, 0); } else if (str == ".|" || (h == 0 && str == "|:")) { @@ -96,20 +90,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 == ".|.") { @@ -128,99 +122,154 @@ 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); } } + else if (str == "dashed") + { + m = dashed_bar_line (me, h, hair); + } + else if (str == ".") + { + m = dot; + } return m; } Stencil Bar_line::simple_barline (Grob *me, Real w, - Real h) + Real h, + bool rounded) { - Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); - - return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), blot); -} + Real blot + = rounded + ? me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")) + : 0.0; -MAKE_SCHEME_CALLBACK (Bar_line,before_line_breaking ,1); + return Lookup::round_filled_box (Box (Interval (0, w), + Interval (-h / 2, h / 2)), blot); +} +MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_size, 1); SCM -Bar_line::before_line_breaking (SCM smob) +Bar_line::calc_bar_size (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 (scm_is_string (g) && bsd) - { - SCM proc = me->get_property ("break-glyph-function"); - g = scm_call_2 (proc, g, scm_int2num (bsd)); - } - - if (!scm_is_string (g)) + Grob *me = unsmob_grob (smob); + if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (me)) { - me->set_property ("print-function", SCM_EOL); - me->set_extent (SCM_EOL, X_AXIS); - // leave y_extent for spanbar? + Interval staff_y = staff->extent (staff, Y_AXIS); + return scm_from_double (staff_y.is_empty () ? 0.0 : staff_y.length ()); } - - if (! ly_c_equal_p (g, orig)) - me->set_property ("glyph", g); - - return SCM_UNSPECIFIED; + return scm_from_int (0); } - - -MAKE_SCHEME_CALLBACK (Bar_line,get_staff_bar_size,1); -SCM -Bar_line::get_staff_bar_size (SCM smob) +Stencil +Bar_line::dashed_bar_line (Grob *me, Real h, Real thick) { - Grob*me = unsmob_grob (smob); + 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); - SCM size = me->get_property ("bar-size"); - if (scm_is_number (size)) - return scm_make_real (scm_to_double (size)*ss); - else if (Staff_symbol_referencer::get_staff_symbol (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. { - /* - 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); + 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 - return scm_int2num (0); + { + /* + 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(); } +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" + "\n\n" + "@code{gap} is used for the gaps in dashed barlines." + + , + + + /* properties */ + "gap " + "kern " + "thin-kern " + "hair-thickness " + "thick-thickness " + "glyph " + "glyph-name " + "bar-size " + ); + -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");