release: 1.3.50

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 036bd19039bfe4614ba41f1a2f6291c56d9802f8..38a409cb8787935b002c549c4b231ca876c5d7d0 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <math.h>              // isinf
 
 #include "libc-extension.hh"
 #include "lily-guile.hh"
@@ -28,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 (String s)
-{
-  // this all really sucks, guile should take char const* arguments!
-  return gh_eval_str ((char*)s.ch_C ());
-}
+ly_eval_str (String s);
+#endif
 
   
 /*
@@ -91,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)
 {
@@ -125,7 +125,7 @@ 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);
@@ -136,7 +136,7 @@ read_lily_scm_file (String fn)
 
   Simple_file_storage f(s);
   
-  ly_eval_str ((char *) f.ch_C());
+  gh_eval_str ((char *) f.ch_C());
   progress_indication ("]");
 }
 
@@ -148,7 +148,7 @@ 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);
@@ -220,16 +220,6 @@ ly_isdir_p (SCM s)
 }
 
 
-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);  
-}
-
-ADD_SCM_INIT_FUNC(funcs, init_functions);
-
 
 typedef void (*Void_fptr)();
 Array<Void_fptr> *scm_init_funcs_;
@@ -274,32 +264,7 @@ to_dir (SCM s)
 }
 
 
-SCM
-to_scm (int i)
-{
-  return gh_int2scm (i);
-}
-
-/*
-  UGR. junkme.
- */
-int
-scm_to (SCM s, int* )
-{
-  return gh_number_p (s) ? gh_scm2int (s) : 0;
-}
-
-SCM
-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)
@@ -335,3 +300,82 @@ 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);