release: 1.3.38

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 93e1651cc0a4ad55cdc736d51e27902377aab84c..38a409cb8787935b002c549c4b231ca876c5d7d0 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>
 */
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <math.h>              // isinf
 
 #include "libc-extension.hh"
 #include "lily-guile.hh"
@@ -19,6 +20,7 @@
 #include "file-path.hh"
 #include "debug.hh"
 #include "direction.hh"
+#include "offset.hh"
 
 SCM
 ly_str02scm (char const*c)
@@ -27,12 +29,14 @@ ly_str02scm (char const*c)
   return gh_str02scm ((char*)c);
 }
 
+
+#if 0
+/*
+  this all really sucks, LilyPond should not communicate with GUILE using strings.
+ */
 SCM
-ly_eval_str (char const*c)
-{
-  // this all really sucks, guile should take char const* arguments!
-  return gh_eval_str ((char*)c);
-}
+ly_eval_str (String s);
+#endif
 
   
 /*
@@ -90,9 +94,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 +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));
 }
 
@@ -123,19 +125,19 @@ read_lily_scm_file (String fn)
   String s = global_path.find (fn);
   if (s == "")
     {
-      String e = _f ("Can't find file: `%s'", fn);
+      String e = _f ("can't find file: `%s'", fn);
       e += " ";
       e += _f ("(load path: `%s')", global_path.str ());
       error (e);
     }
   else
-    *mlog << '[' << s;
+    progress_indication ("[" + s);
 
 
   Simple_file_storage f(s);
   
-  ly_eval_str ((char *) f.ch_C());
-  *mlog << "]" << flush;  
+  gh_eval_str ((char *) f.ch_C());
+  progress_indication ("]");
 }
 
 
@@ -146,18 +148,18 @@ ly_gulp_file (SCM name)
  String s = global_path.find (fn);
   if (s == "")
     {
-      String e = _f ("Can't find file: `%s'", fn);
+      String e = _f ("can't find file: `%s'", fn);
       e += " ";
       e += _f ("(load path: `%s')", global_path.str ());
       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);
   
@@ -184,7 +187,7 @@ SCM
 index_cell (SCM s, Direction d)
 {
   assert (d);
-  return (d == LEFT) ? SCM_CAR (s) : SCM_CDR (s);
+  return (d == LEFT) ? gh_car  (s) : gh_cdr (s);
 }
 
 SCM
@@ -197,17 +200,6 @@ index_set_cell (SCM s, Direction d, SCM v)
   return s;
 }
   
-SCM
-array_to_list (SCM *a , int l)
-{
-  SCM list = SCM_EOL;
-  for (int i= l; i--;  )
-    {
-      list =  gh_cons (a[i], list);
-    }
-  return list;
-}
-
 SCM
 ly_warning (SCM str)
 {
@@ -228,16 +220,6 @@ ly_isdir_p (SCM s)
 }
 
 
-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);  
-}
-
-ADD_SCM_INIT_FUNC(funcs, init_functions);
-
 
 typedef void (*Void_fptr)();
 Array<Void_fptr> *scm_init_funcs_;
@@ -282,3 +264,118 @@ to_dir (SCM s)
 }
 
 
+
+
+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]));
+}
+
+Offset
+ly_scm2offset (SCM s)
+{
+  return Offset (gh_scm2double (gh_car (s)),
+                gh_scm2double (gh_cdr (s)));
+}
+
+SCM
+ly_type (SCM exp)
+{
+  char const  * cp = "unknown";
+  if (gh_number_p (exp))
+    {
+      cp = "number";
+    }
+  else if (gh_string_p (exp))
+    {
+      cp = "string";
+    }
+  else if (gh_procedure_p (exp))
+    {
+      cp = "procedure";
+    }
+  else if (gh_boolean_p (exp))
+    {
+      cp = "boolean";
+    }
+  else if (gh_pair_p (exp))
+    {
+      cp = "list";
+    }
+
+  return ly_str02scm (cp);
+}
+
+/*
+  convert without too many decimals, and leave  a space at the end.
+ */
+   
+   
+SCM
+ly_number2string (SCM s)
+{
+  assert (gh_number_p (s));
+
+  char str[100];                       // ugh.
+
+  if (scm_integer_p (s))
+    {
+      Real r (gh_scm2double (s));
+
+      if (isinf (r) || isnan (r))
+       {
+         programming_error ("Infinity or NaN encountered while converting Real number; setting to zero.");
+         r = 0.0;
+       }
+
+      sprintf (str, "%8.4f ", r);
+    }
+  else
+    {
+      sprintf (str, "%d ", gh_scm2int (s));
+    }
+
+  return gh_str02scm (str);
+}
+
+
+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 ("ly-number->string", 1, 0,0, (SCM(*)(...)) ly_number2string);
+}
+
+ADD_SCM_INIT_FUNC(funcs, init_functions);