X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster.cc;h=dd16799683e8e2362ee6afa44aaa13236189104d;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=adf4e0aca6dca92f3fc3e0f97ee8db46c2ee48a9;hpb=ac93c7dd01e0b6661c360acf89721ce9d32e4e4c;p=lilypond.git diff --git a/lily/cluster.cc b/lily/cluster.cc index adf4e0aca6..dd16799683 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -1,137 +1,145 @@ /* - cluster.cc -- implement Cluster + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2002--2014 Juergen Reuter + Han-Wen Nienhuys - (c) 2002--2004 Juergen Reuter + 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. - Han-Wen Nienhuys + 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 . */ -#include - #include "cluster.hh" -#include "spanner.hh" +#include "international.hh" #include "item.hh" -#include "pitch.hh" -#include "staff-symbol-referencer.hh" #include "lookup.hh" -#include "box.hh" -#include "interval.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. - + 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; + Real blotdiameter = Staff_symbol_referencer::staff_space (me) / 2; - Real padding =robust_scm2double ( me->get_property ("padding"), 0.0); + Real padding = robust_scm2double (me->get_property ("padding"), 0.0); Offset vpadding = Offset (0, padding); Offset hpadding = Offset (0.5 * blotdiameter, 0); 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."); me->suicide (); - return Stencil (); + return Stencil (); } - 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++) - { - 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 (String::compare (shape, "rightsided-stairs") == 0) + 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 (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++) - { - 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); - box.add_point (Offset (right_xmid, top_points[size - 1][Y_AXIS]) + - hvpadding); + box.add_point (Offset (left_xmid, bottom_points[size - 1][Y_AXIS]) + - hvpadding); + box.add_point (Offset (right_xmid, top_points[size - 1][Y_AXIS]) + + 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; } -MAKE_SCHEME_CALLBACK (Cluster,print,1); +MAKE_SCHEME_CALLBACK (Cluster, calc_cross_staff, 1); +SCM +Cluster::calc_cross_staff (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + extract_grob_set (me, "columns", cols); + Grob *commony = common_refpoint_of_array (cols, me, Y_AXIS); + + return scm_from_bool (commony != me->get_parent (Y_AXIS)); +} + +MAKE_SCHEME_CALLBACK (Cluster, print, 1); SCM Cluster::print (SCM smob) { Grob *me = unsmob_grob (smob); - Spanner *spanner = dynamic_cast (me); + Spanner *spanner = dynamic_cast (me); if (!spanner) { me->programming_error ("Cluster::print (): not a spanner"); @@ -142,106 +150,102 @@ Cluster::print (SCM smob) 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 const &cols = extract_grob_array (me, "columns"); + if (cols.empty ()) { - me->warning ("junking empty cluster"); + 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 bottom_points; - Array top_points; + commonx = common_refpoint_of_array (cols, commonx, X_AXIS); + Grob *commony = common_refpoint_of_array (cols, me, Y_AXIS); + vector bottom_points; + vector top_points; Real left_coord = left_bound->relative_coordinate (commonx, X_AXIS); /* TODO: should we move the cluster a little to the right to be in 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->original_); - - if (spanner->get_break_index () < orig->broken_intos_.size ()-1) - { - 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); - } - } + 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]; + + 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", - "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" -, - "style padding columns"); - - +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 " + ); 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"), - 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.", - -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 " + );