X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=548961d8efe7e398ce09787c7fc47d12cdd9072d;hb=28240aceaab110b424d8e37cb8024ad5f815d57f;hp=c5f29de20fadfba00b1bb743d57519b6e727085f;hpb=736088f09a0b77acc84f6e1a54cddb8bad3d94c1;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index c5f29de20f..548961d8ef 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,120 +3,242 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2005 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 "output-def.hh" +#include "stencil.hh" #include "warn.hh" #include "axis-group-interface.hh" -#include "group-interface.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 (Score_element const *se, Axis a) +/* 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. + +(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); + SCM elements = me->get_property ("elements"); + + Grob *refp = common_refpoint_of_list (elements, me, 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 (!scm_is_string (glyph)) + return SCM_EOL; + + String glyph_string = ly_scm2string (glyph); + + /* compose span_bar_mol */ + Array extents; + Grob *model_bar = 0; + for (SCM elts = elements; scm_is_pair (elts); elts = scm_cdr (elts)) + { + Grob *bar = unsmob_grob (scm_car (elts)); + Interval ext = bar->extent (refp, Y_AXIS); + if (ext.is_empty ()) + continue; + + extents.push (ext); + model_bar = bar; + } + + if (!model_bar) + model_bar = me; + + extents.sort (&Interval::left_comparison); + + Stencil span_bar; + for (int 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 ()) + { + /* 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 (); +} + +MAKE_SCHEME_CALLBACK (Span_bar, width_callback, 2); +SCM +Span_bar::width_callback (SCM element_smob, SCM scm_axis) { - Span_bar* s= dynamic_cast ((Score_element*)se); - String gl = ly_scm2string (s->get_elt_property ("glyph")); + Grob *se = unsmob_grob (element_smob); + (void) scm_axis; + + assert ( (Axis) scm_to_int (scm_axis) == X_AXIS); + String gl = ly_scm2string (se->get_property ("glyph")); /* urg. - */ - Molecule m = s->compound_barline (gl, 40 PT); - - return m.extent (X_AXIS); + */ + Stencil m = Bar_line::compound_barline (se, gl, 40 PT, false); + + return ly_interval2scm (m.extent (X_AXIS)); } -void -Span_bar::before_line_breaking () +MAKE_SCHEME_CALLBACK (Span_bar, before_line_breaking, 1); +SCM +Span_bar::before_line_breaking (SCM smob) { - Bar::before_line_breaking (); - - evaluate_empty (); + Grob *g = unsmob_grob (smob); + evaluate_empty (g); + evaluate_glyph (g); + + /* 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); + (void) axis; + assert (scm_to_int (axis) == 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 scm_make_real (0.0); + } + + return scm_make_real (i.center ()); } void -Span_bar::after_line_breaking () +Span_bar::evaluate_empty (Grob *me) { - Bar::after_line_breaking (); - 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 (!scm_is_pair (me->get_property ("elements"))) + { + me->suicide (); + } } void -Span_bar::evaluate_empty () -{ - if (!gh_pair_p (get_elt_property ("elements"))) +Span_bar::evaluate_glyph (Grob *me) +{ + SCM gl = me->get_property ("glyph"); + + if (scm_is_string (gl)) + return; + + for (SCM s = me->get_property ("elements"); + !scm_is_string (gl) && scm_is_pair (s); s = scm_cdr (s)) { - set_elt_property ("transparent", SCM_BOOL_T); - set_extent_callback (0, X_AXIS); - set_extent_callback (0, Y_AXIS); + gl = unsmob_grob (scm_car (s)) + ->get_property ("glyph"); } - - SCM gl = get_elt_property ("glyph"); - if (!gh_string_p (gl)) + + if (!scm_is_string (gl)) { - set_elt_property ("transparent", SCM_BOOL_T); - set_extent_callback (0, X_AXIS); - set_extent_callback (0, Y_AXIS); + me->suicide (); + return; } - else { - String type_str = ly_scm2string (gl); - if (type_str == "|:") - { - type_str= ".|"; - } - else if (type_str== ":|") - { - type_str= "|."; - } - else if (type_str== ":|:") - { - type_str= ".|."; - } - - set_elt_property ("glyph", ly_str02scm (type_str.ch_C())); - } + + String type = ly_scm2string (gl); + if (type == "|:") + { + type = ".|"; + } + else if (type == ":|") + { + type = "|."; + } + else if (type == ":|:") + { + type = ".|."; + } + + 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) { - return Axis_group_interface::group_extent_callback (this, Y_AXIS); + return ly_scm2interval (Axis_group_interface::group_extent_callback + (me->self_scm (), scm_int2num (Y_AXIS))); } - -Real -Span_bar::get_bar_size () const +MAKE_SCHEME_CALLBACK (Span_bar, get_bar_size, 1); +SCM +Span_bar::get_bar_size (SCM smob) { - Interval iv (get_spanned_interval ()); - if (iv.empty_b ()) + Grob *me = unsmob_grob (smob); + Interval iv (get_spanned_interval (me)); + if (iv.is_empty ()) { - programming_error("Huh? My children deflated (FIXME)"); - iv = Interval (0,0); + /* This happens if the bars are hara-kiried from under us. */ + me->suicide (); + return scm_make_real (-1); } - return iv.length (); + return scm_make_real (iv.length ()); } -Span_bar::Span_bar () -{ - group (this).set_interface (); - set_extent_callback (width_callback, X_AXIS); - - // dim_cache_[Y_AXIS]->set_extent_callback (Axis_group_interface::group_extent_callback); - - set_extent_callback (0, Y_AXIS); -} +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");