source file of the GNU LilyPond music typesetter
- (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
+ (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>
Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "cluster.hh"
-
-#include <cstdio>
-using namespace std;
-
#include "international.hh"
#include "item.hh"
#include "lookup.hh"
/*
TODO: Add support for cubic spline segments.
-*/
+ */
Stencil
-brew_cluster_piece (Grob *me, std::vector<Offset> bottom_points, std::vector<Offset> top_points)
+brew_cluster_piece (Grob *me, vector<Offset> bottom_points, vector<Offset> top_points)
{
Real blotdiameter = Staff_symbol_referencer::staff_space (me) / 2;
Offset hvpadding = 0.5 * hpadding + vpadding;
SCM shape_scm = me->get_property ("style");
- std::string shape;
+ string shape;
if (scm_is_symbol (shape_scm))
shape = ly_symbol2string (shape_scm);
}
Stencil out;
- std::vector<Offset> points;
+ vector<Offset> points;
points.clear ();
int size = bottom_points.size ();
if (shape == "leftsided-stairs")
Grob *commonx = left_bound->common_refpoint (right_bound, X_AXIS);
- Link_array__Grob_ const &cols = extract_grob_array (me, "columns");
+ vector<Grob*> const &cols = extract_grob_array (me, "columns");
if (cols.empty ())
{
me->warning (_ ("junking empty cluster"));
commonx = common_refpoint_of_array (cols, commonx, X_AXIS);
Grob *commony = common_refpoint_of_array (cols, me, Y_AXIS);
- std::vector<Offset> bottom_points;
- std::vector<Offset> top_points;
+ vector<Offset> bottom_points;
+ vector<Offset> top_points;
Real left_coord = left_bound->relative_coordinate (commonx, X_AXIS);
/*
Across a line break we anticipate on the next pitches.
*/
- if (spanner->original ())
+ if (Spanner *next = spanner->broken_neighbor (RIGHT))
{
- Spanner *orig = dynamic_cast<Spanner *> (spanner->original ());
-
- if (spanner->get_break_index () < orig->broken_intos_.size () - 1)
+ extract_grob_set (next, "columns", next_cols);
+ if (next_cols.size () > 0)
{
- Spanner *next = orig->broken_intos_[spanner->get_break_index () + 1];
- Link_array__Grob_ const &next_cols = extract_grob_array (next, "columns");
- if (next_cols.size () > 0)
- {
- Grob *next_commony = common_refpoint_of_array (next_cols, next, Y_AXIS);
- Grob *col = next_cols[0];
-
- Interval v = col->extent (next_commony, Y_AXIS);
- Real x = right_bound->relative_coordinate (commonx, X_AXIS) - left_coord;
-
- bottom_points.insert (bottom_points.begin (),
- Offset (x, v[DOWN]));
- top_points.insert (top_points.begin (), Offset (x, v[UP]));
- }
+ Grob *next_commony = common_refpoint_of_array (next_cols, next, Y_AXIS);
+ Grob *col = next_cols[0];
+
+ Interval v = col->extent (next_commony, Y_AXIS);
+ Real x = right_bound->relative_coordinate (commonx, X_AXIS) - left_coord;
+
+ bottom_points.push_back (Offset (x, v[DOWN]));
+ top_points.push_back (Offset (x, v[UP]));
}
}
- reverse (bottom_points);
- reverse (top_points);
-
Stencil out = brew_cluster_piece (me, bottom_points, top_points);
out.translate_axis (- me->relative_coordinate (commony, Y_AXIS), Y_AXIS);
return out.smobbed_copy ();
}
-ADD_INTERFACE (Cluster, "cluster-interface",
+ADD_INTERFACE (Cluster,
"A graphically drawn musical cluster. "
"\n\n"
"@code{padding} adds to the vertical extent of the shape (top and "
"The property @code{style} controls the shape of cluster segments. Valid values "
"include @code{leftsided-stairs}, @code{rightsided-stairs}, @code{centered-stairs}, "
"and @code{ramp}.\n",
- "style padding columns");
+
+ /* props */
+ "style "
+ "padding "
+ "columns "
+ );
struct Cluster_beacon
{
public:
DECLARE_SCHEME_CALLBACK (height, (SCM));
- static bool has_interface (Grob *);
+ DECLARE_GROB_INTERFACE();
};
MAKE_SCHEME_CALLBACK (Cluster_beacon, height, 1);
}
ADD_INTERFACE (Cluster_beacon,
- "cluster-beacon-interface",
"A place holder for the cluster spanner to determine the vertical "
"extents of a cluster spanner at this X position.",