X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;fp=lily%2Finclude%2Flily-guile.hh;h=f2b8f08ba17bfa00fcae3aacf13035d68a30aa17;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=3fefd5dc3c35bf0d34d3886757f2a13282bb10c6;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 3fefd5dc3c..f2b8f08ba1 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,13 +31,14 @@
   Hack for various MacOS incarnations.
  */
 #ifndef GUILE_ELLIPSIS
-#define GUILE_ELLIPSIS 
+#define GUILE_ELLIPSIS
 #endif
 
 #include "guile-compatibility.hh"
 #include "interval.hh"
 #include "lily-guile-macros.hh"
 #include "ly-module.hh"
+#include "std-vector.hh"
 
 /** Conversion functions follow the GUILE naming convention, i.e.
     A ly_B2A (B b);  */
@@ -54,6 +55,7 @@ string gulp_file_to_string (string fn, bool must_exist, int size);
 SCM ly_string2scm (string const &s);
 string ly_scm2string (SCM s);
 string ly_symbol2string (SCM);
+string robust_symbol2string (SCM, string);
 Rational ly_scm2rational (SCM);
 SCM ly_rational2scm (Rational);
 SCM ly_offset2scm (Offset);
@@ -70,6 +72,7 @@ char *ly_scm2str0 (SCM str);
 
 Real robust_scm2double (SCM, double);
 int robust_scm2int (SCM, int);
+vsize robust_scm2vsize (SCM, vsize);
 Direction robust_scm2dir (SCM, Direction);
 Drul_array<Real> robust_scm2drul (SCM, Drul_array<Real>);
 Drul_array<bool> robust_scm2booldrul (SCM, Drul_array<bool>);
@@ -77,8 +80,9 @@ Interval robust_scm2interval (SCM, Drul_array<Real>);
 Offset robust_scm2offset (SCM, Offset);
 string robust_scm2string (SCM, string);
 Rational robust_scm2rational (SCM, Rational);
+vector<Real> ly_scm2floatvector (SCM);
+SCM ly_floatvector2scm (vector<Real> v);
 
-  
 SCM ly_quote_scm (SCM s);
 bool type_check_assignment (SCM val, SCM sym, SCM type_symbol);
 string print_scm_val (SCM val);
@@ -93,13 +97,13 @@ SCM ly_hash2alist (SCM tab);
 SCM ly_hash_table_keys (SCM tab);
 
 SCM ly_assoc_prepend_x (SCM alist, SCM key, SCM val);
-inline bool ly_is_fraction (SCM x) { return SCM_FRACTIONP(x) || scm_is_integer (x); }
-    
-inline bool ly_is_list (SCM x) { return SCM_NFALSEP (scm_list_p (x)); }
+
+inline bool ly_is_list (SCM x) { return scm_is_true (scm_list_p (x)); }
 inline bool ly_cheap_is_list (SCM x) { return scm_is_pair (x) || x == SCM_EOL; }
-inline bool ly_is_procedure (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); }
-inline bool ly_is_port (SCM x) { return SCM_NFALSEP (scm_port_p (x)); }
+inline bool ly_is_procedure (SCM x) { return scm_is_true (scm_procedure_p (x)); }
+inline bool ly_is_port (SCM x) { return scm_is_true (scm_port_p (x)); }
 
+bool ly_is_rational (SCM);
 /*
   want to take the address of this function; scm_is_symbol() is a
   macro.
@@ -108,12 +112,12 @@ inline bool ly_is_symbol (SCM x) { return scm_is_symbol (x); }
 
 inline bool ly_is_equal (SCM x, SCM y)
 {
-  return SCM_NFALSEP (scm_equal_p (x, y));
+  return scm_is_true (scm_equal_p (x, y));
 }
 
-inline bool ly_scm2bool (SCM x) { return SCM_NFALSEP (x); }
+inline bool ly_scm2bool (SCM x) { return scm_is_true (x); }
 inline char ly_scm2char (SCM x) { return (char)SCM_CHAR (x); }
-inline SCM ly_bool2scm (bool x) { return SCM_BOOL (x); }
+inline SCM ly_bool2scm (bool x) { return scm_from_bool (x); }
 
 inline SCM ly_append2 (SCM x1, SCM x2)
 {
@@ -166,7 +170,7 @@ SCM ly_output_formats ();
 /*
   snarfing.
 */
-void add_scm_init_func (void (*) ());
+void add_scm_init_func (void ( *) ());
 
 extern "C" {
   typedef SCM (*Scheme_function_unknown) (GUILE_ELLIPSIS);
@@ -184,7 +188,6 @@ typedef SCM (*Scheme_function_2) (GUILE_ELLIPSIS);
 typedef SCM (*Scheme_function_3) (GUILE_ELLIPSIS);
 #endif
 
-
 /*
   Inline these for performance reasons.
  */
@@ -199,22 +202,19 @@ inline SCM ly_car (SCM x) { return SCM_CAR (x); }
 inline SCM ly_cdr (SCM x) { return SCM_CDR (x); }
 inline bool ly_is_pair (SCM x) { return SCM_I_CONSP (x); }
 
-
-
-#include  "std-vector.hh"
+#include "std-vector.hh"
 
 template<class T>
 SCM
-ly_cxx_vector_to_list  (vector<T> const &src)
+ly_cxx_vector_to_list (vector<T> const &src)
 {
   SCM l = SCM_EOL;
-  for (vsize i = src.size (); i --; )
+  for (vsize i = src.size (); i--;)
     l = scm_cons (src[i]->self_scm (), l);
 
   return l;
 }
 
-
 SCM ly_offsets2scm (vector<Offset> os);
 vector<Offset> ly_scm2offsets (SCM s);