release: 1.5.21

[lilypond.git] / lily / lily-guile.cc

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index f554b13f9dc47324ae09aa35ef33bfd378ceb472..4446fdda1dea5d8ffb7d32f3b4eb14d3fca09f9d 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -245,14 +245,23 @@ void add_scm_init_func (void (*f) ())
 
   scm_init_funcs_->push (f);
 }
+
 extern  void init_cxx_function_smobs ();
 
 void
 init_lily_guile ()
 {
+  SCM last_mod = scm_current_module ();
+  scm_set_current_module (scm_c_resolve_module ("guile"));
+
   init_cxx_function_smobs ();
   for (int i=scm_init_funcs_->size () ; i--;)
- (scm_init_funcs_->elem (i)) ();
+    (scm_init_funcs_->elem (i)) ();
+
+  if (verbose_global_b)
+    progress_indication ("\n");
+  read_lily_scm_file ("lily.scm");
+  scm_set_current_module (last_mod);
 }
 
 unsigned int ly_scm_hash (SCM s)
@@ -519,3 +528,31 @@ parse_symbol_list (const char * list)
   free (orig);
   return create_list;
 }
+
+
+SCM
+ly_truncate_list (int k, SCM l )
+{
+  if (k == 0)
+    {
+      l = SCM_EOL;
+    }
+  else
+    {
+      SCM s = l;
+      k--;
+      for (; gh_pair_p (s) && k--; s = ly_cdr (s))
+       ;
+
+      if (gh_pair_p (s))
+       {
+         gh_set_cdr_x (s, SCM_EOL);
+       }
+    }
+  return l;
+}
+
+SCM my_gh_symbol2scm (const char* x)
+{
+  return gh_symbol2scm ((char*)x);
+}