X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=c90a2837263658ef493f8ed00cc2ad7029a57b6a;hb=90f11558943cc2381d2eae4d64029a0f8572f144;hp=ac458ad177d0343ae111a6121d53d29ada22a2cd;hpb=160441415ece6ea402f7af59087293d8d16c29f2;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index ac458ad177..c90a283726 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,156 +3,245 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 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 "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 (Score_element*b) +Span_bar::add_bar (Grob*me, Grob*b) { - Group_interface gi (this); - gi.add_element (b); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), b); - add_dependency (b); + me->add_dependency (b); } +MAKE_SCHEME_CALLBACK (Span_bar,print,1); -Interval -Span_bar::width_callback (Dimension_cache const * c) +/* 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) { - Span_bar* s= dynamic_cast (c->element_l ()); - String gl = ly_scm2string (s->get_elt_property ("glyph")); + 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; + } - /*urg. - */ - Molecule m = s->compound_barline (gl, 40 PT); + span_bar_mol.translate_axis (- me->relative_coordinate (refp, Y_AXIS), + Y_AXIS); - return m.extent (X_AXIS); + return span_bar_mol.smobbed_copy (); } -void -Span_bar::before_line_breaking () +MAKE_SCHEME_CALLBACK (Span_bar,width_callback,2); +SCM +Span_bar::width_callback (SCM element_smob, SCM scm_axis) { - Bar::before_line_breaking (); + 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); - evaluate_empty (); + return ly_interval2scm (m.extent (X_AXIS)); +} + +MAKE_SCHEME_CALLBACK (Span_bar,before_line_breaking,1); +SCM +Span_bar::before_line_breaking (SCM smob) +{ + 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; +} + +MAKE_SCHEME_CALLBACK (Span_bar,center_on_spanned_callback,2); + +SCM +Span_bar::center_on_spanned_callback (SCM element_smob, SCM 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::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); + } - // set_empty (false, Y_AXIS); // a hack to make mark scripts work. + return gh_double2scm (i.center ()); } void -Span_bar::after_line_breaking () +Span_bar::evaluate_empty (Grob*me) { - Bar::after_line_breaking (); - SCM s = get_elt_property ("collapse-height"); - if (gh_number_p (s) - && get_spanned_interval ().length () < gh_scm2double (s)) + /* 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"))) { - set_elt_property ("transparent", SCM_BOOL_T); - set_empty (X_AXIS); - set_empty (Y_AXIS); + me->suicide (); } - - Interval i (get_spanned_interval ()); - translate_axis (i.center (), Y_AXIS); } void -Span_bar::evaluate_empty () -{ - if (!gh_pair_p (get_elt_property ("elements"))) - { - set_elt_property ("transparent", SCM_BOOL_T); - set_empty (X_AXIS); - set_empty (Y_AXIS); - } +Span_bar::evaluate_glyph (Grob*me) +{ + SCM gl = me->get_property ("glyph"); + + if (gh_string_p (gl)) + return ; - SCM gl = get_elt_property ("glyph"); + for (SCM s = me->get_property ("elements"); + !gh_string_p (gl) && gh_pair_p (s); s = gh_cdr (s)) + { + gl = unsmob_grob (gh_car (s)) + ->get_property ("glyph"); + } + if (!gh_string_p (gl)) { - set_elt_property ("transparent", SCM_BOOL_T); - set_empty (X_AXIS); - set_empty (Y_AXIS); + me->suicide (); + return; } - else { - String type_str = ly_scm2string (gl); - 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 = ".|."; } - } - /* - uhh. should do something with type_str ?!! - */ + gl = scm_makfrom0str (type.to_str0 ()); + if (scm_equal_p (me->get_property ("glyph"), gl) + != SCM_BOOL_T) + me->set_property ("glyph", gl); } Interval -Span_bar::get_spanned_interval () const +Span_bar::get_spanned_interval (Grob*me) { - Interval y_int; - - for (SCM s = get_elt_property ("elements"); gh_pair_p (s); s = gh_cdr (s)) - { - Score_element *bar = unsmob_element ( gh_car (s)); - - if (!bar) - continue; - - Score_element*common = common_refpoint (bar, Y_AXIS); + return ly_scm2interval (Axis_group_interface::group_extent_callback + (me->self_scm (), gh_int2scm (Y_AXIS))); +} - Interval iv (bar->extent(Y_AXIS)); - if (!iv.empty_b ()) - { - Real y = bar->relative_coordinate (common, Y_AXIS) - - relative_coordinate (common, Y_AXIS); - y_int.unite (y + iv); - } +MAKE_SCHEME_CALLBACK (Span_bar,get_bar_size,1); +SCM +Span_bar::get_bar_size (SCM smob) +{ + Grob* me = unsmob_grob (smob); + Interval iv (get_spanned_interval (me)); + if (iv.is_empty ()) + { + /* This happens if the bars are hara-kiried from under us. */ + me->suicide (); + return gh_double2scm (-1); } - - return y_int; + return gh_double2scm (iv.length ()); } -Interval -Span_bar::height_callback (Dimension_cache const *c) -{ - Span_bar * s= dynamic_cast (c->element_l ()); - return s->get_spanned_interval (); -} -Real -Span_bar::get_bar_size () const -{ - Interval iv (get_spanned_interval ()); - if (iv.empty_b ()) - { - programming_error("Huh? My children deflated (FIXME)"); - iv = Interval (0,0); - } - return iv.length (); -} -Span_bar::Span_bar () -{ - group (this).set_interface (); - dim_cache_[X_AXIS]->set_extent_callback (width_callback); - dim_cache_[Y_AXIS]->set_extent_callback (height_callback); -} +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"); +