lilypond-1.3.94

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index b3ce53051e9a8993c8841f4d66aca9b4dd9aeb10..faf226af33a920089606c7f9c850a90ebd43054f 100644 (file)
--- 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 35177fac012d30b5f2e18e69b43e625a7fcc61d6..616e43125306c54148218ddf91ac3af809ee89ae 100644 (file)
--- 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 25e4cec7dd18b0233ad477d6e37c782fe97ce5fe..db1fc24b2e65dd208ed8fba4a792f34fb9e27c33 100644 (file)
--- 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 fb11733906bee7d4e16a7727f67f3c55c4a4319a..f18b7d03550642ed79b697ca728585c1106d0889 100644 (file)
--- 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 bb3ad4a377fd2b8b8c03e3648603146ef80d3388..dcddc27c7498bb2ede2d638770c79e29c869cd66 100644 (file)
--- 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 6ef1dfba8a7f1b83f601742b61b7ba2f213bdb95..b797e02d93837d178e2e7340845b0311828e7c63 100644 (file)
--- 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 847799f180c1ad23c14549a6b16904ef35fe1e51..619520ce954cd4944aa993a5c612e132fd2a2508 100644 (file)
--- 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 51055a3a9a36c7b995239e2370688a33201ab128..e4a1989c6919e87ddde0d147db8aebd739386b63 100644 (file)
--- 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 333593a2d8e12cf6db475e343b7f04ac04c15ae1..10f9627184312dfb374d73c7a45deae8695b4d30 100644 (file)
--- 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 628af83903ec87c95e267dad2692798f5cd35a4a..644366f5a9917a01065329a68bc7834f0295bbd4 100644 (file)
--- 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 ffdd54e56df9983cb7716bfd5900135f576165dc..00aafa5adab08b329d96e87450a663d7d2399f43 100644 (file)
--- 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 645f04b9b2aa802b0c8c9e974b95ca94e60909a7..f3952962883fe0115aa15447d2ffa25c392f2307 100644 (file)
--- 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 5cc5118cdb7dca1ae28c8a0a77feb4b528f22b76..2912f3b37a5db75760b03826297016fa7b017b70 100644 (file)
--- 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 34ed2efd0a2caa4c0cd06c08f57fa41133877e95..9a2e596b7c606e9aa160a5860c066021c3a4fd2f 100644 (file)
--- 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 34a4016c28ea8cba5bd1d379f3ed5f859b64f059..7467464a63a67284923773ec5bb78af5bac9f979 100644 (file)
--- 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) 
 {