* lily/align-interface.cc (stretch_after_break): new

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 1ef5370e8e9d5f951870aca348c9d937ea59d925..681d1762c02ca4a1d486b7a32d95c7f3265fd5b6 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -14,6 +14,8 @@
 #include <cstring> /* strdup, strchr */
 #include <cctype>
 
+using namespace std;
+
 #include "config.hh"
 
 #include "dimensions.hh"
@@ -103,7 +105,7 @@ gulp_file_to_string (String fn, bool must_exist, int size)
   if (be_verbose_global)
     progress_indication ("[" + s);
 
-  int n = sz;
+  int n = size;
   char *str = gulp_file (s, &n);
   String result ((Byte *) str, n);
   delete[] str;
@@ -611,6 +613,14 @@ robust_scm2double (SCM k, double x)
   return x;
 }
 
+Direction
+robust_scm2dir (SCM d, Direction def)
+{
+  if (is_direction (d))
+    def = to_dir (d);
+  return def;
+}
+
 Interval
 robust_scm2interval (SCM k, Drul_array<Real> v)
 {