lilypond-1.3.94

diff --git a/lily/chord-name.cc b/lily/chord-name.cc
index 80955b20d7404b1063057bbb156dae20f685fd0d..19650961e2ae420f7ee2967d483cab8b04a742fc 100644 (file)
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -23,7 +23,6 @@
    "text"
    ("text" . property-alist)
  */
-
 Molecule
 Chord_name::ly_word2molecule (Score_element * me, SCM word, Real* x) 
 {
@@ -126,7 +125,7 @@ Chord_name::ly_text2molecule (Score_element * me, SCM text)
   return mol;
 }
 
-MAKE_SCHEME_CALLBACK (Chord_name, after_line_breaking);
+MAKE_SCHEME_CALLBACK (Chord_name,after_line_breaking,1);
 SCM
 Chord_name::after_line_breaking (SCM smob)
 {
@@ -148,7 +147,7 @@ Chord_name::after_line_breaking (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-MAKE_SCHEME_CALLBACK (Chord_name, brew_molecule);
+MAKE_SCHEME_CALLBACK (Chord_name,brew_molecule,1);
 SCM
 Chord_name::brew_molecule (SCM smob) 
 {
@@ -168,7 +167,7 @@ Chord_name::brew_molecule (SCM smob)
 
   SCM pitches =  me->get_elt_property ("pitches");
   SCM func = me->get_elt_property (ly_symbol2scm ("chord-name-function"));
-  SCM text = gh_call3 (func, style, ly_quote_scm (pitches), ly_quote_scm (gh_cons (inversion, bass)));
+  SCM text = gh_call3 (func, style, pitches, gh_cons (inversion, bass));
 
   return ly_text2molecule (me, text).create_scheme ();
 }

diff --git a/lily/hyphen-spanner.cc b/lily/hyphen-spanner.cc
index a798afe422412590d597bd3c11d4c270a8ed8ef4..eb64b7d13469e21e7c19bc1ce8b0254172f771ed 100644 (file)
--- a/lily/hyphen-spanner.cc
+++ b/lily/hyphen-spanner.cc
@@ -19,7 +19,7 @@
 #include "spanner.hh"
 #include "item.hh"
 
-MAKE_SCHEME_CALLBACK(Hyphen_spanner,brew_molecule)
+MAKE_SCHEME_CALLBACK(Hyphen_spanner,brew_molecule,1)
 
 SCM 
 Hyphen_spanner::brew_molecule (SCM smob)

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 456f8a53172b40d7211d8000bec4973a31b2bfda..fb09d42307e3056932fa5fff0fbb643f044d3db3 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -16,7 +16,7 @@
 #include "lyric-extender.hh"
 
 
-MAKE_SCHEME_CALLBACK(Lyric_extender,brew_molecule)
+MAKE_SCHEME_CALLBACK(Lyric_extender,brew_molecule,1)
 SCM 
 Lyric_extender::brew_molecule (SCM smob) 
 {

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 37538e28bee2fc63ffdd61158cf2414a172dd124..e414c09bf64c3538ae34fab29f8a8f8ef706c9eb 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -35,7 +35,7 @@ Multi_measure_rest::has_interface (Score_element*me)
    [TODO]                                      17
  * variable-sized multi-measure rest symbol: |====| ??
 */
-MAKE_SCHEME_CALLBACK(Multi_measure_rest,brew_molecule);
+MAKE_SCHEME_CALLBACK(Multi_measure_rest,brew_molecule,1);
 SCM
 Multi_measure_rest::brew_molecule (SCM smob) 
 {
@@ -153,7 +153,7 @@ Multi_measure_rest::add_column (Score_element*me,Item* c)
 }
 
 
-MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods);
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1);
 
 SCM
 Multi_measure_rest::set_spacing_rods (SCM smob)

diff --git a/lily/rest.cc b/lily/rest.cc
index dcff3064226b85e6e345e2a6635674194fc627b2..1ca731b20f751022300ea06a0b231c062a07138c 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -15,7 +15,7 @@
 #include "staff-symbol-referencer.hh"
 
 // -> offset callback
-MAKE_SCHEME_CALLBACK(Rest,after_line_breaking);
+MAKE_SCHEME_CALLBACK(Rest,after_line_breaking,1);
 SCM
 Rest::after_line_breaking (SCM smob)
 {
@@ -37,7 +37,7 @@ Rest::after_line_breaking (SCM smob)
 }
 
 
-MAKE_SCHEME_CALLBACK(Rest,brew_molecule)
+MAKE_SCHEME_CALLBACK(Rest,brew_molecule,1)
 SCM 
 Rest::brew_molecule (SCM smob) 
 {

diff --git a/lily/slur.cc b/lily/slur.cc
index a55a77812fe7869426af5efbfb09cb0d22d6adfa..4a86f7c96f17285f536cebe84ac19d6a97a4795c 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -107,7 +107,7 @@ Slur::get_default_dir (Score_element*me)
 }
 
 
-MAKE_SCHEME_CALLBACK (Slur, after_line_breaking);
+MAKE_SCHEME_CALLBACK (Slur, after_line_breaking,1);
 SCM
 Slur::after_line_breaking (SCM smob)
 {
@@ -428,7 +428,7 @@ Slur::get_encompass_offset_arr (Score_element*me)
 }
 
 
-MAKE_SCHEME_CALLBACK(Slur,set_spacing_rods);
+MAKE_SCHEME_CALLBACK(Slur,set_spacing_rods,1);
 SCM
 Slur::set_spacing_rods (SCM smob)
 {
@@ -450,7 +450,7 @@ Slur::set_spacing_rods (SCM smob)
 /*
   Ugh should have dash-length + dash-period
  */
-MAKE_SCHEME_CALLBACK (Slur, brew_molecule);
+MAKE_SCHEME_CALLBACK (Slur, brew_molecule,1);
 SCM
 Slur::brew_molecule (SCM smob)
 {