From 0e875cd4abc10b0e60183bb51fba8b990c0cc569 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:56:54 +0000 Subject: [PATCH] lilypond-1.3.94 --- lily/align-interface.cc | 14 ++++++++------ lily/include/align-interface.hh | 6 ++++-- lily/include/bar.hh | 6 +++--- lily/include/beam.hh | 9 +++++---- lily/include/break-align-item.hh | 6 +++--- lily/include/breathing-sign.hh | 4 ++-- lily/include/chord-name.hh | 4 ++-- lily/include/clef.hh | 2 +- lily/include/collision.hh | 2 +- lily/include/crescendo.hh | 2 +- lily/include/dot-column.hh | 2 +- lily/include/dots.hh | 5 +++-- lily/include/grace-align-item.hh | 2 +- lily/include/hyphen-spanner.hh | 2 +- lily/include/key-item.hh | 2 +- lily/include/lily-guile.hh | 16 +++++++++++----- lily/include/local-key-item.hh | 2 +- lily/include/lyric-extender.hh | 2 +- lily/include/multi-measure-rest.hh | 4 ++-- lily/include/note-head.hh | 2 +- lily/include/rest-collision.hh | 3 ++- lily/include/rest.hh | 4 ++-- lily/include/rhythmic-head.hh | 2 +- lily/include/script-column.hh | 2 +- lily/include/script.hh | 4 ++-- lily/include/separating-group-spanner.hh | 2 +- lily/include/side-position-interface.hh | 13 ++++++++----- lily/include/spacing-spanner.hh | 2 +- lily/include/staff-symbol-referencer.hh | 2 +- lily/include/staff-symbol.hh | 2 +- lily/include/system-start-delimiter.hh | 4 ++-- lily/include/tie-column.hh | 2 +- lily/include/tie.hh | 4 ++-- lily/include/time-signature.hh | 2 +- lily/include/tuplet-spanner.hh | 4 ++-- lily/include/volta-spanner.hh | 2 +- lily/syllable-group.cc | 2 +- 37 files changed, 83 insertions(+), 67 deletions(-) diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 8e07f9870e..8bc3f13f25 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -8,7 +8,6 @@ */ #include "align-interface.hh" - #include "score-element.hh" #include "group-interface.hh" #include "axis-group-interface.hh" @@ -18,15 +17,18 @@ This callback is set in the children of the align element. It does not compute anything, but a side effect of a->do_side_processing () is that the elements are placed correctly. */ -Real -Align_interface::alignment_callback (Score_element *sc, Axis ax) +MAKE_SCHEME_CALLBACK(Align_interface,alignment_callback,2); +SCM +Align_interface::alignment_callback (SCM element_smob, SCM axis) { - Score_element * par = sc->parent_l (ax); + Score_element * sun = unsmob_element (element_smob); + Axis ax = (Axis )gh_scm2int (axis); + Score_element * par = sun->parent_l (ax); if (par && !to_boolean (par->get_elt_property ("alignment-done"))) { Align_interface::do_side_processing (par, ax); } - return 0.0; + return gh_double2scm (0.0); } @@ -138,7 +140,7 @@ Align_interface::get_count (Score_element*me,Score_element*s) void Align_interface::add_element (Score_element*me,Score_element* s) { - s->add_offset_callback (alignment_callback, Align_interface::axis (me)); + s->add_offset_callback (Align_interface::alignment_callback_proc, Align_interface::axis (me)); Axis_group_interface::add_element (me, s); } diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index 3eb8b9e972..924ca2dec3 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -12,6 +12,8 @@ #include "axes.hh" #include "lily-proto.hh" +#include "lily-guile.hh" + /* Order elements top to bottom/left to right/right to left etc. @@ -51,7 +53,7 @@ */ struct Align_interface { - static Real alignment_callback (Score_element *,Axis); + DECLARE_SCHEME_CALLBACK(alignment_callback, (SCM element, SCM axis)); static void do_side_processing (Score_element*,Axis a); static void set_axis (Score_element*,Axis); static Axis axis (Score_element*) ; @@ -59,7 +61,7 @@ struct Align_interface { static int get_count (Score_element*,Score_element*); static void set_interface (Score_element*); static bool has_interface (Score_element*); - static Real center_on_element (Score_element *c, Axis); + DECLARE_SCHEME_CALLBACK(center_on_element, (SCM element, SCM axis)); }; #endif /* ALIGN_INTERFACE_HH */ diff --git a/lily/include/bar.hh b/lily/include/bar.hh index c9ab5d36ef..663b233e89 100644 --- a/lily/include/bar.hh +++ b/lily/include/bar.hh @@ -20,9 +20,9 @@ public: static void set_interface (Score_element*); static Molecule compound_barline (Score_element*, String, Real height) ; static Molecule simple_barline (Score_element*, Real wid, Real height) ; - static SCM get_staff_bar_size (SCM); - static SCM brew_molecule (SCM); - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(get_staff_bar_size, (SCM )); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); }; #endif // BAR_HH diff --git a/lily/include/beam.hh b/lily/include/beam.hh index 3ed32fae68..11bc3d3704 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -11,6 +11,7 @@ #include "lily-guile.hh" + /** a beam connects multiple stems. Beam adjusts the stems its owns to make sure that they reach the @@ -61,15 +62,15 @@ public: static Item* last_visible_stem (Score_element*); static bool has_interface (Score_element*); static void set_interface (Score_element*); - static Real rest_collision_callback (Score_element *,Axis); + DECLARE_SCHEME_CALLBACK(rest_collision_callback, (SCM element, SCM axis)); Beam (SCM); static void add_stem (Score_element*,Score_element*); static void set_beaming (Score_element*,Beaming_info_list *); static void set_stemlens (Score_element*); static int get_multiplicity (Score_element*me); - static SCM brew_molecule (SCM); - static SCM before_line_breaking (SCM); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static Molecule stem_beams (Score_element*,Item *here, Item *next, Item *prev); private: diff --git a/lily/include/break-align-item.hh b/lily/include/break-align-item.hh index 8449f07498..3e9d0d6c1d 100644 --- a/lily/include/break-align-item.hh +++ b/lily/include/break-align-item.hh @@ -24,12 +24,12 @@ class Break_align_interface { public: - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); static void do_alignment (Score_element*); static void set_interface (Score_element*); static bool has_interface (Score_element*); static void add_element (Score_element*me, Score_element*add); - static Real alignment_callback (Score_element*, Axis); - static Real self_align_callback (Score_element*, Axis); + DECLARE_SCHEME_CALLBACK(alignment_callback, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(self_align_callback, (SCM element, SCM axis)); }; #endif // BREAK_ALIGN_ITEM_HH diff --git a/lily/include/breathing-sign.hh b/lily/include/breathing-sign.hh index 17e06d03a4..c131e57fe2 100644 --- a/lily/include/breathing-sign.hh +++ b/lily/include/breathing-sign.hh @@ -19,8 +19,8 @@ class Breathing_sign { public: - static SCM brew_molecule (SCM); - static Real offset_callback (Score_element *, Axis); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); + DECLARE_SCHEME_CALLBACK(offset_callback, (SCM element, SCM axis)); static void set_interface (Score_element*); static bool has_interface (Score_element*); }; diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index bd9bcfb9dc..b4825593ba 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -21,10 +21,10 @@ class Chord_name { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static Molecule ly_word2molecule (Score_element*, SCM scm, Real* x) ; static Molecule ly_text2molecule (Score_element*, SCM scm) ; - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); }; #endif // CHORD_NAME_HH diff --git a/lily/include/clef.hh b/lily/include/clef.hh index f8c4b52c61..bd59e6ee1d 100644 --- a/lily/include/clef.hh +++ b/lily/include/clef.hh @@ -26,7 +26,7 @@ */ struct Clef { - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); static bool has_interface (Score_element*); static void set_interface (Score_element*); }; diff --git a/lily/include/collision.hh b/lily/include/collision.hh index 650a80f14f..d700f5a34a 100644 --- a/lily/include/collision.hh +++ b/lily/include/collision.hh @@ -43,7 +43,7 @@ class Collision // interface public: static SCM automatic_shift (Score_element*); static SCM forced_shift (Score_element*); - static Real force_shift_callback (Score_element *, Axis); + DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM element, SCM axis)); static void do_shifts (Score_element*); static void add_column (Score_element*me,Score_element*ncol_l); }; diff --git a/lily/include/crescendo.hh b/lily/include/crescendo.hh index 09c46265ac..e7e4a16c52 100644 --- a/lily/include/crescendo.hh +++ b/lily/include/crescendo.hh @@ -19,7 +19,7 @@ struct Crescendo { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void set_interface(Score_element*); static bool has_interface (Score_element*); }; diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index 27a1eb3225..dc50f326fc 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -22,7 +22,7 @@ public: static void add_head (Score_element * dotcol, Score_element* rh ); static void set_interface (Score_element*); static bool has_interface (Score_element*); - static Real force_shift_callback (Score_element * , Axis); + DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM ,SCM)); static SCM do_shifts (SCM dotlist); }; #endif // DOT_COLUMN_HH diff --git a/lily/include/dots.hh b/lily/include/dots.hh index 76189d65f6..ea4ce9be63 100644 --- a/lily/include/dots.hh +++ b/lily/include/dots.hh @@ -14,6 +14,7 @@ #include "lily-guile.hh" + /** The dots to go with a notehead/rest. A separate class, since they are a party in collision resolution. @@ -27,8 +28,8 @@ class Dots // interface { public: - static Real quantised_position_callback(Score_element*, Axis); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(quantised_position_callback, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // DOTS_HH diff --git a/lily/include/grace-align-item.hh b/lily/include/grace-align-item.hh index 3e446295e3..812a442e29 100644 --- a/lily/include/grace-align-item.hh +++ b/lily/include/grace-align-item.hh @@ -23,7 +23,7 @@ class Grace_align_item public: static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); }; #endif /* GRACE_ALIGN_ITEM_HH */ diff --git a/lily/include/hyphen-spanner.hh b/lily/include/hyphen-spanner.hh index fb114a914a..fba4ed4c26 100644 --- a/lily/include/hyphen-spanner.hh +++ b/lily/include/hyphen-spanner.hh @@ -36,7 +36,7 @@ public: Spanner* elt_l_; Hyphen_spanner (Spanner*); void set_textitem (Direction, Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // HYPHEN_SPANNER_HH diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh index de16e2a130..706f65530f 100644 --- a/lily/include/key-item.hh +++ b/lily/include/key-item.hh @@ -26,7 +26,7 @@ struct Key_item static int calculate_position(Score_element*,SCM pair) ; static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // KEYITEM_HH diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index bc9287c763..623e852692 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -84,18 +84,24 @@ void add_scm_init_func (void (*)()); typedef SCM(*Scheme_function_unknown)(); #if __GNUC_MINOR__ >= 96 -typedef SCM(*Scheme_function_1)(SCM); +typedef SCM(*Scheme_function_1)(SCM); +typedef SCM(*Scheme_function_2)(SCM,SCM); #else typedef SCM(*Scheme_function_1)(...); +typedef SCM(*Scheme_function_2)(...); #endif -#define MAKE_SCHEME_CALLBACK(TYPE, FUNC) \ -static SCM TYPE ## _ ## FUNC ## _proc;\ +#define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \ + static SCM NAME ARGS; \ + static SCM NAME ## _proc + +#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT) \ +SCM TYPE :: FUNC ## _proc;\ void \ TYPE ## _ ## FUNC ## _init_functions () \ { \ - TYPE ## _ ## FUNC ## _proc = gh_new_procedure1_0 (#TYPE "::" #FUNC, \ - ((Scheme_function_1)TYPE :: FUNC)); \ + TYPE :: FUNC ## _proc = gh_new_procedure ## ARGCOUNT ## _0 (#TYPE "::" #FUNC, \ + ((Scheme_function_ ## ARGCOUNT)TYPE :: FUNC)); \ } \ \ ADD_SCM_INIT_FUNC(TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions); \ diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh index e1f45bd305..88b76d7b46 100644 --- a/lily/include/local-key-item.hh +++ b/lily/include/local-key-item.hh @@ -15,7 +15,7 @@ class Local_key_item { static Molecule parenthesize (Score_element*me, Molecule) ; public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void add_pitch (Score_element*me, Musical_pitch, bool cautionary, bool natural); static bool has_interface (Score_element*); static void set_interface (Score_element*); diff --git a/lily/include/lyric-extender.hh b/lily/include/lyric-extender.hh index 1a71a1e7cb..1204a3befc 100644 --- a/lily/include/lyric-extender.hh +++ b/lily/include/lyric-extender.hh @@ -43,7 +43,7 @@ public: Spanner*elt_l_; Lyric_extender (Spanner*); void set_textitem (Direction, Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // EXTENDER_SPANNER_HH diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index ba805eadd0..d516dbfd96 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -29,9 +29,9 @@ class Multi_measure_rest public: static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void add_column (Score_element*,Item*); - static SCM set_spacing_rods (SCM); + DECLARE_SCHEME_CALLBACK(set_spacing_rods, (SCM )); }; #endif /* MULTI_MEASURE_REST_HH */ diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index 09c75e186e..8974b9828d 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -23,7 +23,7 @@ class Note_head { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static Molecule ledger_line (Interval, Score_element*) ; static bool has_interface (Score_element*); }; diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh index c2ae9cd1fd..94055324c7 100644 --- a/lily/include/rest-collision.hh +++ b/lily/include/rest-collision.hh @@ -15,6 +15,7 @@ + /* Move rests in note-columns so that they do not collide. @@ -48,7 +49,7 @@ public: static void add_column (Score_element*me,Score_element*); static void set_interface (Score_element*me); static bool has_interface (Score_element*); - static Real force_shift_callback (Score_element *, Axis); + DECLARE_SCHEME_CALLBACK(force_shift_callback, (SCM element, SCM axis)); static SCM do_shift (Score_element*,SCM); }; #endif // REST_COLLISION_HH diff --git a/lily/include/rest.hh b/lily/include/rest.hh index f403690dc7..204c19f407 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -22,8 +22,8 @@ class Rest { public: - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // REST_HH diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh index b64844d41d..855f84b7f7 100644 --- a/lily/include/rhythmic-head.hh +++ b/lily/include/rhythmic-head.hh @@ -29,7 +29,7 @@ public: static Item * stem_l (Score_element*) ; static Item * dots_l (Score_element*) ; static int dot_count (Score_element*) ; - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static bool has_interface (Score_element*); static void set_interface (Score_element*); }; diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh index 1e41d86583..3603372fae 100644 --- a/lily/include/script-column.hh +++ b/lily/include/script-column.hh @@ -17,7 +17,7 @@ class Script_column { public: static void add_staff_sided (Score_element*, Item*); - static SCM before_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); }; diff --git a/lily/include/script.hh b/lily/include/script.hh index 0e4dfae387..6d9b51f2c3 100644 --- a/lily/include/script.hh +++ b/lily/include/script.hh @@ -24,8 +24,8 @@ public: static Molecule get_molecule (Score_element*,Direction d); static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); }; #endif /* Stem_SCRIPT_HH */ diff --git a/lily/include/separating-group-spanner.hh b/lily/include/separating-group-spanner.hh index d01b6dbb51..8bcff500a4 100644 --- a/lily/include/separating-group-spanner.hh +++ b/lily/include/separating-group-spanner.hh @@ -17,7 +17,7 @@ class Separating_group_spanner public: static void add_spacing_unit (Score_element*me, Item*); static void set_interface (Score_element*); - static SCM set_spacing_rods (SCM); + DECLARE_SCHEME_CALLBACK(set_spacing_rods, (SCM )); }; #endif /* SEPARATING_GROUP_SPANNER_HH */ diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index a4f8e90356..db67e19143 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -14,6 +14,9 @@ #include "item.hh" + + + /** Position victim object (ELT_L_) next to other objects (the support). @@ -46,11 +49,11 @@ struct Side_position { public: - static Real side_position (Score_element *, Axis); - static Real aligned_on_self (Score_element *, Axis); - static Real aligned_side (Score_element *, Axis); - static Real quantised_position (Score_element *, Axis); - static Real centered_on_parent (Score_element *, Axis); + DECLARE_SCHEME_CALLBACK(side_position, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(aligned_on_self, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(aligned_side, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(quantised_position, (SCM element, SCM axis)); + DECLARE_SCHEME_CALLBACK(centered_on_parent, (SCM element, SCM axis)); static void set_axis (Score_element*,Axis); static void set_minimum_space (Score_element*,Real); static void set_padding (Score_element*,Real); diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh index 917b5fdc89..7f678043ee 100644 --- a/lily/include/spacing-spanner.hh +++ b/lily/include/spacing-spanner.hh @@ -18,7 +18,7 @@ public: static void set_interface (Score_element*); static void do_measure (Score_element*,Link_array) ; - static SCM set_springs (SCM); + DECLARE_SCHEME_CALLBACK(set_springs, (SCM )); static Real stem_dir_correction (Score_element*,Score_element*,Score_element*) ; static Real default_bar_spacing (Score_element*,Score_element*,Score_element*,Moment) ; static Real note_spacing (Score_element*,Score_element*,Score_element*,Moment) ; diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index 129848172b..597ed0944b 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -24,7 +24,7 @@ public: static void set_interface (Score_element*); static bool has_interface (Score_element*); static void set_position (Score_element*,Real); - static Real callback (Score_element *, Axis a); + DECLARE_SCHEME_CALLBACK(callback, (SCM element, SCM axis)); /** Leading are the lead strips between the sticks (lines) of diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh index b854b76dfd..5bcf6196a7 100644 --- a/lily/include/staff-symbol.hh +++ b/lily/include/staff-symbol.hh @@ -24,7 +24,7 @@ public: static Real staff_space (Score_element*) ; static int steps_i(Score_element*) ; static int line_count (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static bool has_interface (Score_element*); static void set_interface (Score_element*); }; diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh index 121713d9e6..081f0c6c91 100644 --- a/lily/include/system-start-delimiter.hh +++ b/lily/include/system-start-delimiter.hh @@ -19,11 +19,11 @@ class System_start_delimiter { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void set_interface (Score_element*me); static bool has_interface (Score_element*); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static void try_collapse (Score_element*); static Molecule staff_bracket (Score_element*,Real) ; static Molecule staff_brace (Score_element*,Real) ; diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh index 2c8545a079..b841125b31 100644 --- a/lily/include/tie-column.hh +++ b/lily/include/tie-column.hh @@ -20,7 +20,7 @@ public: static void set_interface (Score_element*me); static bool has_interface (Score_element*); static void add_tie (Score_element*me,Score_element*); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static void set_directions (Score_element*me); }; diff --git a/lily/include/tie.hh b/lily/include/tie.hh index 329e41fb0b..a5553555a9 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -25,10 +25,10 @@ public: static bool has_interface (Score_element*); static Score_element * head (Score_element*,Direction) ; static Real position_f (Score_element*) ; - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static Direction get_default_dir(Score_element*) ; static SCM get_control_points (SCM); - static SCM set_spacing_rods (SCM); + DECLARE_SCHEME_CALLBACK(set_spacing_rods, (SCM )); }; #endif // TIE_HH diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh index f25d12c866..f88a4f1324 100644 --- a/lily/include/time-signature.hh +++ b/lily/include/time-signature.hh @@ -21,7 +21,7 @@ struct Time_signature { static Molecule special_time_signature (Score_element*,String,int,int) ; static Molecule time_signature (Score_element*,int, int); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); }; #endif // METER_HH diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index 49a5bac13c..5d317cda25 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -26,7 +26,7 @@ properties: class Tuplet_spanner { public: - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void set_interface (Score_element*); static bool has_interface (Score_element*); @@ -36,7 +36,7 @@ public: static void calc_dy (Score_element*,Real *) ; static void calc_position_and_height (Score_element*,Real*,Real *dy); - static SCM after_line_breaking (SCM); + DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM )); static Direction get_default_dir (Score_element*); }; diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh index 8955f1b247..6bf3608531 100644 --- a/lily/include/volta-spanner.hh +++ b/lily/include/volta-spanner.hh @@ -27,7 +27,7 @@ class Volta_spanner public: static void set_interface (Score_element*); static bool has_interface (Score_element*); - static SCM brew_molecule (SCM); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static void add_column (Score_element*, Score_element*col); static void add_bar (Score_element*me, Item*bar); }; diff --git a/lily/syllable-group.cc b/lily/syllable-group.cc index a0cf73d270..f1438f69f8 100644 --- a/lily/syllable-group.cc +++ b/lily/syllable-group.cc @@ -120,7 +120,7 @@ Syllable_group::set_lyric_align(const char *punc, Score_element *default_notehea // centre on notehead ... if we have one. if(notehead_l_) { lyric->set_parent(notehead_l_, X_AXIS); - lyric->add_offset_callback (Side_position::centered_on_parent, X_AXIS); + lyric->add_offset_callback (Side_position::centered_on_parent_proc, X_AXIS); // reference is on the right of the notehead; move it left half way, and add translation lyric->translate_axis (group_translation_f_-(notehead_l_->extent(X_AXIS)).center(), X_AXIS); } -- 2.39.5