X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=0d0dc9c6a4c2647ca8f54b8ad7f5ace3f06750bb;hb=89bf299597169eeaa5ed7a215b6e808fa849c8cd;hp=fe85a4e6b65761619778a9606405c3fe8da735de;hpb=2873636a53f0011f837aaf6e2072de602730d957;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index fe85a4e6b6..0d0dc9c6a4 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,128 +3,165 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ -#include "dimension-cache.hh" + #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.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_element (me,"elements", b); + + me->add_dependency (b); } -void -Span_bar::do_substitute_element_pointer (Score_element*o, Score_element*n) +MAKE_SCHEME_CALLBACK(Span_bar,width_callback,2); +SCM +Span_bar::width_callback (SCM element_smob, SCM scm_axis) { - spanning_l_arr_.unordered_substitute (o, n); + 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::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, paper_l ()); - - return m.extent (X_AXIS); + evaluate_empty (unsmob_grob (smob)); + evaluate_glyph (unsmob_grob (smob)); + + /* + no need to call Bar::before_line_breaking (), because the info + in ELEMENTS already has been procced by Bar::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 (); + Grob *me = unsmob_grob (element_smob); + Axis a = (Axis) gh_scm2int (axis); + assert (a == Y_AXIS); + Interval i (get_spanned_interval (me)); + + /* + Bar::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.empty_b ()) + { + me->suicide(); + return gh_double2scm (0.0); + } - set_empty (false, Y_AXIS); // 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 (); - Interval i(get_spanned_interval ()); - - translate_axis (i.center (), Y_AXIS); + /* + 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) - { - set_elt_property ("transparent", SCM_BOOL_T); - set_empty (true, X_AXIS, Y_AXIS); - - } - if (type_str_.empty_b ()) +Span_bar::evaluate_glyph (Grob*me) +{ + SCM elts = me->get_grob_property ("elements"); + Grob * b = unsmob_grob (gh_car (elts)); + SCM glsym =ly_symbol2scm ("glyph"); + SCM gl =b ->get_grob_property (glsym); + if (!gh_string_p (gl)) { - set_elt_property ("transparent", 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++) - { - Graphical_element*common = common_refpoint (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]->extent(Y_AXIS)); - } - return y_int; + gl = ly_str02scm (type.ch_C()); + if (scm_equal_p (me->get_grob_property (glsym), gl) != SCM_BOOL_T) + me->set_grob_property (glsym, 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()) - { - output->add_molecule (lookup_l ()->bar (type_str_, iv.length (), paper_l ())); - } - else + Grob* me = unsmob_grob (smob); + Interval iv (get_spanned_interval (me)); + if (iv.empty_b ()) { - programming_error("Huh? My children deflated (FIXME)"); + /* + This happens if the bars are hara-kiried from under us. + */ + me->suicide (); + return gh_double2scm (-1); } - return output; + return gh_double2scm (iv.length ()); } - - -Span_bar::Span_bar () +void +Span_bar::set_interface (Grob *me) { - type_str_ = ""; + Bar::set_interface (me); + + me->set_interface (ly_symbol2scm ("span-bar-interface")); + me->set_extent_callback (SCM_EOL, Y_AXIS); } +bool +Span_bar::has_interface (Grob*m) +{ + return m && m->has_interface (ly_symbol2scm ("span-bar-interface")); +}