X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster.cc;h=7a84195493df6efd7e3dedbe4562e0e168fb4c49;hb=730dd1aeadf4609b4a08bd08702c1a478f11d372;hp=d370a65030dfe489a4996e00ae7782314b3d0e7b;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/cluster.cc b/lily/cluster.cc index d370a65030..7a84195493 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -3,30 +3,27 @@ source file of the GNU LilyPond music typesetter - (c) 2002--2006 Juergen Reuter + (c) 2002--2007 Juergen Reuter Han-Wen Nienhuys */ #include "cluster.hh" - -#include -using namespace std; - -#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 "warn.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 bottom_points, Array top_points) +brew_cluster_piece (Grob *me, vector bottom_points, vector top_points) { Real blotdiameter = Staff_symbol_referencer::staff_space (me) / 2; @@ -37,7 +34,7 @@ brew_cluster_piece (Grob *me, Array bottom_points, Array top_poi 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); @@ -49,10 +46,10 @@ brew_cluster_piece (Grob *me, Array bottom_points, Array top_poi } Stencil out; - Array points; + vector 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++) { @@ -63,7 +60,7 @@ brew_cluster_piece (Grob *me, Array bottom_points, Array top_poi 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++) { @@ -74,7 +71,7 @@ brew_cluster_piece (Grob *me, Array bottom_points, Array top_poi 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++) @@ -97,20 +94,20 @@ brew_cluster_piece (Grob *me, Array bottom_points, Array top_poi + 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; } @@ -132,8 +129,8 @@ Cluster::print (SCM smob) Grob *commonx = left_bound->common_refpoint (right_bound, X_AXIS); - Link_array const &cols = extract_grob_array (me, "columns"); - if (cols.is_empty ()) + vector const &cols = extract_grob_array (me, "columns"); + if (cols.empty ()) { me->warning (_ ("junking empty cluster")); me->suicide (); @@ -143,8 +140,8 @@ Cluster::print (SCM smob) commonx = common_refpoint_of_array (cols, commonx, X_AXIS); Grob *commony = common_refpoint_of_array (cols, me, Y_AXIS); - Array bottom_points; - Array top_points; + vector bottom_points; + vector top_points; Real left_coord = left_bound->relative_coordinate (commonx, X_AXIS); @@ -153,51 +150,42 @@ Cluster::print (SCM smob) line with the center of the note heads? */ - for (int i = 0; i < cols.size (); i++) + for (vsize i = 0; i < cols.size (); i++) { 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->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 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 (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 " @@ -205,13 +193,18 @@ ADD_INTERFACE (Cluster, "cluster-interface", "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); @@ -225,7 +218,6 @@ Cluster_beacon::height (SCM g) } 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.",