rename cross_staff -> calc_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/lily/include/stem.hh b/lily/include/stem.hh
index c9b509ce7dc036fa05fac8a0627b3c48864a0baf..7de67b0f7421c563c6d2969cbd64df9b07b8fc03 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -54,6 +54,6 @@ public:
   DECLARE_SCHEME_CALLBACK (width, (SCM smob));
   DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM));
-  DECLARE_SCHEME_CALLBACK (cross_staff, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
 };
 #endif

diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index 6108244cf60cefefe4d108ac6e7f743a3f7de463..ccc2c22bfc769a597e78f35ed873d0164690613d 100644 (file)
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -19,7 +19,7 @@ public:
   DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_connect_to_neighbors, (SCM smob));
-  DECLARE_SCHEME_CALLBACK (cross_staff, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
   
   DECLARE_GROB_INTERFACE();
   static Grob* get_common_x (Spanner *);

diff --git a/lily/stem.cc b/lily/stem.cc
index 862163fad9785987c6414eb58348998e557016a3..97f1cd24bfe1572c6d6f47331150c3ae7492f74a 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -1012,9 +1012,9 @@ Stem::is_cross_staff (Grob *stem)
   return beam && Beam::is_cross_staff (beam);
 }
 
-MAKE_SCHEME_CALLBACK (Stem, cross_staff, 1)
+MAKE_SCHEME_CALLBACK (Stem, calc_cross_staff, 1)
 SCM
-Stem::cross_staff (SCM smob)
+Stem::calc_cross_staff (SCM smob)
 {
   return scm_from_bool (is_cross_staff (unsmob_grob (smob)));
 }

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index baa42b727c7a223cb446f8b32056585c42fb8652..6733b97da81a26b1326a3850dba2e544f5d1ff28 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -737,9 +737,9 @@ Tuplet_bracket::add_tuplet_bracket (Grob *me, Grob *bracket)
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("tuplets"), bracket);
 }
 
-MAKE_SCHEME_CALLBACK (Tuplet_bracket, cross_staff, 1);
+MAKE_SCHEME_CALLBACK (Tuplet_bracket, calc_cross_staff, 1);
 SCM
-Tuplet_bracket::cross_staff (SCM smob)
+Tuplet_bracket::calc_cross_staff (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Grob *staff_symbol = 0;

diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc
index b888a5dd97eff3e016dab2aac247bd739b861b77..7ace42eb3a413429552834cdd5773451407908a9 100644 (file)
--- a/lily/tuplet-number.cc
+++ b/lily/tuplet-number.cc
@@ -17,7 +17,7 @@
 struct Tuplet_number
 {
   DECLARE_SCHEME_CALLBACK (print, (SCM));
-  DECLARE_SCHEME_CALLBACK (cross_staff, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
   DECLARE_GROB_INTERFACE ();
 };
   
@@ -67,12 +67,12 @@ Tuplet_number::print (SCM smob)
   return stc_scm;
 }
 
-MAKE_SCHEME_CALLBACK (Tuplet_number, cross_staff, 1)
+MAKE_SCHEME_CALLBACK (Tuplet_number, calc_cross_staff, 1)
 SCM
-Tuplet_number::cross_staff (SCM smob)
+Tuplet_number::calc_cross_staff (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  return Tuplet_bracket::cross_staff (me->get_object ("bracket"));
+  return unsmob_grob (me->get_object ("bracket"))->get_property ("cross_staff");
 }
 
 ADD_INTERFACE (Tuplet_number,

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 00394458fa71bf03d53db2b7697a8e32fa83ba11..98d09dc9bfbc5c0790c0ad26e589657b45c17d49 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.
@@ -1256,7 +1256,7 @@
        (minimum-length . 1.5)
        (height-limit . 2.0)
        (ratio . 0.333)
-       (cross-staff . ,ly:slur::cross-staff)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1455,7 +1455,7 @@
        (height-limit . 2.0)
        (ratio . 0.25)
        (avoid-slur . inside)
-       (cross-staff . ,ly:slur::cross-staff)
+       (cross-staff . ,ly:slur::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (slur-interface))))))
 
@@ -1576,7 +1576,7 @@
        (Y-extent . ,ly:stem::height)
        (length . ,ly:stem::calc-length)
        (thickness . 1.3)
-       (cross-staff . ,ly:stem::cross-staff)
+       (cross-staff . ,ly:stem::calc-cross-staff)
        (details
         . (
            ;; 3.5 (or 3 measured from note head) is standard length
@@ -1990,7 +1990,7 @@
        (connect-to-neighbor . ,ly:tuplet-bracket::calc-connect-to-neighbors)
        (control-points . ,ly:tuplet-bracket::calc-control-points)
        (stencil . ,ly:tuplet-bracket::print)
-       (cross-staff . ,ly:tuplet-bracket::cross-staff)
+       (cross-staff . ,ly:tuplet-bracket::calc-cross-staff)
        
        (meta . ((class . Spanner)
                 (interfaces . (line-interface
@@ -2003,7 +2003,7 @@
        (font-shape . italic)
        (font-size . -2)
        (avoid-slur . inside)
-       (cross-staff . ,ly:tuplet-number::cross-staff)
+       (cross-staff . ,ly:tuplet-number::calc-cross-staff)
        (meta . ((class . Spanner)
                 (interfaces . (text-interface tuplet-number-interface
                                font-interface))))))