From cd64f25baacc058e4b33f36cee5c1fd8e07aa56b Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:56:52 +0000 Subject: [PATCH] lilypond-1.3.94 --- lily/clef-item.cc | 2 +- lily/crescendo.cc | 2 +- lily/dots.cc | 13 ++++++++----- lily/grace-align-item.cc | 2 +- lily/key-item.cc | 2 +- lily/local-key-item.cc | 2 +- lily/note-head.cc | 2 +- lily/script-column.cc | 2 +- lily/script.cc | 4 ++-- lily/separating-group-spanner.cc | 2 +- lily/staff-symbol.cc | 2 +- lily/tie.cc | 4 ++-- lily/time-signature.cc | 2 +- lily/tuplet-spanner.cc | 4 ++-- lily/volta-spanner.cc | 2 +- 15 files changed, 25 insertions(+), 22 deletions(-) diff --git a/lily/clef-item.cc b/lily/clef-item.cc index b3ce53051e..faf226af33 100644 --- a/lily/clef-item.cc +++ b/lily/clef-item.cc @@ -16,7 +16,7 @@ FIXME: should use symbol for #'style. */ -MAKE_SCHEME_CALLBACK(Clef,before_line_breaking); +MAKE_SCHEME_CALLBACK(Clef,before_line_breaking,1); SCM Clef::before_line_breaking (SCM smob) { diff --git a/lily/crescendo.cc b/lily/crescendo.cc index 35177fac01..616e431253 100644 --- a/lily/crescendo.cc +++ b/lily/crescendo.cc @@ -23,7 +23,7 @@ Crescendo::set_interface (Score_element*s) -MAKE_SCHEME_CALLBACK(Crescendo,brew_molecule); +MAKE_SCHEME_CALLBACK(Crescendo,brew_molecule,1); /* diff --git a/lily/dots.cc b/lily/dots.cc index 25e4cec7dd..db1fc24b2e 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -15,9 +15,12 @@ #include "directional-element-interface.hh" -Real -Dots::quantised_position_callback (Score_element * me, Axis a) +MAKE_SCHEME_CALLBACK(Dots,quantised_position_callback,2); +SCM +Dots::quantised_position_callback (SCM element_smob, SCM axis) { + Score_element *me = unsmob_element (element_smob); + Axis a = (Axis) gh_scm2int (axis); assert (a == Y_AXIS); SCM d= me->get_elt_property ("dot-count"); @@ -27,14 +30,14 @@ Dots::quantised_position_callback (Score_element * me, Axis a) Directional_element_interface::set (me, UP); if (Staff_symbol_referencer::on_staffline (me)) - return Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me); + return gh_double2scm (Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me)); } - return 0.0; + return gh_double2scm (0.0); } -MAKE_SCHEME_CALLBACK(Dots,brew_molecule); +MAKE_SCHEME_CALLBACK(Dots,brew_molecule,1); SCM Dots::brew_molecule (SCM d) { diff --git a/lily/grace-align-item.cc b/lily/grace-align-item.cc index fb11733906..f18b7d0355 100644 --- a/lily/grace-align-item.cc +++ b/lily/grace-align-item.cc @@ -13,7 +13,7 @@ #include "paper-column.hh" #include "paper-def.hh" -MAKE_SCHEME_CALLBACK(Grace_align_item,before_line_breaking); +MAKE_SCHEME_CALLBACK(Grace_align_item,before_line_breaking,1); SCM Grace_align_item::before_line_breaking (SCM smob) { diff --git a/lily/key-item.cc b/lily/key-item.cc index bb3ad4a377..dcddc27c74 100644 --- a/lily/key-item.cc +++ b/lily/key-item.cc @@ -71,7 +71,7 @@ Key_item::calculate_position(Score_element *ki, SCM pair) TODO - space the `natural' signs wider */ -MAKE_SCHEME_CALLBACK(Key_item,brew_molecule); +MAKE_SCHEME_CALLBACK(Key_item,brew_molecule,1); SCM Key_item::brew_molecule (SCM smob) { diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index 6ef1dfba8a..b797e02d93 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -72,7 +72,7 @@ Local_key_item::parenthesize (Score_element*me, Molecule m) accidental placement is more complicated than this. */ -MAKE_SCHEME_CALLBACK(Local_key_item,brew_molecule); +MAKE_SCHEME_CALLBACK(Local_key_item,brew_molecule,1); SCM Local_key_item::brew_molecule (SCM smob) { diff --git a/lily/note-head.cc b/lily/note-head.cc index 847799f180..619520ce95 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -50,7 +50,7 @@ Note_head::ledger_line (Interval xwid, Score_element *me) } -MAKE_SCHEME_CALLBACK(Note_head,brew_molecule); +MAKE_SCHEME_CALLBACK(Note_head,brew_molecule,1); SCM Note_head::brew_molecule (SCM smob) diff --git a/lily/script-column.cc b/lily/script-column.cc index 51055a3a9a..e4a1989c69 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -34,7 +34,7 @@ staff_side_compare (Score_element * const &i1, return gh_scm2int (p1) - gh_scm2int (p2); } -MAKE_SCHEME_CALLBACK(Script_column,before_line_breaking); +MAKE_SCHEME_CALLBACK(Script_column,before_line_breaking,1); SCM Script_column::before_line_breaking (SCM smob) diff --git a/lily/script.cc b/lily/script.cc index 333593a2d8..10f9627184 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -36,7 +36,7 @@ Script::get_molecule(Score_element * me, Direction d) return Molecule (); } -MAKE_SCHEME_CALLBACK(Script,after_line_breaking); +MAKE_SCHEME_CALLBACK(Script,after_line_breaking,1); SCM Script::after_line_breaking (SCM smob) { @@ -48,7 +48,7 @@ Script::after_line_breaking (SCM smob) return SCM_UNSPECIFIED; } -MAKE_SCHEME_CALLBACK(Script,brew_molecule); +MAKE_SCHEME_CALLBACK(Script,brew_molecule,1); SCM Script::brew_molecule (SCM smob) diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 628af83903..644366f5a9 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -34,7 +34,7 @@ do_rod (Item *l, Item *r) rod.add_to_cols (); } -MAKE_SCHEME_CALLBACK(Separating_group_spanner,set_spacing_rods); +MAKE_SCHEME_CALLBACK(Separating_group_spanner,set_spacing_rods,1); SCM Separating_group_spanner::set_spacing_rods (SCM smob) { diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index ffdd54e56d..00aafa5ada 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -16,7 +16,7 @@ #include "spanner.hh" -MAKE_SCHEME_CALLBACK(Staff_symbol,brew_molecule); +MAKE_SCHEME_CALLBACK(Staff_symbol,brew_molecule,1); SCM Staff_symbol::brew_molecule (SCM smob) diff --git a/lily/tie.cc b/lily/tie.cc index 645f04b9b2..f395296288 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -253,7 +253,7 @@ Tie::get_control_points (SCM smob) return controls; } -MAKE_SCHEME_CALLBACK(Tie,set_spacing_rods); +MAKE_SCHEME_CALLBACK(Tie,set_spacing_rods,1); /* TODO: set minimum distances for begin/end of line @@ -275,7 +275,7 @@ Tie::set_spacing_rods (SCM smob) return SCM_UNSPECIFIED; } -MAKE_SCHEME_CALLBACK(Tie,brew_molecule); +MAKE_SCHEME_CALLBACK(Tie,brew_molecule,1); SCM Tie::brew_molecule (SCM smob) { diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 5cc5118cdb..2912f3b37a 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -13,7 +13,7 @@ #include "paper-def.hh" #include "lookup.hh" -MAKE_SCHEME_CALLBACK(Time_signature,brew_molecule); +MAKE_SCHEME_CALLBACK(Time_signature,brew_molecule,1); SCM Time_signature::brew_molecule (SCM smob) diff --git a/lily/tuplet-spanner.cc b/lily/tuplet-spanner.cc index 34ed2efd0a..9a2e596b7c 100644 --- a/lily/tuplet-spanner.cc +++ b/lily/tuplet-spanner.cc @@ -32,7 +32,7 @@ Tuplet_spanner::set_interface (Score_element*me) TODO. */ -MAKE_SCHEME_CALLBACK(Tuplet_spanner,brew_molecule); +MAKE_SCHEME_CALLBACK(Tuplet_spanner,brew_molecule,1); SCM Tuplet_spanner::brew_molecule (SCM smob) @@ -187,7 +187,7 @@ Tuplet_spanner::calc_dy (Score_element*me,Real * dy) *dy = column_arr.top ()->extent (Y_AXIS) [d] - column_arr[0]->extent (Y_AXIS) [d]; } -MAKE_SCHEME_CALLBACK(Tuplet_spanner,after_line_breaking); +MAKE_SCHEME_CALLBACK(Tuplet_spanner,after_line_breaking,1); SCM Tuplet_spanner::after_line_breaking (SCM smob) diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc index 34a4016c28..7467464a63 100644 --- a/lily/volta-spanner.cc +++ b/lily/volta-spanner.cc @@ -38,7 +38,7 @@ Volta_spanner::set_interface (Score_element*me) */ -MAKE_SCHEME_CALLBACK(Volta_spanner,brew_molecule); +MAKE_SCHEME_CALLBACK(Volta_spanner,brew_molecule,1); SCM Volta_spanner::brew_molecule (SCM smob) { -- 2.39.5