release: 1.3.28

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index be56d94587a97514513ab7c91f778eb9bdec48bb..0ed09ec2de6e83fd1b810e93a9c7e2ecddb6b2cd 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)
@@ -28,10 +29,10 @@ ly_str02scm (char const*c)
 }
 
 SCM
-ly_eval_str (char const*c)
+ly_eval_str (String s)
 {
   // this all really sucks, guile should take char const* arguments!
-  return gh_eval_str ((char*)c);
+  return gh_eval_str ((char*)s.ch_C ());
 }
 
   
@@ -90,9 +91,6 @@ ly_parse_scm (char const* s, int* n)
   return answer;
 }
 
-/*
-  scm_m_quote doesn't use any env, but needs one for a good signature in GUILE.
-*/
 SCM
 ly_quote_scm (SCM s)
 {
@@ -109,6 +107,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 +128,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 +151,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 +170,7 @@ ly_display_scm (SCM s)
 String
 ly_scm2string (SCM s)
 {
+  assert (gh_string_p (s));
   int len; 
   char * p = gh_scm2newstr (s , &len);
   
@@ -217,7 +217,7 @@ ly_isdir_p (SCM s)
 }
 
 
-void
+static void
 init_functions ()
 {
   scm_make_gsubr ("ly-warn", 1, 0, 0, (SCM(*)(...))ly_warning);
@@ -277,11 +277,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,9 +292,50 @@ to_scm (Real r)
   return gh_double2scm (r);
 }
 
+Real
+scm_to (SCM s, Real* )
+{
+  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
-scm_to (SCM s, Real* r)
+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]));
+}
+
+Offset
+ly_scm2offset (SCM s)
 {
-  // urg
-  *r = gh_number_p (s) ? gh_scm2double (s) : 0;
+  return Offset (gh_scm2double (gh_car (s)),
+                gh_scm2double (gh_cdr (s)));
 }