X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar.cc;h=4192fd0780b254741076798413283792eb10dab7;hb=acec5c037f53a163237c31486b84971aa33deaab;hp=60941be60a153ee17b1d745ca8f70d4e08503176;hpb=25c92bfff1189d93b80cdef0da0d570d14834c8d;p=lilypond.git diff --git a/lily/bar.cc b/lily/bar.cc index 60941be60a..4192fd0780 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -3,80 +3,202 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ +#include +#include "paper-column.hh" +#include "main.hh" +#include "dimensions.hh" +#include "score-element.hh" #include "bar.hh" #include "string.hh" #include "molecule.hh" #include "paper-def.hh" #include "lookup.hh" #include "debug.hh" +#include "all-font-metrics.hh" +#include "item.hh" +#include "staff-symbol-referencer.hh" +MAKE_SCHEME_CALLBACK(Bar,brew_molecule,1); -Bar::Bar () +SCM +Bar::brew_molecule (SCM smob) { - breakable_b_ = true; - type_str_ = "|"; - at_line_start_b_ = false; + Score_element * me = unsmob_element (smob); + + SCM s = me->get_elt_property ("glyph"); + SCM barsiz_proc = me->get_elt_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).create_scheme (); + } + return SCM_EOL; } -void -Bar::do_print () const + +Molecule +Bar::compound_barline (Score_element*me, String str, Real h) { -#ifndef NPRINT - // DOUT << type_str_; "{[" confuse indenter. -#endif -} + Real kern = gh_scm2double (me->get_elt_property ("kern")); + Real thinkern = gh_scm2double (me->get_elt_property ("thin-kern")); + Real hair = gh_scm2double (me->get_elt_property ("hair-thickness")); + Real fatline = gh_scm2double (me->get_elt_property ("thick-thickness")); -Molecule* -Bar::do_brew_molecule_p () const -{ - Paper_def *p = paper (); - Molecule *output = new Molecule (lookup_l ()->bar (type_str_, p->get_var ("barsize"))); + Real staffline = me->paper_l ()->get_var ("stafflinethickness"); + + kern *= staffline; + thinkern *= staffline; + hair *= staffline; + fatline *= staffline; - return output; + Molecule thin = simple_barline (me, hair, h); + Molecule thick = simple_barline (me, fatline, h); + Molecule colon = me->lookup_l ()->afm_find ("dots-repeatcolon"); + + Molecule m; + + if (str == "") + { + return me->lookup_l ()->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; } -/** - Prescriptions for splitting bars. - TODO: parametrise this (input-settable) - */ -static char const *bar_breaks[][3] ={ - {":|", ":|:", "|:"}, - {"|", "|", ""}, - {"", "|s", "|"}, - {"", "|:", "|:"}, - {"|.", "|.", ""}, - {":|", ":|", ""}, - {"||", "||", ""}, - {".|.", ".|.", ""}, - {"", "scorebar", "|"}, - {"", "{", "{"}, - {"", "[", "["}, - {0,0,0} -}; -void -Bar::do_pre_processing () +Molecule +Bar::simple_barline (Score_element*me,Real w, Real h) +{ + return me->lookup_l ()->filledbox (Box (Interval(0,w), Interval(-h/2, h/2))); +} + +MAKE_SCHEME_CALLBACK(Bar,before_line_breaking ,1); + +SCM +Bar::before_line_breaking (SCM smob) { - for (int i=0; bar_breaks[i][0]; i++) + Score_element*me=unsmob_element (smob); + Item * item = dynamic_cast (me); + + SCM g = me->get_elt_property ("glyph"); + SCM orig = g; + Direction bsd = item->break_status_dir (); + if (gh_string_p (g) && bsd) { - if (bar_breaks[i][1] == type_str_) - { - type_str_ = bar_breaks[i][break_status_dir ()+1]; - if (at_line_start_b_ && (break_status_dir_ == 1) && (type_str_ == "")) - { - type_str_ = "|"; - } - } + SCM proc = me->get_elt_property ("break-glyph-function"); + g = gh_call2 (proc, g, gh_int2scm (bsd)); } + + + if (!gh_string_p (g)) + { + me->set_elt_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_elt_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)) + { + Score_element * col = item->column_l (); + SCM dirlist = col->get_elt_property ("dir-list"); + SCM scmdir = gh_int2scm (-1); + if (scm_memq (scmdir, dirlist) == SCM_BOOL_F) + { + dirlist = gh_cons (scmdir, dirlist); + col->set_elt_property ("dir-list", dirlist); + } + } - transparent_b_ = empty_b_ = (!type_str_); - - */ + return SCM_UNSPECIFIED; } +void +Bar::set_interface (Score_element*me) +{ + me->set_interface (ly_symbol2scm ("bar-line-interface")); +} + +bool +Bar::has_interface (Score_element*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) +{ + Score_element*me = unsmob_element (smob); + Real ss = Staff_symbol_referencer::staff_space (me); + SCM size = me->get_elt_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); + } +}