Run `make grand-replace'.

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

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 4b2f6c444539ddd8fbfe79173ccdbb4500d84f80..0feb99adb6c57991ee6491fc912ec0386f381f89 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -30,16 +30,21 @@ replace_whitespace (string *str)
       vsize char_len = 1;
       char cur = (*str)[i];
       
-      if ((cur & 0x11100000) == 0x11100000)
+      // 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");
-
-      /* avoid the locale-dependent isspace */
-      if (cur == '\n' || cur == '\t' || cur == '\v')
-       (*str)[i] = ' ';
+      else
+       // avoid the locale-dependent isspace
+       if (cur == '\n' || cur == '\t' || cur == '\v')
+         (*str)[i] = ' ';
 
       i += char_len;
     }
@@ -132,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 "