release: 1.3.19

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index ac577bd101ae046b82e2f16adaf8869b9fe9ea46..e317ea543815e3a466ef1f2440f75eb0235fa652 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
@@ -19,6 +19,7 @@
 #include "file-path.hh"
 #include "debug.hh"
 #include "direction.hh"
+#include "offset.hh"
 
 SCM
 ly_str02scm (char const*c)
@@ -109,6 +110,7 @@ ly_symbol2scm(const char *s)
 String
 ly_symbol2string (SCM s)
 {
+  assert (gh_symbol_p (s));
   return String((Byte*)SCM_CHARS (s), (int) SCM_LENGTH(s));
 }
 
@@ -129,13 +131,13 @@ read_lily_scm_file (String fn)
       error (e);
     }
   else
-    *mlog << '[' << s;
+    progress_indication ("[" + s);
 
 
   Simple_file_storage f(s);
   
   ly_eval_str ((char *) f.ch_C());
-  *mlog << "]" << flush;  
+  progress_indication ("]");
 }
 
 
@@ -152,12 +154,12 @@ ly_gulp_file (SCM name)
       error (e);
     }
   else
-    *mlog << '[' << s;
+    progress_indication ("[" + s );
 
 
   Simple_file_storage f(s);
   SCM result = ly_str02scm (f.ch_C());
-  *mlog << "]";
+  progress_indication ("]");
   return result;
 }
 
@@ -171,6 +173,7 @@ ly_display_scm (SCM s)
 String
 ly_scm2string (SCM s)
 {
+  assert (gh_string_p (s));
   int len; 
   char * p = gh_scm2newstr (s , &len);
   
@@ -277,11 +280,13 @@ to_scm (int i)
   return gh_int2scm (i);
 }
 
-void
-scm_to (SCM s, int* i)
+/*
+  UGR. junkme.
+ */
+int
+scm_to (SCM s, int* )
 {
-  // urg
-  *i = gh_number_p (s) ? gh_scm2int (s) : 0;
+  return gh_number_p (s) ? gh_scm2int (s) : 0;
 }
 
 SCM
@@ -290,16 +295,45 @@ to_scm (Real r)
   return gh_double2scm (r);
 }
 
-void
-scm_to (SCM s, Real* r)
+Real
+scm_to (SCM s, Real* )
 {
-  // urg
-  *r = gh_number_p (s) ? gh_scm2double (s) : 0;
+  return gh_number_p (s) ? gh_scm2double (s) : 0;
 }
 
-  
 bool
 to_boolean (SCM s)
 {
   return gh_boolean_p (s) && gh_scm2bool (s);
 }
+
+/*
+  Appendable list L: the cdr contains the list, the car the last cons
+  in the list.
+  
+ */
+
+SCM
+appendable_list ()
+{
+  SCM s = gh_cons (SCM_EOL, SCM_EOL);
+  gh_set_car_x (s, s);
+  
+  return s;
+}
+
+void
+appendable_list_append (SCM l, SCM elt)
+{
+  SCM newcons = gh_cons (elt, SCM_EOL);
+  
+  gh_set_cdr_x (gh_car (l), newcons);      
+  gh_set_car_x (l, newcons);
+}
+
+
+SCM
+ly_offset2scm (Offset o)
+{
+  return gh_cons (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]));
+}