X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=e5cdbc77f2732aef18d0e38794ccbf950e9aa710;hb=7208189546b5932480e268e805e81e468fcd30e5;hp=976b19e47c0819a32111fea6f28d5261d24ee2ae;hpb=91f01637f31c7d904fd8016b49184e935bf1c8ab;p=lilypond.git

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 976b19e47c..e5cdbc77f2 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -118,7 +118,7 @@ ly_scm2string (SCM str)
 SCM
 ly_string2scm (string const &str)
 {
-  return scm_from_locale_stringn (str.c_str(),
+  return scm_from_locale_stringn (str.c_str (),
 				  str.length ());
 }
 
@@ -126,7 +126,7 @@ ly_string2scm (string const &str)
 char *
 ly_scm2newstr (SCM str, size_t *lenp)
 {
-  SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_TYPE (scm_is_string, str, 1);
 
   size_t len = scm_i_string_length (str);
   if (char *new_str = (char *) malloc ((len + 1) * sizeof (char)))
@@ -308,7 +308,7 @@ ly_offsets2scm (vector<Offset> os)
   for (vsize i = 0; i < os.size (); i++)
     {
       *tail = scm_cons (ly_offset2scm (os[i]), SCM_EOL);
-      tail = SCM_CDRLOC(*tail);
+      tail = SCM_CDRLOC (*tail);
     }
   return l;
 }
@@ -630,11 +630,16 @@ mangle_cxx_identifier (string cxx_id)
       cxx_id = "ly:" + cxx_id;
     }
   if (cxx_id.substr (cxx_id.length () - 2) == "_p")
-    cxx_id = cxx_id.replace (cxx_id.length () - 2, 1, "?");
+    cxx_id = cxx_id.replace (cxx_id.length () - 2, 2, "?");
   else if (cxx_id.substr (cxx_id.length () - 2) == "_x")
-    cxx_id = cxx_id.replace (cxx_id.length () - 2, 1, "!");
+    cxx_id = cxx_id.replace (cxx_id.length () - 2, 2, "!");
 
+  cxx_id = replace_all (cxx_id, "_less?", "<?");
+  cxx_id = replace_all (cxx_id, "_2_", "->");
+  cxx_id = replace_all (cxx_id, "__", "::");
   cxx_id = replace_all (cxx_id, '_', '-');
+
+
   return cxx_id;
 }