X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=00e22fb0855e016d3f1750369a26e64634fc5df9;hb=e2053d6696e4dc607fb00e3135d36e654a1fb150;hp=6076dd7d86255a75838af5eb77523ccd5f93a291;hpb=1edc2436a028cb2d1be8786ab0972a95b0985d42;p=lilypond.git diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 6076dd7d86..00e22fb085 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -1,123 +1,241 @@ /* - 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--2011 Han-Wen Nienhuys - (c) 1997 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 "dimen.hh" #include "span-bar.hh" -#include "lookup.hh" -#include "atom.hh" -#include "paper-def.hh" -#include "molecule.hh" -#include "vertical-align-elem.hh" + +#include "font-interface.hh" +#include "dimensions.hh" +#include "output-def.hh" +#include "stencil.hh" +#include "warn.hh" +#include "axis-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*b) +Span_bar::add_bar (Grob *me, Grob *b) { - b->spanned_i_ ++; - spanning_l_arr_.push (b); - add_dependency (b); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), b); } +MAKE_SCHEME_CALLBACK (Span_bar, print, 1); +/* Limitations/Bugs: -void -Span_bar::do_substitute_dependency (Score_elem*o, Score_elem*n) -{ - Bar * bold = 0; - if (o->is_type_b (Bar::static_name())) - bold = (Bar*)o->item(); - else - return; - - bold->spanned_i_ --; - Bar * b =0; - if (n && n->is_type_b (Bar::static_name())) - { - b = (Bar*)n->item(); - b->spanned_i_ ++; - } - - spanning_l_arr_.substitute (bold , b); -} +(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. */ -void -Span_bar::set (Vertical_align_element *a) +/* 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) { - add_dependency (a); -} - + Grob *me = unsmob_grob (smobbed_me); + extract_grob_set (me, "elements", elements); + Grob *refp = common_refpoint_of_array (elements, me, Y_AXIS); -Interval -Span_bar::do_width() const -{ - return paper()->lookup_l ()->bar (type_str_, 40 PT).dim_.x (); // ugh -} + SCM glyph = me->get_property ("glyph-name"); -void -Span_bar::do_pre_processing() -{ - if (spanning_l_arr_.size() < 1) + /* 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--;) { - transparent_b_ = true; - set_empty (true); + 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; } - else + + if (!model_bar) + model_bar = me; + + vector_sort (extents, Interval::left_less); + + Stencil span_bar; + for (vsize i = 1; i < extents.size (); i++) { - if (type_str_.empty_b ()) - type_str_ = spanning_l_arr_[0]->type_str_; - if (type_str_.empty_b ()) - { - transparent_b_=true; - set_empty (true); - } - else if (type_str_ == "|:") + Interval prev_extent = extents[i - 1]; + Interval ext = extents[i]; + if (!prev_extent.is_empty ()) { - type_str_ = ".|"; - } - else if (type_str_ == ":|") - { - type_str_ = "|."; + 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; } + + 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); + + /* + urg. + */ + Stencil m = + Bar_line::compound_barline (me, gl, Interval (-20 PT, 20 PT), false); + + return ly_interval2scm (m.extent (X_AXIS)); } -Atom -Span_bar::get_bar_sym (Real dy) const +MAKE_SCHEME_CALLBACK (Span_bar, before_line_breaking, 1); +SCM +Span_bar::before_line_breaking (SCM smob) { - return paper()->lookup_l ()->bar (type_str_, dy); + 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); -Molecule* -Span_bar::brew_molecule_p() const +SCM +Span_bar::center_on_spanned_callback (SCM smob) { - Interval y_int; - for (int i=0; i < spanning_l_arr_.size(); i++) - { - Axis_group_element *common = - common_group (spanning_l_arr_[i], Y_AXIS); - - Real y = spanning_l_arr_[i]->relative_coordinate (common, Y_AXIS) - -relative_coordinate (common,Y_AXIS); + Grob *me = unsmob_grob (smob); + Interval i (get_spanned_interval (me)); - y_int.unite (y + spanning_l_arr_[i]->height()); + /* 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); } - Atom s = get_bar_sym (y_int.length()); - Molecule*output = new Molecule (Atom (s)); - output->translate (y_int[-1], Y_AXIS); - return output; + return scm_from_double (i.center ()); } -IMPLEMENT_IS_TYPE_B1(Span_bar,Bar); -Span_bar::Span_bar() +MAKE_SCHEME_CALLBACK(Span_bar, calc_glyph_name, 1); +SCM +Span_bar::calc_glyph_name (SCM smob) { - type_str_ = ""; + 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; + } + + 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); } + +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 " + ); +