From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 5 Feb 2007 19:14:48 +0000 (+0100)
Subject: rename beam::cross-staff.
X-Git-Tag: release/2.11.17-1~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5cd43ebb71e10d189e52cff9426ba3c92ad80439;p=lilypond.git

rename beam::cross-staff.
---

diff --git a/lily/beam.cc b/lily/beam.cc
index c1ad71198a..02ee8c4f3b 100644
--- 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 e505cd6709..dee61b467b 100644
--- 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 6cfc4ed188..9611239ca2 100644
--- 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.