Fix trivial bug introduced in commit fb88079204f0fd758f271f88bd7b2f3d8102b6fc

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

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 0c514a35d8aec694612fdb288a4a25c5c991c1ea..96444e10ab6537319b2471009988fe0eb57998a4 100644 (file)
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -19,6 +19,14 @@
 #include "output-def.hh"
 #include "modified-font-metric.hh"
 
+static void
+replace_whitespace (string *str)
+{
+  for (vsize i = 0; i < str->size (); i++)
+    if (isspace ((*str)[i]))
+      (*str)[i] = ' ';
+}
+
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3);
 SCM
 Text_interface::interpret_string (SCM layout_smob,
@@ -31,19 +39,20 @@ 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 ();
 }
 
 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)
 {
@@ -105,8 +114,8 @@ Text_interface::is_markup_list (SCM 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 ",