Fix issue 542: Harden Grob::relative_coordinate()

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

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index e8f5aefdf88c7659b5cdf32741f1934904b9823a..b1ee537baa1abafb3cd9aecb5b0570634dd054f1 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -19,6 +19,37 @@
 #include "output-def.hh"
 #include "modified-font-metric.hh"
 
+static void
+replace_whitespace (string *str)
+{
+  vsize i = 0;
+  vsize n = str->size ();
+
+  while (i < n)
+    {
+      vsize char_len = 1;
+      char cur = (*str)[i];
+      
+      // U+10000 - U+10FFFF
+      if ((cur & 0x11110000) == 0x11110000)
+       char_len = 4;
+      // U+0800 - U+FFFF
+      else if ((cur & 0x11100000) == 0x11100000)
+       char_len = 3;
+      // U+0080 - U+07FF
+      else if ((cur & 0x11000000) == 0x11000000)
+       char_len = 2;
+      else if (cur & 0x10000000)
+       programming_error ("invalid utf-8 string");
+      else
+       // avoid the locale-dependent isspace
+       if (cur == '\n' || cur == '\t' || cur == '\v')
+         (*str)[i] = ' ';
+
+      i += char_len;
+    }
+}
+
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3);
 SCM
 Text_interface::interpret_string (SCM layout_smob,
@@ -31,6 +62,8 @@ Text_interface::interpret_string (SCM layout_smob,
   string str = ly_scm2string (markup);
   Output_def *layout = unsmob_output_def (layout_smob);
   Font_metric *fm = select_encoded_font (layout, props);
+
+  replace_whitespace (&str);
   return fm->word_stencil (str).smobbed_copy ();
 }