X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=c90a2837263658ef493f8ed00cc2ad7029a57b6a;hb=90f11558943cc2381d2eae4d64029a0f8572f144;hp=331201d4d0871304e20e588d4b3a531fe311955e;hpb=068b30ff4bfe81e6dd41ac3736bbc52980e79a1f;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 331201d4d0..c90a283726 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,122 +3,245 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include "span-bar.hh" -#include "lookup.hh" +#include "font-interface.hh" #include "dimensions.hh" -#include "atom.hh" #include "paper-def.hh" -#include "molecule.hh" -#include "align-element.hh" +#include "stencil.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 (Bar*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_dependency (Score_element*o, Score_element*n) +MAKE_SCHEME_CALLBACK (Span_bar,print,1); + +/* Limitations/Bugs: + + (1) Elements from 'me->get_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::print (SCM smobbed_me) { - spanning_l_arr_.unordered_substitute (o, n); + Grob *me = unsmob_grob (smobbed_me); + SCM first_elt = me->get_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_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 */ + Stencil 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 + { + Stencil interbar = Bar_line::compound_barline (staff_bar, + glyph_string, + l.length ()); + interbar.translate_axis (l.center (), Y_AXIS); + span_bar_mol.add_stencil (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); + Grob *se = unsmob_grob (element_smob); + Axis a = (Axis) gh_scm2int (scm_axis); + assert (a == X_AXIS); + String gl = ly_scm2string (se->get_property ("glyph")); + + /* + urg. + */ + Stencil 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) { - return lookup_l ()->bar (type_str_, 40 PT).dim_.x (); // ugh + 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 (); + Grob *me = unsmob_grob (element_smob); + Axis a = (Axis) gh_scm2int (axis); + assert (a == Y_AXIS); + Interval i (get_spanned_interval (me)); + + /* Bar_line::print 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); + } - evaluate_empty (); + 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_property ("elements"))) + { + me->suicide (); + } } void -Span_bar::evaluate_empty () -{ - if (spanning_l_arr_.size () < 1) +Span_bar::evaluate_glyph (Grob*me) +{ + SCM gl = me->get_property ("glyph"); + + if (gh_string_p (gl)) + return ; + + for (SCM s = me->get_property ("elements"); + !gh_string_p (gl) && gh_pair_p (s); s = gh_cdr (s)) { - transparent_b_ = true; - set_empty (true); + gl = unsmob_grob (gh_car (s)) + ->get_property ("glyph"); } - if (type_str_.empty_b ()) + + if (!gh_string_p (gl)) { - transparent_b_=true; - 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 = ".|."; } + + gl = scm_makfrom0str (type.to_str0 ()); + if (scm_equal_p (me->get_property ("glyph"), gl) + != SCM_BOOL_T) + me->set_property ("glyph", gl); } -Atom -Span_bar::get_bar_sym (Real dy) const +Interval +Span_bar::get_spanned_interval (Grob*me) { - if (dy < paper ()->staffheight_f () / 2) - return Atom (); - - return lookup_l ()->bar (type_str_, dy); + return ly_scm2interval (Axis_group_interface::group_extent_callback + (me->self_scm (), gh_int2scm (Y_AXIS))); } -Molecule* -Span_bar::brew_molecule_p () const + +MAKE_SCHEME_CALLBACK (Span_bar,get_bar_size,1); +SCM +Span_bar::get_bar_size (SCM smob) { - Interval y_int; - for (int i=0; i < spanning_l_arr_.size (); i++) + Grob* me = unsmob_grob (smob); + Interval iv (get_spanned_interval (me)); + if (iv.is_empty ()) { - Graphical_axis_group *common = - common_group (spanning_l_arr_[i], Y_AXIS); - - Real y = spanning_l_arr_[i]->relative_coordinate (common, Y_AXIS) - -relative_coordinate (common,Y_AXIS); - - y_int.unite (y + spanning_l_arr_[i]->height ()); + /* This happens if the bars are hara-kiried from under us. */ + me->suicide (); + return gh_double2scm (-1); } - - Atom s = get_bar_sym (y_int.length ()); - Molecule*output = new Molecule (Atom (s)); - output->translate_axis (y_int.center (), Y_AXIS); - return output; + return gh_double2scm (iv.length ()); } -IMPLEMENT_IS_TYPE_B1 (Span_bar,Bar); -Span_bar::Span_bar () -{ - type_str_ = ""; -} -Span_bar* -Span_bar::access_Span_bar () -{ - return this; -} +ADD_INTERFACE (Span_bar,"span-bar-interface", + "A bar line that spanned between other barlines. This interface is " + " used for bar lines that connect different staves.", + "elements"); + +