X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=b1ee537baa1abafb3cd9aecb5b0570634dd054f1;hb=39d2ba6c5a153725e23157fb3876cd7e88cc131f;hp=86a1381bb411312e28b337640fe814e5a1dfcbb6;hpb=e9a308e9c6002900fc336733950a0175bcbcc333;p=lilypond.git

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 86a1381bb4..b1ee537baa 100644
--- 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,
@@ -26,24 +57,25 @@ Text_interface::interpret_string (SCM layout_smob,
 				  SCM markup)
 {
   LY_ASSERT_SMOB (Output_def, layout_smob, 1);
-  LY_ASSERT_TYPE (scm_is_string, props, 3);
+  LY_ASSERT_TYPE (scm_is_string, markup, 3);
 
   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 ();
 }
 
 MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Text_interface, interpret_markup, 3, 0,
-				   "Convert a text markup into a stencil. "
-"Takes 3 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))}. "
-"@var{markup} is the markup text to be processed. "
-				   );
+				   "Convert a text markup into a stencil."
+"  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))}."
+"  @var{markup} is the markup text to be processed.");
 SCM
 Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
 {
@@ -96,9 +128,17 @@ Text_interface::is_markup (SCM x)
 				      ly_symbol2scm ("markup-signature"))));
 }
 
+bool
+Text_interface::is_markup_list (SCM x)
+{
+  SCM music_list_p = ly_lily_module_constant ("markup-list?");
+  return scm_is_true (scm_call_1 (music_list_p, x));
+}
+
+
 ADD_INTERFACE (Text_interface,
-	       "A scheme markup text, see @usermanref{Text markup} and "
-	       "@usermanref{New markup command definition}. "
+	       "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 ",