X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftext-interface.cc;h=0feb99adb6c57991ee6491fc912ec0386f381f89;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=985b05989b18709bf775c308527f606dd5a78f99;hpb=17869287cdfbcfa3962263c2cfb6b3f435e4c19f;p=lilypond.git

diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 985b05989b..0feb99adb6 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "text-interface.hh"
 
-#include <math.h>
 
 #include "main.hh"
 #include "config.hh"
@@ -20,26 +19,63 @@
 #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,
 				  SCM props,
 				  SCM markup)
 {
-  Output_def *layout = unsmob_output_def (layout_smob);
-
-  SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
-		   __FUNCTION__, "Layout definition");
-  SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3,
-		   __FUNCTION__, "string");
-
-  String str = ly_scm2string (markup);
+  LY_ASSERT_SMOB (Output_def, layout_smob, 1);
+  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);
-  return fm->text_stencil (str).smobbed_copy ();
+
+  replace_whitespace (&str);
+  return fm->word_stencil (str).smobbed_copy ();
 }
 
-MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Text_interface, interpret_markup, 3, 0,
+				   "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)
 {
@@ -56,9 +92,11 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
     }
   else
     {
-      programming_error ("not a markup: ");
+      programming_error ("Object is not a markup. ");
+      scm_puts ("This object should be a markup: ", scm_current_error_port ());
       scm_display (markup, scm_current_error_port ());
-      abort();
+      scm_puts ("\n", scm_current_error_port ());
+
       Box b;
       b[X_AXIS].set_empty ();
       b[Y_AXIS].set_empty ();
@@ -76,7 +114,7 @@ Text_interface::print (SCM grob)
 
   SCM t = me->get_property ("text");
   SCM chain = Font_interface::text_font_alist_chain (me);
-  return interpret_markup (me->get_layout ()->self_scm (), chain, t);
+  return interpret_markup (me->layout ()->self_scm (), chain, t);
 }
 
 /* Ugh. Duplicated from Scheme.  */
@@ -90,8 +128,24 @@ Text_interface::is_markup (SCM x)
 				      ly_symbol2scm ("markup-signature"))));
 }
 
-ADD_INTERFACE (Text_interface, "text-interface",
-	       "A scheme markup text, see @usermanref{Text 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));
+}
+
+
+ADD_INTERFACE (Text_interface,
+	       "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 "