X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster.cc;h=b1e1f6aec106ccd336a7426f8c750978aaa746da;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=5a1db0237a63d4a7f45c27219fdc6a0f9bd453ba;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/cluster.cc b/lily/cluster.cc index 5a1db0237a..b1e1f6aec1 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2002--2010 Juergen Reuter + Copyright (C) 2002--2014 Juergen Reuter Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -62,57 +62,57 @@ brew_cluster_piece (Grob *me, vector bottom_points, vector top_p if (shape == "leftsided-stairs") { for (int i = 0; i < size - 1; i++) - { - Box box; - box.add_point (bottom_points[i] - hvpadding); - box.add_point (Offset (top_points[i + 1][X_AXIS], - top_points[i][Y_AXIS]) + hvpadding); - out.add_stencil (Lookup::round_filled_box (box, blotdiameter)); - } + { + Box box; + box.add_point (bottom_points[i] - hvpadding); + box.add_point (Offset (top_points[i + 1][X_AXIS], + top_points[i][Y_AXIS]) + hvpadding); + out.add_stencil (Lookup::round_filled_box (box, blotdiameter)); + } } else if (shape == "rightsided-stairs") { for (int i = 0; i < size - 1; i++) - { - Box box; - box.add_point (Offset (bottom_points[i][X_AXIS], - bottom_points[i + 1][Y_AXIS]) - hvpadding); - box.add_point (top_points[i + 1] + hvpadding); - out.add_stencil (Lookup::round_filled_box (box, blotdiameter)); - } + { + Box box; + box.add_point (Offset (bottom_points[i][X_AXIS], + bottom_points[i + 1][Y_AXIS]) - hvpadding); + box.add_point (top_points[i + 1] + hvpadding); + out.add_stencil (Lookup::round_filled_box (box, blotdiameter)); + } } else if (shape == "centered-stairs") { Real left_xmid = bottom_points[0][X_AXIS]; for (int i = 0; i < size - 1; i++) - { - Real right_xmid - = 0.5 * (bottom_points[i][X_AXIS] + bottom_points[i + 1][X_AXIS]); - Box box; - box.add_point (Offset (left_xmid, bottom_points[i][Y_AXIS]) - - hvpadding); - box.add_point (Offset (right_xmid, top_points[i][Y_AXIS]) - + hvpadding); - out.add_stencil (Lookup::round_filled_box (box, blotdiameter)); - left_xmid = right_xmid; - } + { + Real right_xmid + = 0.5 * (bottom_points[i][X_AXIS] + bottom_points[i + 1][X_AXIS]); + Box box; + box.add_point (Offset (left_xmid, bottom_points[i][Y_AXIS]) + - hvpadding); + box.add_point (Offset (right_xmid, top_points[i][Y_AXIS]) + + hvpadding); + out.add_stencil (Lookup::round_filled_box (box, blotdiameter)); + left_xmid = right_xmid; + } Real right_xmid = bottom_points[size - 1][X_AXIS]; Box box; box.add_point (Offset (left_xmid, bottom_points[size - 1][Y_AXIS]) - - hvpadding); + - hvpadding); box.add_point (Offset (right_xmid, top_points[size - 1][Y_AXIS]) - + hvpadding); + + hvpadding); out.add_stencil (Lookup::round_filled_box (box, blotdiameter)); } else if (shape == "ramp") { points.push_back (bottom_points[0] - vpadding + hpadding); for (int i = 1; i < size - 1; i++) - points.push_back (bottom_points[i] - vpadding); + 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_back (top_points[i] + vpadding); + points.push_back (top_points[i] + vpadding); points.push_back (top_points[0] + vpadding + hpadding); out.add_stencil (Lookup::round_filled_polygon (points, blotdiameter)); } @@ -125,7 +125,7 @@ MAKE_SCHEME_CALLBACK (Cluster, calc_cross_staff, 1); SCM Cluster::calc_cross_staff (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); extract_grob_set (me, "columns", cols); Grob *commony = common_refpoint_of_array (cols, me, Y_AXIS); @@ -137,7 +137,7 @@ MAKE_SCHEME_CALLBACK (Cluster, print, 1); SCM Cluster::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); Spanner *spanner = dynamic_cast (me); if (!spanner) @@ -151,7 +151,7 @@ Cluster::print (SCM smob) Grob *commonx = left_bound->common_refpoint (right_bound, X_AXIS); - vector const &cols = extract_grob_array (me, "columns"); + vector const &cols = extract_grob_array (me, "columns"); if (cols.empty ()) { me->warning (_ ("junking empty cluster")); @@ -190,16 +190,16 @@ Cluster::print (SCM smob) { extract_grob_set (next, "columns", next_cols); if (next_cols.size () > 0) - { - Grob *next_commony = common_refpoint_of_array (next_cols, next, Y_AXIS); - Grob *col = next_cols[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; + 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.push_back (Offset (x, v[DOWN])); + top_points.push_back (Offset (x, v[UP])); + } } Stencil out = brew_cluster_piece (me, bottom_points, top_points); @@ -208,21 +208,21 @@ Cluster::print (SCM smob) } ADD_INTERFACE (Cluster, - "A graphically drawn musical cluster.\n" - "\n" - "@code{padding} adds to the vertical extent of the shape (top" - " and bottom).\n" - "\n" - "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", - - /* properties */ - "style " - "padding " - "columns " - ); + "A graphically drawn musical cluster.\n" + "\n" + "@code{padding} adds to the vertical extent of the shape (top" + " and bottom).\n" + "\n" + "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", + + /* properties */ + "style " + "padding " + "columns " + ); struct Cluster_beacon { @@ -235,17 +235,17 @@ MAKE_SCHEME_CALLBACK (Cluster_beacon, height, 1); SCM Cluster_beacon::height (SCM g) { - Grob *me = unsmob_grob (g); + Grob *me = Grob::unsmob (g); Interval v = robust_scm2interval (me->get_property ("positions"), - Interval (0, 0)); + Interval (0, 0)); return ly_interval2scm (Staff_symbol_referencer::staff_space (me) * 0.5 * v); } ADD_INTERFACE (Cluster_beacon, - "A place holder for the cluster spanner to determine the" - " vertical extents of a cluster spanner at this" - " X@tie{}position.", + "A place holder for the cluster spanner to determine the" + " vertical extents of a cluster spanner at this" + " X@tie{}position.", - /* properties */ - "positions " - ); + /* properties */ + "positions " + );