X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=38709a14c541b2d55a02b4c7e2c32de1a7a32f3f;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=160729e9052e05df00910c2b0a44f3754252881a;hpb=6ee8c04678442855cb794d4598c056c15c42673b;p=lilypond.git

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 160729e905..38709a14c5 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--2015 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
@@ -38,6 +38,7 @@
 #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);  */
@@ -49,12 +50,12 @@ SCM ly_truncate_list (int k, SCM lst);
 
 extern SCM global_lily_module;
 
-string gulp_file_to_string (string fn, bool must_exist, int size);
+string gulp_file_to_string (const 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);
+string robust_symbol2string (SCM, const string&);
 Rational ly_scm2rational (SCM);
 SCM ly_rational2scm (Rational);
 SCM ly_offset2scm (Offset);
@@ -71,13 +72,16 @@ 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>);
 Interval robust_scm2interval (SCM, Drul_array<Real>);
 Offset robust_scm2offset (SCM, Offset);
-string robust_scm2string (SCM, string);
+string robust_scm2string (SCM, const 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);
@@ -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_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_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.
@@ -117,15 +121,15 @@ inline SCM ly_bool2scm (bool x) { return scm_from_bool (x); }
 
 inline SCM ly_append2 (SCM x1, SCM x2)
 {
-  return scm_append (scm_listify (x1, x2, SCM_UNDEFINED));
+  return scm_append (scm_list_2 (x1, x2));
 }
 inline SCM ly_append3 (SCM x1, SCM x2, SCM x3)
 {
-  return scm_append (scm_listify (x1, x2, x3, SCM_UNDEFINED));
+  return scm_append (scm_list_3 (x1, x2, x3));
 }
 inline SCM ly_append4 (SCM x1, SCM x2, SCM x3, SCM x4)
 {
-  return scm_append (scm_listify (x1, x2, x3, x4, SCM_UNDEFINED));
+  return scm_append (scm_list_4 (x1, x2, x3, x4));
 }
 
 /*