X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-line.cc;h=3489aff6bed436bb05e199ff5c035b0f5a62d1a1;hb=a286e94740cef413b1460cda2ce9848ad089ca90;hp=e0f0ca038db72da111d0ea00603d753a58af1cf0;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git diff --git a/lily/bar-line.cc b/lily/bar-line.cc index e0f0ca038d..3489aff6be 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -3,40 +3,35 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include +#include + +#include "bar-line.hh" #include "lookup.hh" #include "paper-column.hh" -#include "main.hh" -#include "grob.hh" -#include "bar-line.hh" -#include "string.hh" -#include "molecule.hh" -#include "paper-def.hh" +#include "output-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) +Bar_line::print (SCM 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_c_procedure_p (barsiz_proc)) { String str =ly_scm2string (s); - SCM siz = gh_call1 (barsiz_proc, me->self_scm ()); - Real sz = gh_scm2double (siz); - if (sz < 0) + 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 (); @@ -45,34 +40,39 @@ Bar_line::brew_molecule (SCM smob) } -Molecule +Stencil Bar_line::compound_barline (Grob*me, String str, Real h) { - Real kern = gh_scm2double (me->get_grob_property ("kern")); - Real thinkern = gh_scm2double (me->get_grob_property ("thin-kern")); - Real hair = gh_scm2double (me->get_grob_property ("hair-thickness")); - Real fatline = gh_scm2double (me->get_grob_property ("thick-thickness")); + 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_var ("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 colon; - 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; - dot.translate_axis(dist/2,Y_AXIS); - colon.add_molecule(dot); - dot.translate_axis(-dist,Y_AXIS); - colon.add_molecule(dot); - - Molecule m; + + 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"); + + 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 == "") { @@ -118,17 +118,37 @@ Bar_line::compound_barline (Grob*me, String str, Real h) } else if (str == "||") { + /* + 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); } - + else if (str == ":") + { + int c = (Staff_symbol_referencer::line_count (me)); + + for (int i = 0 ; i < c - 1; i++) + { + Real y = (- (c-1.0) / 2 + 0.5 + i * staff_space); + Stencil d (dot); + + d. translate_axis (y,Y_AXIS); + m.add_stencil (d); + } + } return m; } -Molecule -Bar_line::simple_barline (Grob*,Real w, Real h) +Stencil +Bar_line::simple_barline (Grob *me, + Real w, + Real h) { - return Lookup::filledbox (Box (Interval (0,w), Interval (-h/2, h/2))); + 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); } MAKE_SCHEME_CALLBACK (Bar_line,before_line_breaking ,1); @@ -139,24 +159,24 @@ Bar_line::before_line_breaking (SCM smob) Grob*me=unsmob_grob (smob); Item * item = dynamic_cast (me); - SCM g = me->get_grob_property ("glyph"); + 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_c_equal_p (g, orig)) + me->set_property ("glyph", g); return SCM_UNSPECIFIED; } @@ -170,9 +190,9 @@ Bar_line::get_staff_bar_size (SCM 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)) { /* @@ -180,7 +200,9 @@ 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);