Fix doc string

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

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 96444e10ab6537319b2471009988fe0eb57998a4..8b55618521af2ae9bc9bc5df032a1a6cfec1459b 100644 (file)
--- 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--2009 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);
@@ -49,9 +72,9 @@ MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Text_interface, interpret_markup, 3, 0,
 "  Takes three arguments, @var{layout}, @var{props}, and @var{markup}.\n"
 "\n"
 "@var{layout} is a @code{\\layout} block; it may be obtained from a grob with"
-" @code{ly:grob-layout}.  @var{props} is a alist chain, ie. a list of alists."
-"  This is typically obtained with"
-" @code{(ly:grob-alist-chain (ly:layout-lookup layout 'text-font-defaults))}."
+" @code{ly:grob-layout}.  @var{props} is an alist chain, i.e. a list of"
+"  alists.  This is typically obtained with"
+" @code{(ly:grob-alist-chain grob (ly:output-def-lookup layout 'text-font-defaults))}."
 "  @var{markup} is the markup text to be processed.");
 SCM
 Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
@@ -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 "