rename beam::cross-staff.

diff --git a/lily/beam.cc b/lily/beam.cc
index c1ad71198a1805e805158578899d341e72b4c155..02ee8c4f3bb6b50c5334eed5c2efcdc4ec8483e3 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1431,9 +1431,9 @@ Beam::is_cross_staff (Grob *me)
   return false;
 }
 
-MAKE_SCHEME_CALLBACK (Beam, cross_staff, 1)
+MAKE_SCHEME_CALLBACK (Beam, calc_cross_staff, 1)
 SCM
-Beam::cross_staff (SCM smob)
+Beam::calc_cross_staff (SCM smob)
 {
   return scm_from_bool (is_cross_staff (unsmob_grob (smob)));
 }

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index e505cd670926a193e10fb57dbd1e7452ddb4d135..dee61b467b07a8be1859195268b60e0e4600ca5e 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -94,7 +94,7 @@ public:
   DECLARE_SCHEME_CALLBACK (calc_normal_stems, (SCM));  
   DECLARE_SCHEME_CALLBACK (calc_concaveness, (SCM));
   DECLARE_SCHEME_CALLBACK (set_stem_lengths, (SCM));
-  DECLARE_SCHEME_CALLBACK (cross_staff, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
 
   /* position callbacks */
   DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM, SCM));

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 6cfc4ed18845310cf8dba7dd0d1c62920fcacef9..9611239ca2457fcc185df46985a89eafb51156d9 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -319,7 +319,7 @@
        (beaming . ,ly:beam::calc-beaming)
        (stencil . ,ly:beam::print)
        (clip-edges . #t)
-       (cross-staff . ,ly:beam::cross-staff)
+       (cross-staff . ,ly:beam::calc-cross-staff)
 
        (details .  ((hint-direction-penalty . 20)))
        ;; TODO: should be in SLT.