* scm/define-grobs.scm (all-grob-descriptions): use callback to

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 064ed54fabe32b27c46e99ef33e56017f0a2c3e0..e1a0e9bffdc059fde75766d07b559dff3393bd2e 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -114,12 +114,15 @@ gulp_file_to_string (string fn, bool must_exist, int size)
   return result;
 }
 
-void
-ly_display_scm (void *s)
-{
-  scm_display ((SCM)s, scm_current_output_port ());
-  scm_newline (scm_current_output_port ());
-}
+extern "C" {
+  // maybe gdb 5.0 becomes quicker if it doesn't do fancy C++ typing?
+  void
+  ly_display_scm (SCM s)
+  {
+    scm_display (s, scm_current_output_port ());
+    scm_newline (scm_current_output_port ());
+  }
+};
 
 string
 ly_scm2string (SCM str)
@@ -650,6 +653,14 @@ robust_scm2offset (SCM k, Offset o)
   return o;
 }
 
+string
+robust_scm2string (SCM k, string s)
+{
+  if (scm_is_string (k))
+    s = ly_scm2string (k);
+  return s;
+}
+
 int
 robust_scm2int (SCM k, int o)
 {