X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=1c3c640851001320d51b112106d5332c50476e99;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=487f2b11d427f61aa4fdddd1f7afbea96b57ea42;hpb=67a763d2c94cf4e24c01186d9f2df06b31778778;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 487f2b11d4..1c3c640851 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,136 +3,245 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include "span-bar.hh" -#include "lookup.hh" +#include "font-interface.hh" #include "dimensions.hh" #include "paper-def.hh" #include "molecule.hh" -#include "align-element.hh" #include "warn.hh" +#include "axis-group-interface.hh" +#include "group-interface.hh" +#include "grob.hh" +#include "bar-line.hh" void -Span_bar::add_bar (Score_element*b) +Span_bar::add_bar (Grob*me, Grob*b) { - spanning_l_arr_.push (b); - add_dependency (b); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), b); + + me->add_dependency (b); } -void -Span_bar::do_substitute_element_pointer (Score_element*o, Score_element*n) +MAKE_SCHEME_CALLBACK (Span_bar,brew_molecule,1); + +/* Limitations/Bugs: + + (1) Elements from 'me->get_grob_property ("elements")' must be + ordered according to their y coordinates relative to their common + axis group parent. Otherwise, the computation goes mad. + + (TODO: + apply a sort algorithm that ensures this precondition.) However, + until now, I have seen no case where lily has not fulfilled this + precondition. + + (2) This method depends on bar_engraver not being removed from + staff context. If bar_engraver is removed, the size of the staff + lines is evaluated as 0, which results in a solid span bar line + with faulty y coordinate. */ + +/* This routine was originally by Juergen Reuter, but it was a on the + bulky side. Rewritten by Han-Wen. */ +SCM +Span_bar::brew_molecule (SCM smobbed_me) { - spanning_l_arr_.unordered_substitute (o, n); + Grob *me = unsmob_grob (smobbed_me); + SCM first_elt = me->get_grob_property ("elements"); + + /* compute common refpoint of elements */ + Grob *refp = me; + for (SCM elts = first_elt; gh_pair_p (elts); elts = ly_cdr (elts)) + { + SCM smobbed_staff_bar = ly_car (elts); + Grob *staff_bar = unsmob_grob (smobbed_staff_bar); + refp = staff_bar->common_refpoint (refp, Y_AXIS); + } + + Span_bar::evaluate_glyph (me); + SCM glyph = me->get_grob_property ("glyph"); + + /* glyph may not be a string, when ME is killed by Hara Kiri in + between. */ + if (!gh_string_p (glyph)) + return SCM_EOL; + + String glyph_string = ly_scm2string (glyph); + + /* compose span_bar_mol */ + Molecule span_bar_mol; + + Interval prev_extent; + for (SCM elts = first_elt; gh_pair_p (elts); elts = ly_cdr (elts)) + { + SCM smobbed_staff_bar = ly_car (elts); + Grob *staff_bar = unsmob_grob (smobbed_staff_bar); + Interval ext = staff_bar->extent (refp, Y_AXIS); + if (ext.is_empty ()) + continue; + + if (!prev_extent.is_empty ()) + { + Interval l (prev_extent [UP], + ext[DOWN]); + + if (l.is_empty ()) + { + /* There is overlap between the bar lines. Do nothing. */ + } + else + { + Molecule interbar = Bar_line::compound_barline (staff_bar, + glyph_string, + l.length ()); + interbar.translate_axis (l.center (), Y_AXIS); + span_bar_mol.add_molecule (interbar); + } + } + prev_extent = ext; + } + + span_bar_mol.translate_axis (- me->relative_coordinate (refp, Y_AXIS), + Y_AXIS); + + return span_bar_mol.smobbed_copy (); } -void -Span_bar::set_align (Align_element *a) +MAKE_SCHEME_CALLBACK (Span_bar,width_callback,2); +SCM +Span_bar::width_callback (SCM element_smob, SCM scm_axis) { - add_dependency (a); - Score_element * e = dynamic_cast(a); - Item * i = dynamic_cast (e); - e = dynamic_cast (a); - i = dynamic_cast(e); + Grob *se = unsmob_grob (element_smob); + Axis a = (Axis) gh_scm2int (scm_axis); + assert (a == X_AXIS); + String gl = ly_scm2string (se->get_grob_property ("glyph")); + + /* + urg. + */ + Molecule m = Bar_line::compound_barline (se, gl, 40 PT); + + return ly_interval2scm (m.extent (X_AXIS)); } -Interval -Span_bar::do_width () const +MAKE_SCHEME_CALLBACK (Span_bar,before_line_breaking,1); +SCM +Span_bar::before_line_breaking (SCM smob) { - Molecule m = lookup_l ()->bar (type_str_, 40 PT); - - return m.extent (X_AXIS); + evaluate_empty (unsmob_grob (smob)); + evaluate_glyph (unsmob_grob (smob)); + + /* No need to call Bar_line::before_line_breaking (), because the info + in ELEMENTS already has been procced by + Bar_line::before_line_breaking (). */ + return SCM_UNSPECIFIED; } -void -Span_bar::do_pre_processing () +MAKE_SCHEME_CALLBACK (Span_bar,center_on_spanned_callback,2); + +SCM +Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis) { - Bar::do_pre_processing (); - - evaluate_empty (); - translate_axis (extra_x_off_, X_AXIS); + Grob *me = unsmob_grob (element_smob); + Axis a = (Axis) gh_scm2int (axis); + assert (a == Y_AXIS); + Interval i (get_spanned_interval (me)); + + /* Bar_line::brew_molecule delivers a barline of y-extent (-h/2,h/2), so + we have to translate ourselves to be in the center of the + interval that we span. */ + if (i.is_empty ()) + { + me->suicide (); + return gh_double2scm (0.0); + } - dim_cache_[Y_AXIS].set_empty (false); // a hack to make mark scripts work. + return gh_double2scm (i.center ()); } void -Span_bar::do_post_processing () +Span_bar::evaluate_empty (Grob*me) { - Bar::do_post_processing (); + /* TODO: filter all hara-kiried out of ELEMENS list, and then + optionally do suicide. Call this cleanage function from + center_on_spanned_callback () as well. */ + if (!gh_pair_p (me->get_grob_property ("elements"))) + { + me->suicide (); + } } void -Span_bar::evaluate_empty () -{ - if (spanning_l_arr_.size () < 1) +Span_bar::evaluate_glyph (Grob*me) +{ + SCM elts = me->get_grob_property ("elements"); + SCM glyph_symbol = ly_symbol2scm ("glyph"); + SCM gl = SCM_EOL; + + while (gh_pair_p (elts)) { - set_elt_property (transparent_scm_sym, SCM_BOOL_T); - set_empty (true); + gl = unsmob_grob (gh_car (elts)) + ->internal_get_grob_property (glyph_symbol); + if (gh_string_p (gl)) + break; + elts =gh_cdr (elts); } - if (type_str_.empty_b ()) + + if (!gh_string_p (gl)) { - set_elt_property (transparent_scm_sym, SCM_BOOL_T); - set_empty (true); + me->suicide (); + return; } - else if (type_str_ == "|:") + + String type = ly_scm2string (gl); + if (type == "|:") { - type_str_ = ".|"; + type = ".|"; } - else if (type_str_ == ":|") + else if (type== ":|") { - type_str_ = "|."; + type = "|."; } - else if (type_str_ == ":|:") + else if (type== ":|:") { - type_str_ = ".|."; + type = ".|."; } -} -Interval -Span_bar::get_spanned_interval () const -{ - Interval y_int; - for (int i=0; i < spanning_l_arr_.size (); i++) - { - Dimension_cache*common = - common_group (spanning_l_arr_[i], Y_AXIS); - - Real y = spanning_l_arr_[i]->dim_cache_[Y_AXIS].relative_coordinate (common) - -dim_cache_[Y_AXIS].relative_coordinate (common); - - y_int.unite (y + spanning_l_arr_[i]->extent(Y_AXIS)); - } - return y_int; + gl = scm_makfrom0str (type.to_str0 ()); + if (scm_equal_p (me->internal_get_grob_property (glyph_symbol), gl) + != SCM_BOOL_T) + me->internal_set_grob_property (glyph_symbol, gl); } Interval -Span_bar::do_height () const +Span_bar::get_spanned_interval (Grob*me) { - return get_spanned_interval (); + return ly_scm2interval (Axis_group_interface::group_extent_callback + (me->self_scm (), gh_int2scm (Y_AXIS))); } -Molecule* -Span_bar::do_brew_molecule_p () const + +MAKE_SCHEME_CALLBACK (Span_bar,get_bar_size,1); +SCM +Span_bar::get_bar_size (SCM smob) { - Interval iv (get_spanned_interval ()); - Molecule*output = new Molecule; - if (!iv.empty_b()) + Grob* me = unsmob_grob (smob); + Interval iv (get_spanned_interval (me)); + if (iv.is_empty ()) { - output->add_molecule (lookup_l ()->bar (type_str_, iv.length ())); - output->translate_axis (iv.center (), Y_AXIS); + /* This happens if the bars are hara-kiried from under us. */ + me->suicide (); + return gh_double2scm (-1); } - else - { - warning("Huh? My children deflated (FIXME)"); - } - return output; + return gh_double2scm (iv.length ()); } -Span_bar::Span_bar () -{ - type_str_ = ""; - extra_x_off_ = 0.0; -} +ADD_INTERFACE (Span_bar,"span-bar-interface", + "A bar line that spans other barlines (typically used to get cross-staff barlines.", + ""); + +