X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=67d464297dbd0b189a1e1a5da265e8681c54f1ce;hb=3827988ac5a8d758508b68b4de399bf351504d03;hp=54b5ef953c8348ab85b31ae8dd3b206982a7f15c;hpb=422004486569407b8809da7f3c7053c1e4767bff;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 54b5ef953c..67d464297d 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,155 +3,219 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2007 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 "output-def.hh" +#include "stencil.hh" #include "warn.hh" #include "axis-group-interface.hh" -#include "group-interface.hh" -#include "score-element.hh" -#include "bar.hh" +#include "bar-line.hh" +#include "grob.hh" +#include "pointer-group-interface.hh" void -Span_bar::add_bar (Score_element*me, Score_element*b) +Span_bar::add_bar (Grob *me, Grob *b) { - Pointer_group_interface gi (me); - gi.add_element (b); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), b); +} + +MAKE_SCHEME_CALLBACK (Span_bar, print, 1); + +/* Limitations/Bugs: + +(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. + +(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) +{ + Grob *me = unsmob_grob (smobbed_me); + extract_grob_set (me, "elements", elements); + Grob *refp = common_refpoint_of_array (elements, me, Y_AXIS); + + SCM glyph = me->get_property ("glyph-name"); + + /* 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; + vector make_span_bar; + Grob *model_bar = 0; + for (vsize i = elements.size (); i--;) + { + Grob *bar = elements[i]; + Interval ext = Bar_line::bar_y_extent (bar, refp); + if (ext.is_empty ()) + continue; + + extents.push_back (ext); + make_span_bar.push_back (to_boolean (bar->get_property ("allow-span-bar"))); + model_bar = bar; + } - me->add_dependency (b); + if (!model_bar) + model_bar = me; + + vector_sort (extents, Interval::left_less); + + Stencil span_bar; + for (vsize i = 1; i < extents.size (); i++) + { + Interval prev_extent = extents[i - 1]; + Interval ext = extents[i]; + if (!prev_extent.is_empty ()) + { + Interval l (prev_extent [UP], + ext[DOWN]); + + if (l.is_empty () || !make_span_bar[i]) + { + /* 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 (); } -Interval -Span_bar::width_callback (Score_element *se, Axis ) +MAKE_SCHEME_CALLBACK (Span_bar, width, 1); +SCM +Span_bar::width (SCM smob) { - String gl = ly_scm2string (se->get_elt_property ("glyph")); + 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); /* urg. - */ - Molecule m = Bar::compound_barline (se, gl, 40 PT); - - return m.extent (X_AXIS); + */ + Stencil m = Bar_line::compound_barline (me, gl, 40 PT, false); + + return ly_interval2scm (m.extent (X_AXIS)); } -MAKE_SCHEME_CALLBACK(Span_bar,before_line_breaking); +MAKE_SCHEME_CALLBACK (Span_bar, before_line_breaking, 1); SCM Span_bar::before_line_breaking (SCM smob) { - evaluate_empty (unsmob_element (smob)); - evaluate_glyph (unsmob_element (smob)); + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "elements", elements); + if (elements.empty ()) + me->suicide (); - /* - 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; } -Real -Span_bar::center_on_spanned_callback (Score_element * me, Axis a) +MAKE_SCHEME_CALLBACK (Span_bar, center_on_spanned_callback, 1); + +SCM +Span_bar::center_on_spanned_callback (SCM smob) { - assert (a == Y_AXIS); + Grob *me = unsmob_grob (smob); 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. */ - - return i.center (); -} - -void -Span_bar::evaluate_empty (Score_element*me) -{ - /* - 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_elt_property ("elements"))) + /* 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 scm_from_double (0.0); } + + return scm_from_double (i.center ()); } -void -Span_bar::evaluate_glyph (Score_element*me) + + +MAKE_SCHEME_CALLBACK(Span_bar, calc_glyph_name, 1); +SCM +Span_bar::calc_glyph_name (SCM smob) { - SCM elts = me->get_elt_property ("elements"); - Score_element * b = unsmob_element (gh_car (elts)); - SCM glsym =ly_symbol2scm ("glyph"); - SCM gl =b ->get_elt_property (glsym); - if (!gh_string_p (gl)) + 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 ; + return SCM_UNSPECIFIED; } - String type = ly_scm2string (gl); - - if (type == "|:") - { - type = ".|"; - } - else if (type== ":|") - { - type = "|."; - } - else if (type== ":|:") - { - type = ".|."; - } + string type = ly_scm2string (gl); + if (type == "|:") + type = ".|"; + else if (type == ":|") + type = "|."; + else if (type == ":|:") + type = ".|."; - gl = ly_str02scm (type.ch_C()); - if (scm_equal_p (me->get_elt_property (glsym), gl) != SCM_BOOL_T) - me->set_elt_property (glsym, gl); + return ly_string2scm (type); } Interval -Span_bar::get_spanned_interval (Score_element*me) +Span_bar::get_spanned_interval (Grob *me) { - return Axis_group_interface::group_extent_callback (me, Y_AXIS); + return ly_scm2interval (Axis_group_interface::generic_group_extent (me, Y_AXIS)); } - -MAKE_SCHEME_CALLBACK(Span_bar,get_bar_size); +MAKE_SCHEME_CALLBACK (Span_bar, calc_bar_size, 1); SCM -Span_bar::get_bar_size (SCM smob) +Span_bar::calc_bar_size (SCM smob) { - Score_element* me = unsmob_element (smob); + Grob *me = unsmob_grob (smob); Interval iv (get_spanned_interval (me)); - if (iv.empty_b ()) + if (iv.is_empty ()) { - /* - This happens if the bars are hara-kiried from under us. - */ + /* This happens if the bars are hara-kiried from under us. */ me->suicide (); - return gh_double2scm (-1); + return scm_from_double (-1); } - return gh_double2scm (iv.length ()); -} -void -Span_bar::set_interface (Score_element *me) -{ - Bar::set_interface (me); - - Pointer_group_interface(me).set_interface (); - me->set_extent_callback (width_callback, X_AXIS); - me->add_offset_callback (center_on_spanned_callback, Y_AXIS); - me->set_interface (ly_symbol2scm ("span-bar-interface")); - me->set_extent_callback (0, Y_AXIS); + return scm_from_double (iv.length ()); } -bool -Span_bar::has_interface (Score_element*m) -{ - return m && m->has_interface (ly_symbol2scm ("span-bar-interface")); -} +ADD_INTERFACE (Span_bar, + "A bar line that spanned between other barlines. This interface is " + " used for bar lines that connect different staves.", + + /* properties */ + "glyph-name " + "elements"); +