X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=4566d73f77080e486530436499324cc48f67b630;hb=9ac6b17dfcca6826c8ab3ea5d65b789086ae15e0;hp=d116caf288581316b54ec319badc9c0e04980873;hpb=74ee52246b9a7571a2d697df7aeaf3aa3bd09f45;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index d116caf288..4566d73f77 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,175 +3,217 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2006 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 "output-def.hh" +#include "stencil.hh" #include "warn.hh" -#include "group-interface.hh" - +#include "axis-group-interface.hh" +#include "bar-line.hh" +#include "grob.hh" +#include "pointer-group-interface.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); - - add_dependency (b); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), b); } +MAKE_SCHEME_CALLBACK (Span_bar, print, 1); -Interval -Span_bar::width_callback (Dimension_cache const * c) -{ - Span_bar* s= dynamic_cast (c->element_l ()); - String gl = ly_scm2string (s->get_elt_property ("glyph")); - - Molecule m = s->lookup_l ()->bar (gl, 40 PT, s->paper_l ()); - - return m.extent (X_AXIS); -} +/* Limitations/Bugs: -void -Span_bar::do_pre_processing () -{ - Bar::do_pre_processing (); - - evaluate_empty (); - - // set_empty (false, Y_AXIS); // a hack to make mark scripts work. -} +(1) Elements from 'me->get_object ("elements")' must be +ordered according to their y coordinates relative to their common +axis group parent. Otherwise, the computation goes mad. -void -Span_bar::do_post_processing () +(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) { - Bar::do_post_processing (); - Interval i(get_spanned_interval ()); + Grob *me = unsmob_grob (smobbed_me); + extract_grob_set (me, "elements", elements); + Grob *refp = common_refpoint_of_array (elements, me, Y_AXIS); - translate_axis (i.center (), Y_AXIS); + SCM glyph = me->get_property ("glyph-name"); - /* - {[ stacking shift - ugh - */ - SCM me = get_elt_property ("glyph"); - if (gh_string_p (me) && ly_scm2string (me) == "bracket") + /* glyph may not be a string, when ME is killed by Hara Kiri in + between. */ + if (!scm_is_string (glyph)) + return SCM_EOL; + + string glyph_string = ly_scm2string (glyph); + + /* compose span_bar_mol */ + vector extents; + Grob *model_bar = 0; + for (vsize i = elements.size (); i--;) + { + Grob *bar = elements[i]; + Interval ext = bar->extent (refp, Y_AXIS); + if (ext.is_empty ()) + continue; + + extents.push_back (ext); + model_bar = bar; + } + + if (!model_bar) + model_bar = me; + + vector_sort (extents, Interval::left_less); + + Stencil span_bar; + for (vsize i = 1; i < extents.size (); i++) { - SCM e = get_elt_property ("other"); - if (e != SCM_UNDEFINED) + Interval prev_extent = extents[i - 1]; + Interval ext = extents[i]; + if (!prev_extent.is_empty ()) { - assert (SMOB_IS_TYPE_B (Score_element, e)); - Score_element* se = SMOB_TO_TYPE (Score_element, e); - SCM her = se->get_elt_property ("glyph"); -#if 0 - // urg x-extent broken? - if (gh_string_p (her) && ly_scm2string (her) == "brace") - se->translate_axis (-extent (X_AXIS).length (), X_AXIS); -#else - if (gh_string_p (her) && ly_scm2string (her) == "brace" - && !to_boolean (get_elt_property ("transparent"))) - se->translate_axis (-paper_l ()->get_var ("interline"), X_AXIS); -#endif + 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 (model_bar, + glyph_string, + l.length (), + false); + interbar.translate_axis (l.center (), Y_AXIS); + span_bar.add_stencil (interbar); + } } + prev_extent = ext; } + + span_bar.translate_axis (- me->relative_coordinate (refp, Y_AXIS), + Y_AXIS); + + return span_bar.smobbed_copy (); } -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); - } +MAKE_SCHEME_CALLBACK (Span_bar, width, 1); +SCM +Span_bar::width (SCM smob) +{ + Grob *me = unsmob_grob (smob); + SCM gn = me->get_property ("glyph-name"); + if (!me->is_live ()) + return ly_interval2scm (Interval ()); + + string gl = ly_scm2string (gn); - SCM gl = get_elt_property ("glyph"); - if (!gh_string_p (gl)) - { - set_elt_property ("transparent", SCM_BOOL_T); - set_empty (X_AXIS); - set_empty (Y_AXIS); - } - else { - String type_str = ly_scm2string (gl); - if (type_str == "|:") - { - type_str= ".|"; - } - else if (type_str== ":|") - { - type_str= "|."; - } - else if (type_str== ":|:") - { - type_str= ".|."; - } - } + /* + urg. + */ + Stencil m = Bar_line::compound_barline (me, gl, 40 PT, false); + + return ly_interval2scm (m.extent (X_AXIS)); } -Interval -Span_bar::get_spanned_interval () const +MAKE_SCHEME_CALLBACK (Span_bar, before_line_breaking, 1); +SCM +Span_bar::before_line_breaking (SCM smob) { - Interval y_int; + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "elements", elements); + if (elements.empty ()) + me->suicide (); - for (SCM s = get_elt_property ("elements"); gh_pair_p (s); s = gh_cdr (s)) + return SCM_UNSPECIFIED; +} + +MAKE_SCHEME_CALLBACK (Span_bar, center_on_spanned_callback, 1); + +SCM +Span_bar::center_on_spanned_callback (SCM smob) +{ + Grob *me = unsmob_grob (smob); + 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 ()) { - Score_element *bar = unsmob_element ( gh_car (s)); + me->suicide (); + return scm_from_double (0.0); + } - if (!bar) - continue; - - Score_element*common = common_refpoint (bar, Y_AXIS); + return scm_from_double (i.center ()); +} - 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, calc_glyph_name, 1); +SCM +Span_bar::calc_glyph_name (SCM smob) +{ + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "elements", elements); + SCM gl = SCM_EOL; + for (vsize i = elements.size (); + i-- && !scm_is_string (gl);) + gl = elements[i]->get_property ("glyph-name"); + + if (!scm_is_string (gl)) + { + me->suicide (); + return SCM_UNSPECIFIED; } - return y_int; + + string type = ly_scm2string (gl); + if (type == "|:") + type = ".|"; + else if (type == ":|") + type = "|."; + else if (type == ":|:") + type = ".|."; + + return scm_makfrom0str (type.c_str ()); } Interval -Span_bar::height_callback (Dimension_cache const *c) +Span_bar::get_spanned_interval (Grob *me) { - Span_bar * s= dynamic_cast (c->element_l ()); - return s->get_spanned_interval (); + return ly_scm2interval (Axis_group_interface::generic_group_extent (me, Y_AXIS)); } -Molecule* -Span_bar::do_brew_molecule_p () const +MAKE_SCHEME_CALLBACK (Span_bar, calc_bar_size, 1); +SCM +Span_bar::calc_bar_size (SCM smob) { - Interval iv (get_spanned_interval ()); - Molecule*output = new Molecule; - SCM s = get_elt_property ("glyph"); - if (gh_string_p (s) && !iv.empty_b()) - { - output->add_molecule (lookup_l ()->bar (ly_scm2string (s), - iv.length (), - paper_l ())); - } - else + Grob *me = unsmob_grob (smob); + Interval iv (get_spanned_interval (me)); + if (iv.is_empty ()) { - programming_error("Huh? My children deflated (FIXME)"); + /* This happens if the bars are hara-kiried from under us. */ + me->suicide (); + return scm_from_double (-1); } - return output; + return scm_from_double (iv.length ()); } +ADD_INTERFACE (Span_bar, + "A bar line that spanned between other barlines. This interface is " + " used for bar lines that connect different staves.", - -Span_bar::Span_bar () -{ - dim_cache_[X_AXIS]->set_callback (width_callback); - dim_cache_[Y_AXIS]->set_callback (height_callback); -} + /* properties */ + "glyph-name " + "elements");