X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=29a871a62dc11920eee6bd4aad51de99495a4f39;hb=da77ae29b4974f89fa168729ffcda756a39688c0;hp=13e2491f9700bc57b6246811689638b187ad38f7;hpb=28d97df78de5e56962730b42119c2d9b73401fa7;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 13e2491f97..29a871a62d 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -1,124 +1,248 @@ /* - span-bar.cc -- implement Span_bar + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2012 Han-Wen Nienhuys - (c) 1997--2000 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#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" +#include "grob.hh" +#include "pointer-group-interface.hh" +#include "staff-symbol-referencer.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")); +/* Limitations/Bugs: - /* - urg. - */ - Molecule m = s->compound_barline (gl, 40 PT); - - return m.extent (X_AXIS); -} +(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::before_line_breaking () -{ - Bar::before_line_breaking (); - - evaluate_empty (); -} +(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. */ -void -Span_bar::after_line_breaking () +/* 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::after_line_breaking (); - Interval i (get_spanned_interval ()); - translate_axis (i.center (), Y_AXIS); -} + Grob *me = unsmob_grob (smobbed_me); + extract_grob_set (me, "elements", elements); + Grob *refp = common_refpoint_of_array (elements, me, Y_AXIS); -void -Span_bar::evaluate_empty () -{ - if (!gh_pair_p (get_elt_property ("elements"))) + 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--;) { - set_elt_property ("transparent", SCM_BOOL_T); - set_extent_callback (0, X_AXIS); - set_extent_callback (0, Y_AXIS); + Grob *bar = elements[i]; + Interval ext = Bar_line::bar_y_extent (bar, refp); + if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (bar)) + ext.unite (staff->extent (refp, Y_AXIS)); + 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; } - - SCM gl = get_elt_property ("glyph"); - if (!gh_string_p (gl)) + + if (!model_bar) + model_bar = me; + + Stencil span_bar; + for (vsize i = 1; i < extents.size (); i++) { - set_elt_property ("transparent", SCM_BOOL_T); - set_extent_callback (0, X_AXIS); - set_extent_callback (0, Y_AXIS); + 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, + false); + span_bar.add_stencil (interbar); + } + } + prev_extent = ext; } - else { - String type_str = ly_scm2string (gl); - if (type_str == "|:") - { - type_str= ".|"; - } - else if (type_str== ":|") - { - type_str= "|."; - } - else if (type_str== ":|:") - { - type_str= ".|."; - } - } + + span_bar.translate_axis (- me->relative_coordinate (refp, Y_AXIS), + Y_AXIS); + + return span_bar.smobbed_copy (); +} + +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); /* - uhh. should do something with type_str ?!! + urg. */ + Stencil m + = Bar_line::compound_barline (me, gl, Interval (-20 PT, 20 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) { - return Axis_group_interface::group_extent_callback (dim_cache_[Y_AXIS]); + Grob *me = unsmob_grob (smob); + extract_grob_set (me, "elements", elements); + if (elements.empty ()) + me->suicide (); + + 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 ()) + { + me->suicide (); + return scm_from_double (0.0); + } + + return scm_from_double (i.center ()); +} -Real -Span_bar::get_bar_size () const +MAKE_SCHEME_CALLBACK (Span_bar, calc_glyph_name, 1); +SCM +Span_bar::calc_glyph_name (SCM smob) { - Interval iv (get_spanned_interval ()); - if (iv.empty_b ()) + 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)) { - programming_error("Huh? My children deflated (FIXME)"); - iv = Interval (0,0); + me->suicide (); + return SCM_UNSPECIFIED; } - return iv.length (); + + string type = ly_scm2string (gl); + if (type == "|:" || type == "||:") + type = ".|"; + else if (type == ":|") + type = "|."; + else if (type == ":|:") + type = ".|."; + else if (type == ":|.|:") + type = "|.|"; + else if (type == ":|.:") + type = "|."; + else if (type == "S" || type == "S|" || type == "|S") + type = "||"; + else if (type == "S|:" || type == ".S|:") + type = ".|"; + else if (type == ":|S" || type == ":|S.") + type = "|."; + else if (type == ":|S|:" || type == ":|S.|:") + type = "|._.|"; + else if (type == "'") + type = ""; + + return ly_string2scm (type); } -Span_bar::Span_bar () +void +Span_bar::notify_grobs_of_my_existence (Grob *me) { - group (this).set_interface (); - dim_cache_[X_AXIS]->set_extent_callback (width_callback); - - // dim_cache_[Y_AXIS]->set_extent_callback (Axis_group_interface::group_extent_callback); + extract_grob_set (me, "elements", elts); + vector sortable (elts.begin (), elts.end ()); + vector_sort (sortable, Grob::vertical_less); + for (vsize i = 0; i < sortable.size (); i++) + sortable[i]->set_property ("has-span-bar", + scm_cons (i != sortable.size () - 1 ? me->self_scm () : scm_from_bool (false), + i != 0 ? me->self_scm () : scm_from_bool (false))); +} - dim_cache_[Y_AXIS]->set_extent_callback (0); +Interval +Span_bar::get_spanned_interval (Grob *me) +{ + return ly_scm2interval (Axis_group_interface::generic_group_extent (me, Y_AXIS)); } +ADD_INTERFACE (Span_bar, + "A bar line that is spanned between other barlines. This" + " interface is used for bar lines that connect different" + " staves.", + + /* properties */ + "glyph-name " + "elements " + "pure-Y-common " + "pure-relevant-grobs " + "pure-relevant-items " + "pure-relevant-spanners " + ); +