lilypond-1.3.91

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 8b2df51acdaf0c6e508b598738c504acb5fd1a0a..bdd8f8e656fa13efe48344885901d4b4ba43466d 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -123,8 +123,11 @@ Dynamic_engraver::do_process_music ()
          Side_position::set_axis (line_spanner_, Y_AXIS);
          Axis_group_interface::set_interface (line_spanner_);
          Axis_group_interface::set_axes (line_spanner_, Y_AXIS, Y_AXIS);
-         announce_element (line_spanner_,
-                            text_req_l_ ? text_req_l_ : accepted_spanreqs_drul_[START]);
+
+         Request * rq = accepted_spanreqs_drul_[START];
+         if (text_req_l_) rq =  text_req_l_ ;
+         announce_element (line_spanner_, rq);
+                        
 
        }
     }

diff --git a/lily/keyword.cc b/lily/keyword.cc
index b273df2d6e2dbcb1d25bd645cdbbdeb94bcbe154..ea7f14901dd736503930df6488db12194ce9a876 100644 (file)
--- a/lily/keyword.cc
+++ b/lily/keyword.cc
@@ -1,10 +1,8 @@
 /*
   keyword.cc -- keywords and identifiers
  */
-
+#include <string.h>
 #include <stdlib.h>
-
-
 #include "keyword.hh"
 
 

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 6f6b93e280e6a4528bb8cd38197a473b40545c41..69fef2e645d1632a6fb93c3329c07f25f7a35d2a 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -395,21 +395,21 @@ undefd ()
   return SCM_UNDEFINED;
 }
 
+
 static void
 init_functions ()
 {
-  scm_make_gsubr ("ly-warn", 1, 0, 0, (SCM(*)(...))ly_warning);
-  scm_make_gsubr ("ly-gulp-file", 1,0, 0, (SCM(*)(...))ly_gulp_file);
-  scm_make_gsubr ("dir?", 1,0, 0, (SCM(*)(...))ly_isdir_p);
-  scm_make_gsubr ("undefd", 0,0, 0, (SCM(*)(...))undefd);  
-  scm_make_gsubr ("ly-number->string", 1, 0,0, (SCM(*)(...)) ly_number2string);
+  scm_make_gsubr ("ly-warn", 1, 0, 0, (SCM(*)())ly_warning);
+  scm_make_gsubr ("ly-gulp-file", 1,0, 0, (SCM(*)())ly_gulp_file);
+  scm_make_gsubr ("dir?", 1,0, 0, (SCM(*)())ly_isdir_p);
+  scm_make_gsubr ("undefd", 0,0, 0, (SCM(*)())undefd);  
+  scm_make_gsubr ("ly-number->string", 1, 0,0, (SCM(*)()) ly_number2string);
 
 
 #ifdef TEST_GC 
   scm_c_hook_add (&scm_before_mark_c_hook, greet_sweep, 0, 0);
   scm_c_hook_add (&scm_before_sweep_c_hook, wave_sweep_goodbye, 0, 0);
 #endif
-  
 }
 
 ADD_SCM_INIT_FUNC(funcs, init_functions);

diff --git a/lily/main.cc b/lily/main.cc
index 1808daefc5748dfa89412384507de80dd13c8ebd..23bd451fde486c6823219f3a4444cc98afe88647 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -27,16 +27,14 @@
 #include "paper-def.hh"
 #include "midi-def.hh"
 #include "global-ctor.hh"
+#include "kpath.hh"
+
 
 #if HAVE_GETTEXT
 #include <libintl.h>
 #endif
 
-#if KPATHSEA && HAVE_KPATHSEA_KPATHSEA_H
-extern "C" {
-#include <kpathsea/kpathsea.h>
-}
-#endif
+
 
 bool verbose_global_b = false;
 bool no_paper_global_b = false;
@@ -335,14 +333,8 @@ main (int argc, char **argv)
   putenv ("GUILE_INIT_SEGMENT_SIZE_1=4194304");
   putenv ("GUILE_MAX_SEGMENT_SIZE=8388608");
 
-#if KPATHSEA && HAVE_KPATHSEA_KPATHSEA_H
-  /*
-   initialize kpathsea
-   */
-  kpse_set_program_name(argv[0], NULL);
-  kpse_maketex_option("tfm", TRUE);
-#endif
-
+  ly_init_kpath (argv[0]);
+  
   oparser_global_p = new Getopt_long(argc, argv,theopts);
   while (Long_option_init const * opt = (*oparser_global_p)())
     {
@@ -407,7 +399,7 @@ main (int argc, char **argv)
 #ifdef WINNT
   gh_enter (argc, argv, main_prog);
 #else
-  gh_enter (argc, argv, (void(*)(...))main_prog);
+  gh_enter (argc, argv, (void(*)(int, char**))main_prog);
 #endif
 
   return 0;                    // unreachable

diff --git a/lily/moment.cc b/lily/moment.cc
index da3ed2483177cbcbceb55992df80b9ee49b3ddc2..b2f588e4af7f790216a44a5cb6559ee6b3a92cb8 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -66,7 +66,7 @@ make_rational (SCM n, SCM d)
 void
 init_moments ()
 {
-  scm_make_gsubr ("make-moment", 2 , 0, 0,  (SCM(*)(...)) make_rational);
+  scm_make_gsubr ("make-moment", 2 , 0, 0,  (SCM(*)()) make_rational);
 }
 
 ADD_SCM_INIT_FUNC(moms,init_moments);

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 30ccf6e490b1c577a404a6a305e981cb2189541e..453753130e40fa657ef476512b7089fea2e93c33 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -64,7 +64,7 @@ Note_heads_engraver::do_try_music (Music *m)
     {
       return true;
     }
-  else if (Busy_playing_req * p = dynamic_cast<Busy_playing_req*> (m))
+  else if (dynamic_cast<Busy_playing_req*> (m))
     {
       return now_mom () < note_end_mom_;
     }

diff --git a/lily/score-element.cc b/lily/score-element.cc
index 2e75fd9a0ece2dccf4a1e347be5f8f9705c4f461..f1974fe63abd5b622d3cb2c7b7a114c33d0cd61f 100644 (file)
--- a/lily/score-element.cc
+++ b/lily/score-element.cc
@@ -832,15 +832,15 @@ spanner_get_bound (SCM slur, SCM dir)
 
 
 static SCM interfaces_sym;
-
+#define UNDEFINED_ARG 
 static void
 init_functions ()
 {
   interfaces_sym = scm_permanent_object (ly_symbol2scm ("interfaces"));
   
-  scm_make_gsubr ("ly-get-elt-property", 2, 0, 0, (SCM(*)(...))ly_get_elt_property);
-  scm_make_gsubr ("ly-set-elt-property", 3, 0, 0, (SCM(*)(...))ly_set_elt_property);
-  scm_make_gsubr ("ly-get-spanner-bound", 2 , 0, 0, (SCM(*)(...)) spanner_get_bound);
+  scm_make_gsubr ("ly-get-elt-property", 2, 0, 0, (SCM(*)(UNDEFINED_ARG))ly_get_elt_property);
+  scm_make_gsubr ("ly-set-elt-property", 3, 0, 0, (SCM(*)(UNDEFINED_ARG))ly_set_elt_property);
+  scm_make_gsubr ("ly-get-spanner-bound", 2 , 0, 0, (SCM(*)(UNDEFINED_ARG)) spanner_get_bound);
 }
 
 bool