Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 3ab11f3ccc89f17676cc722ab39cc2cdb9f72305..e44e47f4be27f6f30b64817b760191a678e4441f 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -75,7 +75,7 @@ ly_quote_scm (SCM s)
   return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
 }
 
-std::string
+string
 ly_symbol2string (SCM s)
 {
   /*
@@ -85,15 +85,15 @@ ly_symbol2string (SCM s)
   return ly_scm2string (str);
 }
 
-std::string
-gulp_file_to_string (std::string fn, bool must_exist, int size)
+string
+gulp_file_to_string (string fn, bool must_exist, int size)
 {
-  std::string s = global_path.find (fn);
+  string s = global_path.find (fn);
   if (s == "")
     {
       if (must_exist)
        {
-         std::string e = _f ("can't find file: `%s'", fn);
+         string e = _f ("can't find file: `%s'", fn);
          e += " ";
          e += _f ("(load path: `%s')", global_path.to_string ());
          error (e);
@@ -107,7 +107,7 @@ gulp_file_to_string (std::string fn, bool must_exist, int size)
 
   int n = size;
   char *str = gulp_file (s, &n);
-  std::string result (str, n);
+  string result (str, n);
   delete[] str;
 
   if (be_verbose_global)
@@ -126,11 +126,11 @@ extern "C" {
   }
 };
 
-std::string
+string
 ly_scm2string (SCM str)
 {
   assert (scm_is_string (str));
-  return std::string (scm_i_string_chars (str),
+  return string (scm_i_string_chars (str),
                     (int) scm_i_string_length (str));
 }
 
@@ -179,21 +179,21 @@ is_number_pair (SCM p)
 }
 
 typedef void (*Void_fptr) ();
-Array<Void_fptr> *scm_init_funcs_;
+vector<Void_fptr> *scm_init_funcs_;
 
 void add_scm_init_func (void (*f) ())
 {
   if (!scm_init_funcs_)
-    scm_init_funcs_ = new Array<Void_fptr>;
+    scm_init_funcs_ = new vector<Void_fptr>;
 
-  scm_init_funcs_->push (f);
+  scm_init_funcs_->push_back (f);
 }
 
 void
 ly_init_ly_module (void *)
 {
-  for (int i = scm_init_funcs_->size (); i--;)
-    (scm_init_funcs_->elem (i)) ();
+  for (vsize i = scm_init_funcs_->size (); i--;)
+    (scm_init_funcs_->at (i)) ();
 
   if (be_verbose_global)
     {
@@ -356,11 +356,11 @@ ly_assoc_cdr (SCM key, SCM alist)
 }
 
 SCM
-ly_string_array_to_scm (Array<std::string> a)
+ly_string_array_to_scm (vector<string> a)
 {
   SCM s = SCM_EOL;
-  for (int i = a.size () - 1; i >= 0; i--)
-    s = scm_cons (ly_symbol2scm (a[i].c_str ()), s);
+  for (vsize i = a.size (); i ; i--)
+    s = scm_cons (ly_symbol2scm (a[i - 1].c_str ()), s);
   return s;
 }
 
@@ -370,10 +370,10 @@ parse_symbol_list (char const *symbols)
 {
   while (isspace (*symbols))
     *symbols++;
-  std::string s = symbols;
+  string s = symbols;
   replace_all (s, '\n', ' ');
   replace_all (s, '\t', ' ');
-  return ly_string_array_to_scm (String_convert::split (s, ' '));
+  return ly_string_array_to_scm (string_split (s, ' '));
 }
 
 SCM
@@ -394,10 +394,10 @@ ly_truncate_list (int k, SCM lst)
   return lst;
 }
 
-std::string
+string
 print_scm_val (SCM val)
 {
-  std::string realval = ly_scm2string (ly_write2scm (val));
+  string realval = ly_scm2string (ly_write2scm (val));
   if (realval.length () > 200)
     realval = realval.substr (0, 100)
       + "\n :\n :\n"
@@ -498,7 +498,9 @@ scm_default_compare (void const *a, void const *b)
   return pa < pb ? -1 : 1;
 }
 
-/*  Modify LST in place: qsort it.  */
+/*  Modify LST in place: qsort it.
+
+FIXME: unused, junk? */
 SCM
 ly_list_qsort_uniq_x (SCM lst)
 {
@@ -721,3 +723,22 @@ procedure_arity (SCM proc)
   SCM fixed = scm_car (arity);
   return scm_to_int (fixed);
 }
+
+string
+mangle_cxx_identifier (string cxx_id)
+{
+  if (cxx_id.substr (0, 3) == "ly_")
+    cxx_id = cxx_id.replace (0, 3, "ly:");
+  else
+    {
+      cxx_id = String_convert::to_lower (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, "?");
+  else if (cxx_id.substr (cxx_id.length () - 2) == "_x")
+    cxx_id = cxx_id.replace (cxx_id.length () - 2, 1, "!");
+
+  cxx_id = replace_all (cxx_id, '_', '-');
+  return cxx_id;
+}