X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=0feb99adb6c57991ee6491fc912ec0386f381f89;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=96444e10ab6537319b2471009988fe0eb57998a4;hpb=23efbcbaa7dab9303faec9fc0aca4fec805e550c;p=lilypond.git

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 96444e10ab..0feb99adb6 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -22,9 +22,32 @@
 static void
 replace_whitespace (string *str)
 {
-  for (vsize i = 0; i < str->size (); i++)
-    if (isspace ((*str)[i]))
-      (*str)[i] = ' ';
+  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);
@@ -114,13 +137,15 @@ Text_interface::is_markup_list (SCM x)
 
 
 ADD_INTERFACE (Text_interface,
-	       "A scheme markup text, see @ruser{Text markup} and "
-	       "@ruser{New markup command definition}. "
-	       "\n\n"
-	       "There are two important commands: ly:text-interface::print, which is a "
-	       "grob callback, and ly:text-interface::interpret-markup ",
-
-	       /* props */
+	       "A Scheme markup text, see @ruser{Formatting text} and"
+	       " @ruser{New markup command definition}.\n"
+	       "\n"
+	       "There are two important commands:"
+	       " @code{ly:text-interface::print}, which is a"
+	       " grob callback, and"
+	       " @code{ly:text-interface::interpret-markup}.",
+
+	       /* properties */
 	       "baseline-skip "
 	       "text "
 	       "word-space "