X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=f8942db710777bf48c81b8c943134f7f0d7c2ae8;hb=0d3c78505a6adb958f9280509bb7fa170de54611;hp=cd42feb77838fc12c7bb71bd01d23af7c9cfef2d;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index cd42feb778..f8942db710 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -1,80 +1,82 @@ /* - 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 "output-def.hh" #include "paper-column.hh" -#include "grob.hh" -#include "bar-line.hh" -#include "string.hh" -#include "molecule.hh" -#include "paper-def.hh" -#include "font-interface.hh" - -#include "all-font-metrics.hh" -#include "item.hh" #include "staff-symbol-referencer.hh" -MAKE_SCHEME_CALLBACK (Bar_line,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Bar_line, print, 1); -SCM -Bar_line::brew_molecule (SCM smob) +SCM +Bar_line::print (SCM smob) { - Grob * me = unsmob_grob (smob); + Grob *me = unsmob_grob (smob); - SCM s = me->get_grob_property ("glyph"); - SCM barsiz_proc = me->get_grob_property ("bar-size-procedure"); - if (gh_string_p (s) && gh_procedure_p (barsiz_proc)) + SCM s = me->get_property ("glyph"); + SCM barsiz_proc = me->get_property ("bar-size-procedure"); + if (scm_is_string (s) && ly_is_procedure (barsiz_proc)) { - String str =ly_scm2string (s); - SCM siz = gh_call1 (barsiz_proc, me->self_scm ()); + String str = ly_scm2string (s); + SCM siz = scm_call_1 (barsiz_proc, me->self_scm ()); Real sz = robust_scm2double (siz, 0); - if (sz < 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; } - -Molecule -Bar_line::compound_barline (Grob*me, String str, Real h) +Stencil +Bar_line::compound_barline (Grob *me, String str, Real h, + bool rounded) { - Real kern = robust_scm2double (me->get_grob_property ("kern"), 1); - Real thinkern = robust_scm2double (me->get_grob_property ("thin-kern"), 1); - Real hair = robust_scm2double (me->get_grob_property ("hair-thickness"), 1); - Real fatline = robust_scm2double (me->get_grob_property ("thick-thickness"), 1); + 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_realvar (ly_symbol2scm ("linethickness")); + Real staffline = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); Real staff_space = Staff_symbol_referencer::staff_space (me); kern *= staffline; thinkern *= staffline; hair *= staffline; fatline *= staffline; - - Molecule thin = simple_barline (me, hair, h); - Molecule thick = simple_barline (me, fatline, h); - Molecule dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot"); - Real dist = ( Staff_symbol_referencer::line_count (me) & 1 ? 1 : - (staff_space<2 ? 2 : .5) ) * staff_space; - Molecule colon (dot); - colon.translate_axis(dist,Y_AXIS); - colon.add_molecule(dot); - colon.translate_axis(-dist/2,Y_AXIS); - - Molecule m; - + + 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 + = ((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); + + 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 == "|") { @@ -82,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 == "|:")) { @@ -94,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 == ".|.") { @@ -126,68 +128,73 @@ 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); - Molecule d (dot); + Real y = (- (c - 1.0) / 2 + 0.5 + i * staff_space); + Stencil d (dot); - d. translate_axis (y,Y_AXIS); - m.add_molecule (d); + d.translate_axis (y, Y_AXIS); + m.add_stencil (d); } } return m; } -Molecule -Bar_line::simple_barline (Grob *me,Real w, Real h) +Stencil +Bar_line::simple_barline (Grob *me, + Real w, + Real h, + bool rounded) { - Real blot = me->get_paper ()->get_realvar (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); - - SCM g = me->get_grob_property ("glyph"); + 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 (gh_string_p (g) && bsd) + if (scm_is_string (g) && bsd) { - SCM proc = me->get_grob_property ("break-glyph-function"); - g = gh_call2 (proc, g, scm_int2num (bsd)); + SCM proc = me->get_property ("break-glyph-function"); + g = scm_call_2 (proc, g, scm_int2num (bsd)); } - - if (!gh_string_p (g)) + + if (!scm_is_string (g)) { - me->set_grob_property ("molecule-callback", SCM_EOL); + me->set_property ("print-function", SCM_EOL); me->set_extent (SCM_EOL, X_AXIS); // leave y_extent for spanbar? } - if (! gh_equal_p (g, orig)) - me->set_grob_property ("glyph", g); + if (! ly_is_equal (g, orig)) + me->set_property ("glyph", g); 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_grob_property ("bar-size"); - if (gh_number_p (size)) - return gh_double2scm (gh_scm2double (size)*ss); + 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)) { /* @@ -195,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 gh_double2scm ((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");