New alist to replace special characters.

[lilypond.git] / lily / text-interface.cc

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 7bb4ceadc07c53ded50199d088572280975b1308..53d5af4232165e94920b506d092c9fbe6f933375 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -31,22 +31,36 @@
 #include "warn.hh"
 
 static void
-replace_whitespace (string *str)
+replace_special_characters (string *str, SCM props)
 {
   vsize i = 0;
-  vsize n = str->size ();
+  SCM replacement_alist = ly_chain_assoc_get (ly_symbol2scm ("replacement-alist"),
+                                              props,
+                                              SCM_BOOL_F);
 
-  while (i < n)
-    {
-      char cur = (*str)[i];
-
-      // avoid the locale-dependent isspace
-      if (cur == '\n' || cur == '\t' || cur == '\v')
-        (*str)[i] = ' ';
+  if (!to_boolean (scm_list_p (replacement_alist))
+        || to_boolean (scm_null_p (replacement_alist)))
+    return;
 
-      vsize char_len = utf8_char_len (cur);
+  int max_length = 0;
+  for (SCM s = replacement_alist; scm_is_pair (s); s = scm_cdr (s))
+    {
+      max_length = max (max_length, scm_to_int
+                                        (scm_string_length (scm_caar (s))));
+    }
 
-      i += char_len;
+  while (i <= str->size ())
+    {
+      for (int j = max_length; j > 0; j--)
+        {
+          string dummy = str->substr (i, j);
+          string ligature = robust_scm2string
+                              (ly_assoc_get (ly_string2scm (dummy),
+                              replacement_alist, SCM_BOOL_F), "");
+          if (ligature != "")
+            str->replace (i, j, ligature);
+        }
+      i += utf8_char_len ((*str)[i]);
     }
 }
 
@@ -63,7 +77,7 @@ Text_interface::interpret_string (SCM layout_smob,
   Output_def *layout = unsmob_output_def (layout_smob);
   Font_metric *fm = select_encoded_font (layout, props);
 
-  replace_whitespace (&str);
+  replace_special_characters (&str, props);
 
   /*
     We want to filter strings with a music font that pass through
@@ -158,6 +172,7 @@ ADD_INTERFACE (Text_interface,
 
                /* properties */
                "baseline-skip "
+               "replacement-alist "
                "text "
                "word-space "
                "text-direction "