X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=abd31a2c696ad2d91a9f392d6b923d52cf30e5b8;hb=ace881437adc0146a62cffa3255ac1ca169bd054;hp=55e7bb7ec4c09a81ed73185271ef0c00a3ab3ef3;hpb=63a3195112d1e2753e2699442841f3c760b2f705;p=lilypond.git

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 55e7bb7ec4..abd31a2c69 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -1,23 +1,54 @@
 /*
-  text-interface.cc -- implement Text_interface
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "text-interface.hh"
 
-
-#include "main.hh"
 #include "config.hh"
-#include "pango-font.hh"
-#include "warn.hh"
-#include "grob.hh"
 #include "font-interface.hh"
-#include "output-def.hh"
+#include "grob.hh"
+#include "main.hh"
+#include "misc.hh"
 #include "modified-font-metric.hh"
+#include "output-def.hh"
+#include "pango-font.hh"
+#include "warn.hh"
+
+static void
+replace_whitespace (string *str)
+{
+  vsize i = 0;
+  vsize n = str->size ();
+
+  while (i < n)
+    {
+      char cur = (*str)[i];
+
+      // avoid the locale-dependent isspace
+      if (cur == '\n' || cur == '\t' || cur == '\v')
+	(*str)[i] = ' ';
+
+      vsize char_len = utf8_char_len (cur);
+
+      i += char_len;
+    }
+}
 
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3);
 SCM
@@ -31,19 +62,32 @@ 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);
-  return fm->word_stencil (str).smobbed_copy ();
+
+  replace_whitespace (&str);
+
+  /*
+    We want to filter strings with a music font that pass through
+    the text interface.  Here the font encoding is checked to see
+    if it matches one of the music font encodings.  --pmccarty
+  */
+  SCM encoding = ly_chain_assoc_get (ly_symbol2scm ("font-encoding"),
+				     props,
+				     SCM_BOOL_F);
+  SCM music_encodings = ly_lily_module_constant ("all-music-font-encodings");
+
+  bool is_music = (scm_memq (encoding, music_encodings) != SCM_BOOL_F);
+  return fm->text_stencil (layout, str, is_music).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 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)
 {
@@ -96,14 +140,24 @@ Text_interface::is_markup (SCM x)
 				      ly_symbol2scm ("markup-signature"))));
 }
 
-ADD_INTERFACE (Text_interface,
-	       "A scheme markup text, see @usermanref{Text markup} and "
-	       "@usermanref{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 ",
+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));
+}
 
-	       /* props */
+
+ADD_INTERFACE (Text_interface,
+	       "A Scheme markup text, see @ruser{Formatting text} and"
+	       " @rextend{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 "