Revert "fix input regression cluster cross-staff.ly"

This reverts commit b782c06b863efdf4e622009a27978d473442cb0e.

Signed-off-by: Valentin Villenave <v.villenave@gmail.com>

diff --git a/lily/cluster.cc b/lily/cluster.cc
index c4b11b38c5b2f72084532b7ab22d896b76e44a32..7a84195493df6efd7e3dedbe4562e0e168fb4c49 100644 (file)
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -111,18 +111,6 @@ brew_cluster_piece (Grob *me, vector<Offset> bottom_points, vector<Offset> top_p
   return out;
 }
 
-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)

diff --git a/lily/include/cluster.hh b/lily/include/cluster.hh
index e15d0024145bf4fbab53b253e4c41bc70554fdf7..3081b1b093bb77aeff3f251614e5d4fc87385c62 100644 (file)
--- a/lily/include/cluster.hh
+++ b/lily/include/cluster.hh
@@ -16,7 +16,6 @@ class Cluster
 {
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
   DECLARE_GROB_INTERFACE();
 };
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 658d2dfeb0c8ae5a2c615b08beeefa29fba62989..800362eb92956a1fa0ca853de5633ccad2e1345a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -486,7 +486,6 @@
        (stencil . ,ly:cluster::print)
        (minimum-length . 0.0)
        (padding . 0.25)
-       (cross-staff . ,ly:cluster::calc-cross-staff)
        (style . ramp)
        (meta . ((class . Spanner)
                 (interfaces . (cluster-interface))))))