X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar.cc;h=b74122d0725705f5c400b85d610512884c2fd4cb;hb=669494d7e9ab0156a1ebc8804a24f136f551d803;hp=7dc97c7c59787885016533994bb7d5f4c079f8bd;hpb=13e79c0250d34b6bdfbafbc551ef64e8b59b2991;p=lilypond.git diff --git a/lily/bar.cc b/lily/bar.cc index 7dc97c7c59..b74122d072 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -3,70 +3,202 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ +#include +#include "lookup.hh" +#include "paper-column.hh" +#include "main.hh" +#include "grob.hh" #include "bar.hh" #include "string.hh" #include "molecule.hh" #include "paper-def.hh" -#include "lookup.hh" +#include "font-interface.hh" #include "debug.hh" +#include "all-font-metrics.hh" +#include "item.hh" +#include "staff-symbol-referencer.hh" -Bar::Bar() +MAKE_SCHEME_CALLBACK(Bar,brew_molecule,1); + +SCM +Bar::brew_molecule (SCM smob) { - breakable_b_ = true; - type_str_ = "|"; - spanned_i_ = 0; + Grob * me = unsmob_grob (smob); + + SCM s = me->get_grob_property ("glyph"); + SCM barsiz_proc = me->get_grob_property ("barsize-procedure"); + if (gh_string_p (s) && gh_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) + return SCM_EOL; + + return compound_barline (me, str, sz).smobbed_copy (); + } + return SCM_EOL; } +Molecule +Bar::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")); -IMPLEMENT_IS_TYPE_B1(Bar,Item); + Real staffline = me->paper_l ()->get_var ("stafflinethickness"); -void -Bar::do_print()const -{ - DOUT << type_str_; + kern *= staffline; + thinkern *= staffline; + hair *= staffline; + fatline *= staffline; + + Molecule thin = simple_barline (me, hair, h); + Molecule thick = simple_barline (me, fatline, h); + Molecule colon = Font_interface::get_default_font (me)->find_by_name ("dots-repeatcolon"); + + Molecule m; + + if (str == "") + { + return Lookup::blank (Box (Interval(0, 0), Interval (-h/2, h/2))); + } + else if (str == "|") + { + return thin; + } + else if (str == "|.") + { + m.add_at_edge (X_AXIS, LEFT, thick, 0); + m.add_at_edge (X_AXIS, LEFT, thin, kern); + } + else if (str == ".|") + { + 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); + 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); + 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); + 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); + m.add_at_edge (X_AXIS, RIGHT, thick, kern); + } + else if (str == "||") + { + m.add_at_edge (X_AXIS, RIGHT, thin, 0); + m.add_at_edge (X_AXIS, RIGHT, thin, thinkern); + } + + return m; } -Molecule* -Bar::brew_molecule_p()const -{ - Paper_def *p = paper(); - Symbol s = p->lookup_l()->bar (type_str_, - p->get_var ("bar_size")); - Molecule*output = new Molecule (Atom (s)); - return output; + +Molecule +Bar::simple_barline (Grob*,Real w, Real h) +{ + return Lookup::filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); } -/** - Prescriptions for splitting bars. - TODO: parametrise this (input-settable) - */ -static char const *bar_breaks[][3] ={ - {":|", ":|:", "|:"}, - {"|", "|", ""}, - {"", "|:", "|:"}, - {"||.", "||.", ""}, - {":|", ":|", ""}, - {0,0,0} -}; +MAKE_SCHEME_CALLBACK(Bar,before_line_breaking ,1); -void -Bar::do_pre_processing() +SCM +Bar::before_line_breaking (SCM smob) { - for (int i=0; bar_breaks[i][0]; i++) + Grob*me=unsmob_grob (smob); + Item * item = dynamic_cast (me); + + SCM g = me->get_grob_property ("glyph"); + SCM orig = g; + Direction bsd = item->break_status_dir (); + if (gh_string_p (g) && bsd) + { + SCM proc = me->get_grob_property ("break-glyph-function"); + g = gh_call2 (proc, g, gh_int2scm (bsd)); + } + + + if (!gh_string_p (g)) { - if (bar_breaks[i][1] == type_str_) - type_str_ = bar_breaks[i][break_status_i()+1]; + me->set_grob_property ("molecule-callback", SCM_BOOL_T); + me->set_extent_callback (SCM_EOL, X_AXIS); + // leave y_extent for spanbar? } + + if (! gh_equal_p (g, orig)) + me->set_grob_property ("glyph", g); + /* - span_score_bar needs dims, so don't do + set a (pseudo) stem-direction, so we extra space is inserted + between stemup and barline. + + TODO: should check if the barline is the leftmost object of the + break alignment. + + */ + if (gh_string_p (g)) + { + Grob * col = item->column_l (); + SCM dirlist = col->get_grob_property ("dir-list"); + SCM scmdir = gh_int2scm (-1); + if (scm_memq (scmdir, dirlist) == SCM_BOOL_F) + { + dirlist = gh_cons (scmdir, dirlist); + col->set_grob_property ("dir-list", dirlist); + } + } - transparent_b_ = empty_b_ = (type_str_ == ""); - - */ + return SCM_UNSPECIFIED; } +void +Bar::set_interface (Grob*me) +{ + me->set_interface (ly_symbol2scm ("bar-line-interface")); +} + +bool +Bar::has_interface (Grob*m) +{ + return m && m->has_interface (ly_symbol2scm ("bar-line-interface")); +} + + +MAKE_SCHEME_CALLBACK(Bar,get_staff_bar_size,1); +SCM +Bar::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); + else + { + return gh_double2scm ((Staff_symbol_referencer::line_count (me) -1) * ss); + } +}