/*
- 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 <hanwen@xs4all.nl>
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "span-bar.hh"
#include "bar-line.hh"
#include "grob.hh"
#include "pointer-group-interface.hh"
+#include "staff-symbol-referencer.hh"
void
Span_bar::add_bar (Grob *me, Grob *b)
/* compose span_bar_mol */
vector<Interval> extents;
+ vector<bool> make_span_bar;
Grob *model_bar = 0;
for (vsize i = elements.size (); i--;)
{
Grob *bar = elements[i];
- Interval ext = bar->extent (refp, Y_AXIS);
+ 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;
+ continue;
extents.push_back (ext);
+ make_span_bar.push_back (to_boolean (bar->get_property ("allow-span-bar")));
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],
- 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);
- }
- }
+ {
+ 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);
+ Y_AXIS);
return span_bar.smobbed_copy ();
}
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, 40 PT, false);
+ Stencil m
+ = Bar_line::compound_barline (me, gl, Interval (-20 PT, 20 PT), false);
return ly_interval2scm (m.extent (X_AXIS));
}
return scm_from_double (i.center ());
}
-
-
-MAKE_SCHEME_CALLBACK(Span_bar, calc_glyph_name, 1);
+MAKE_SCHEME_CALLBACK (Span_bar, calc_glyph_name, 1);
SCM
Span_bar::calc_glyph_name (SCM smob)
{
}
string type = ly_scm2string (gl);
- if (type == "|:")
+ 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)
+void
+Span_bar::notify_grobs_of_my_existence (Grob *me)
{
- return ly_scm2interval (Axis_group_interface::generic_group_extent (me, Y_AXIS));
+ extract_grob_set (me, "elements", elts);
+ vector<Grob *> 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)));
}
-MAKE_SCHEME_CALLBACK (Span_bar, calc_bar_size, 1);
-SCM
-Span_bar::calc_bar_size (SCM smob)
+Interval
+Span_bar::get_spanned_interval (Grob *me)
{
- Grob *me = unsmob_grob (smob);
- Interval iv (get_spanned_interval (me));
- if (iv.is_empty ())
- {
- /* This happens if the bars are hara-kiried from under us. */
- me->suicide ();
- return scm_from_double (-1);
- }
- return scm_from_double (iv.length ());
+ return ly_scm2interval (Axis_group_interface::generic_group_extent (me, Y_AXIS));
}
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");
+ "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 "
+ );
projects / lilypond.git / blobdiff