lilypond-1.3.94

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index 659905c2d47ace3a222bce624263fd0b45354f6d..258ff65dc4ed4e41a2a9e1c1a095e413a9f5021a 100644 (file)
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -28,7 +28,7 @@
 */
 struct Axis_group_interface 
 {
-  static Interval group_extent_callback (Score_element *,Axis);
+  DECLARE_SCHEME_CALLBACK(group_extent_callback, (SCM smob, SCM axis));
   static Interval relative_group_extent (Axis, Score_element * common, SCM list);
 
   static void add_element (Score_element* me, Score_element*);

diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh
index 9f4287910728732a94a1a0b486f18130214bc536..0c3268ea20cb8dd2502eb1b6b1ab16d5de409a74 100644 (file)
--- a/lily/include/hara-kiri-group-spanner.hh
+++ b/lily/include/hara-kiri-group-spanner.hh
@@ -30,9 +30,9 @@
 class Hara_kiri_group_spanner 
 {
 public:
-  static Real force_hara_kiri_callback (Score_element * , Axis);
-  static Interval y_extent (Score_element * , Axis);
-  static Real force_hara_kiri_in_parent_callback (Score_element * , Axis);
+  DECLARE_SCHEME_CALLBACK(force_hara_kiri_callback, (SCM ,SCM));
+  DECLARE_SCHEME_CALLBACK(y_extent, (SCM smob, SCM axis));
+  DECLARE_SCHEME_CALLBACK(force_hara_kiri_in_parent_callback, (SCM ,SCM));
   static void add_element (Score_element *me, Score_element *e);
   static void set_interface (Score_element*me);
   static bool has_interface (Score_element*);

diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh
index b13a68364f2ad51cbdc8b178becee4cdb5b4c811..9b942fada0974256aba43f60133d929e82584410 100644 (file)
--- a/lily/include/span-bar.hh
+++ b/lily/include/span-bar.hh
@@ -31,10 +31,10 @@ public:
   static void add_bar (Score_element*,Score_element*);
   static void evaluate_glyph (Score_element*);
   static void evaluate_empty (Score_element*);
-  static Interval width_callback(Score_element *, Axis) ;
-  static SCM get_bar_size (SCM);
-  static SCM before_line_breaking (SCM);
-  static Real center_on_spanned_callback (Score_element*,Axis);
+  DECLARE_SCHEME_CALLBACK(width_callback, (SCM smob, SCM axis));
+  DECLARE_SCHEME_CALLBACK(get_bar_size, (SCM ));
+  DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM ));
+  DECLARE_SCHEME_CALLBACK(center_on_spanned_callback, (SCM element, SCM axis));
 };
 
 #endif // SPAN_BAR_HH

diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh
index c8c29a678a50469c3b6f0cb828dfe67c8c171f2a..81ef981d10b128652a05d08c4bff109d964d7cdf 100644 (file)
--- a/lily/include/stem-tremolo.hh
+++ b/lily/include/stem-tremolo.hh
@@ -21,8 +21,8 @@ class Stem_tremolo
 public:
   static void set_interface (Score_element*);
   static bool has_interface (Score_element*);
-  static Interval dim_callback (Score_element*, Axis);
-  static SCM brew_molecule (SCM);
+  DECLARE_SCHEME_CALLBACK(dim_callback, (SCM smob, SCM axis));
+  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
   static void set_stem (Score_element*me, Score_element *st);
 };
 

diff --git a/lily/include/stem.hh b/lily/include/stem.hh
index 8c3e6f769134ae948a2a75999012541879533032..55e30a0f5cbcbb003f0ad27dcb7b9537d943cf14 100644 (file)
--- a/lily/include/stem.hh
+++ b/lily/include/stem.hh
@@ -39,7 +39,7 @@
 class Stem 
 {
 public:
-  static SCM brew_molecule (SCM);
+  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
 
   /// log of the duration. Eg. 4 -> 16th note -> 2 flags
   static  int flag_i (Score_element*) ;
@@ -71,10 +71,10 @@ public:
   static Real get_default_stem_end_position (Score_element*me) ;
   static void position_noteheads(Score_element*);
   static Real stem_end_position (Score_element*) ;
-  static Real off_callback (Score_element *, Axis);
+  DECLARE_SCHEME_CALLBACK(off_callback, (SCM element, SCM axis));
   static Molecule flag (Score_element*);
-  static SCM before_line_breaking (SCM);
-  static Interval dim_callback (Score_element *,Axis);
+  DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM ));
+  DECLARE_SCHEME_CALLBACK(dim_callback, (SCM smob, SCM axis));
   static bool has_interface (Score_element*);
   static void set_interface (Score_element*);