X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=993fafe14a70581aad7f852c4d53f2b806056d04;hb=53b4dbc11c66fdc1de9b7e87e082eb05d7d2aa71;hp=388ab5666d0b0743cbb1424f650b2015c186e8a0;hpb=791feccaca7f6dd5c11773c766e94ab5f757993c;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 388ab5666d..993fafe14a 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "span-bar.hh" @@ -15,28 +15,23 @@ #include "warn.hh" #include "axis-group-interface.hh" #include "bar-line.hh" +#include "grob.hh" +#include "pointer-group-interface.hh" void Span_bar::add_bar (Grob *me, Grob *b) { Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), b); - - me->add_dependency (b); } MAKE_SCHEME_CALLBACK (Span_bar, print, 1); /* Limitations/Bugs: -(1) Elements from 'me->get_property ("elements")' must be +(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. -(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 @@ -48,39 +43,42 @@ SCM Span_bar::print (SCM smobbed_me) { 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; scm_is_pair (elts); elts = scm_cdr (elts)) - { - SCM smobbed_staff_bar = scm_car (elts); - Grob *staff_bar = unsmob_grob (smobbed_staff_bar); - refp = staff_bar->common_refpoint (refp, Y_AXIS); - } + extract_grob_set (me, "elements", elements); + Grob *refp = common_refpoint_of_array (elements, me, Y_AXIS); - Span_bar::evaluate_glyph (me); - SCM glyph = me->get_property ("glyph"); + 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); + string glyph_string = ly_scm2string (glyph); /* compose span_bar_mol */ - Stencil span_bar_mol; - - Interval prev_extent; - for (SCM elts = first_elt; scm_is_pair (elts); elts = scm_cdr (elts)) + vector extents; + Grob *model_bar = 0; + for (vsize i = elements.size (); i--;) { - SCM smobbed_staff_bar = scm_car (elts); - Grob *staff_bar = unsmob_grob (smobbed_staff_bar); - Interval ext = staff_bar->extent (refp, Y_AXIS); - if (ext.is_empty ()) + Grob *bar = elements[i]; + Interval ext = bar->extent (refp, Y_AXIS); + if (ext.is_empty () || to_boolean (bar->get_property ("transparent"))) 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++) + { + Interval prev_extent = extents[i - 1]; + Interval ext = extents[i]; if (!prev_extent.is_empty ()) { Interval l (prev_extent [UP], @@ -92,37 +90,38 @@ Span_bar::print (SCM smobbed_me) } else { - Stencil interbar = Bar_line::compound_barline (staff_bar, + Stencil interbar = Bar_line::compound_barline (model_bar, glyph_string, l.length (), false); interbar.translate_axis (l.center (), Y_AXIS); - span_bar_mol.add_stencil (interbar); + span_bar.add_stencil (interbar); } } prev_extent = ext; } - span_bar_mol.translate_axis (- me->relative_coordinate (refp, Y_AXIS), - Y_AXIS); + span_bar.translate_axis (- me->relative_coordinate (refp, Y_AXIS), + Y_AXIS); - return span_bar_mol.smobbed_copy (); + return span_bar.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Span_bar, width_callback, 2); +MAKE_SCHEME_CALLBACK (Span_bar, width, 1); SCM -Span_bar::width_callback (SCM element_smob, SCM scm_axis) +Span_bar::width (SCM smob) { - 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")); + 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. */ - Stencil m = Bar_line::compound_barline (se, gl, 40 PT, false); + Stencil m = Bar_line::compound_barline (me, gl, 40 PT, false); return ly_interval2scm (m.extent (X_AXIS)); } @@ -131,24 +130,20 @@ MAKE_SCHEME_CALLBACK (Span_bar, before_line_breaking, 1); SCM Span_bar::before_line_breaking (SCM smob) { - Grob *g = unsmob_grob (smob); - evaluate_empty (g); - evaluate_glyph (g); + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "elements", elements); + if (elements.empty ()) + me->suicide (); - /* 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); +MAKE_SCHEME_CALLBACK (Span_bar, center_on_spanned_callback, 1); SCM -Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis) +Span_bar::center_on_spanned_callback (SCM smob) { - Grob *me = unsmob_grob (element_smob); - (void) axis; - assert (scm_to_int (axis) == Y_AXIS); + 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 @@ -157,75 +152,51 @@ Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis) if (i.is_empty ()) { me->suicide (); - return scm_make_real (0.0); + return scm_from_double (0.0); } - return scm_make_real (i.center ()); -} - -void -Span_bar::evaluate_empty (Grob *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 (!scm_is_pair (me->get_property ("elements"))) - { - me->suicide (); - } + return scm_from_double (i.center ()); } -void -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)) - { - gl = unsmob_grob (scm_car (s)) - ->get_property ("glyph"); - } +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; + return SCM_UNSPECIFIED; } - String type = ly_scm2string (gl); + string type = ly_scm2string (gl); if (type == "|:") - { - type = ".|"; - } + type = ".|"; else if (type == ":|") - { - type = "|."; - } + type = "|."; else if (type == ":|:") - { - 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); + return ly_string2scm (type); } Interval Span_bar::get_spanned_interval (Grob *me) { - return ly_scm2interval (Axis_group_interface::group_extent_callback - (me->self_scm (), scm_int2num (Y_AXIS))); + return ly_scm2interval (Axis_group_interface::generic_group_extent (me, Y_AXIS)); } -MAKE_SCHEME_CALLBACK (Span_bar, get_bar_size, 1); +MAKE_SCHEME_CALLBACK (Span_bar, calc_bar_size, 1); SCM -Span_bar::get_bar_size (SCM smob) +Span_bar::calc_bar_size (SCM smob) { Grob *me = unsmob_grob (smob); Interval iv (get_spanned_interval (me)); @@ -233,13 +204,16 @@ Span_bar::get_bar_size (SCM smob) { /* This happens if the bars are hara-kiried from under us. */ me->suicide (); - return scm_make_real (-1); + return scm_from_double (-1); } - return scm_make_real (iv.length ()); + return scm_from_double (iv.length ()); } -ADD_INTERFACE (Span_bar, "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");