source file of the GNU LilyPond music typesetter
- (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+ (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
- Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "cluster.hh"
-
-#include <cstdio>
-
-#include "spanner.hh"
+#include "international.hh"
#include "item.hh"
-#include "pitch.hh"
-#include "staff-symbol-referencer.hh"
#include "lookup.hh"
#include "output-def.hh"
+#include "pitch.hh"
+#include "pointer-group-interface.hh"
+#include "spanner.hh"
+#include "staff-symbol-referencer.hh"
#include "warn.hh"
/*
TODO: Add support for cubic spline segments.
-*/
+ */
Stencil
-brew_cluster_piece (Grob *me, Array<Offset> bottom_points, Array<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");
- String shape;
+ string shape;
if (scm_is_symbol (shape_scm))
- {
- shape = ly_symbol2string (shape_scm);
- }
+ shape = ly_symbol2string (shape_scm);
else
{
programming_error ("#'style should be symbol.");
}
Stencil out;
- Array<Offset> points;
+ vector<Offset> points;
points.clear ();
int size = bottom_points.size ();
- if (String::compare (shape, "leftsided-stairs") == 0)
+ if (shape == "leftsided-stairs")
{
for (int i = 0; i < size - 1; i++)
{
out.add_stencil (Lookup::round_filled_box (box, blotdiameter));
}
}
- else if (String::compare (shape, "rightsided-stairs") == 0)
+ else if (shape == "rightsided-stairs")
{
for (int i = 0; i < size - 1; i++)
{
out.add_stencil (Lookup::round_filled_box (box, blotdiameter));
}
}
- else if (String::compare (shape, "centered-stairs") == 0)
+ else if (shape == "centered-stairs")
{
Real left_xmid = bottom_points[0][X_AXIS];
for (int i = 0; i < size - 1; i++)
+ hvpadding);
out.add_stencil (Lookup::round_filled_box (box, blotdiameter));
}
- else if (String::compare (shape, "ramp") == 0)
+ else if (shape == "ramp")
{
- points.push (bottom_points[0] - vpadding + hpadding);
+ points.push_back (bottom_points[0] - vpadding + hpadding);
for (int i = 1; i < size - 1; i++)
- {
- points.push (bottom_points[i] - vpadding);
- }
- points.push (bottom_points[size - 1] - vpadding - hpadding);
- points.push (top_points[size - 1] + vpadding - hpadding);
+ points.push_back (bottom_points[i] - vpadding);
+ points.push_back (bottom_points[size - 1] - vpadding - hpadding);
+ points.push_back (top_points[size - 1] + vpadding - hpadding);
for (int i = size - 2; i > 0; i--)
- {
- points.push (top_points[i] + vpadding);
- }
- points.push (top_points[0] + vpadding + hpadding);
+ points.push_back (top_points[i] + vpadding);
+ points.push_back (top_points[0] + vpadding + hpadding);
out.add_stencil (Lookup::round_filled_polygon (points, blotdiameter));
}
else
- {
- me->warning (_f ("unknown cluster style `%s'", shape.to_str0 ()));
- }
+ me->warning (_f ("unknown cluster style `%s'", shape.c_str ()));
return out;
}
Item *right_bound = spanner->get_bound (RIGHT);
Grob *commonx = left_bound->common_refpoint (right_bound, X_AXIS);
- SCM cols = me->get_property ("columns");
- if (!scm_is_pair (cols))
+ vector<Grob*> const &cols = extract_grob_array (me, "columns");
+ if (cols.empty ())
{
me->warning (_ ("junking empty cluster"));
me->suicide ();
return SCM_EOL;
}
- commonx = common_refpoint_of_list (cols, commonx, X_AXIS);
- Grob *commony = common_refpoint_of_list (cols, me, Y_AXIS);
- Array<Offset> bottom_points;
- Array<Offset> top_points;
+ commonx = common_refpoint_of_array (cols, commonx, X_AXIS);
+ Grob *commony = common_refpoint_of_array (cols, me, Y_AXIS);
+ vector<Offset> bottom_points;
+ vector<Offset> top_points;
Real left_coord = left_bound->relative_coordinate (commonx, X_AXIS);
line with the center of the note heads?
*/
- for (SCM s = cols; scm_is_pair (s); s = scm_cdr (s))
+ for (vsize i = 0; i < cols.size (); i++)
{
- Grob *col = unsmob_grob (scm_car (s));
+ Grob *col = cols[i];
+
Interval yext = col->extent (commony, Y_AXIS);
Real x = col->relative_coordinate (commonx, X_AXIS) - left_coord;
- bottom_points.push (Offset (x, yext[DOWN]));
- top_points.push (Offset (x, yext[UP]));
+ bottom_points.push_back (Offset (x, yext[DOWN]));
+ top_points.push_back (Offset (x, yext[UP]));
}
/*
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];
- SCM cols = next->get_property ("columns");
- if (scm_is_pair (cols))
- {
- Grob *next_commony = common_refpoint_of_list (cols, next, Y_AXIS);
- Grob *col = unsmob_grob (scm_car (scm_last_pair (cols)));
-
- Interval v = col->extent (next_commony, Y_AXIS);
- Real x = right_bound->relative_coordinate (commonx, X_AXIS) - left_coord;
-
- bottom_points.insert (Offset (x, v[DOWN]), 0);
- top_points.insert (Offset (x, v[UP]), 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.push_back (Offset (x, v[DOWN]));
+ top_points.push_back (Offset (x, v[UP]));
}
}
- bottom_points.reverse ();
- top_points.reverse ();
-
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");
+ "style "
+ "padding "
+ "columns ");
struct Cluster_beacon
{
public:
- DECLARE_SCHEME_CALLBACK (height, (SCM, SCM));
- static bool has_interface (Grob *);
+ DECLARE_SCHEME_CALLBACK (height, (SCM));
+ DECLARE_GROB_INTERFACE();
};
-MAKE_SCHEME_CALLBACK (Cluster_beacon, height, 2);
+MAKE_SCHEME_CALLBACK (Cluster_beacon, height, 1);
SCM
-Cluster_beacon::height (SCM g, SCM)
+Cluster_beacon::height (SCM g)
{
Grob *me = unsmob_grob (g);
Interval v = robust_scm2interval (me->get_property ("positions"),
}
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.",
- "positions");
+
+ /* properties */
+ "positions ");