remove TEXMF from variables.

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index eeaf40c30ab1cf982209b97df18f22dee5b89cf8..a45a3c84b873699ec3e1056750e4c3c379cd499c 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,31 +1,96 @@
-/*   
-  text-item.cc -- implement Text_item
+/*
+  text-item.cc -- implement Text_interface
 
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "text-item.hh"
-#include "debug.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
 
-Molecule*
-Text_item::do_brew_molecule_p () const
+#include <math.h>
+
+#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 "modified-font-metric.hh"
+
+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);
+
+  Font_metric *fm = select_encoded_font (layout, props);
+  return fm->text_stencil (str).smobbed_copy ();
+}
+
+MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3);
+SCM
+Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)
+{
+  if (scm_is_string (markup))
+    return interpret_string (layout_smob, props, markup);
+  else if (scm_is_pair (markup))
+    {
+      SCM func = scm_car (markup);
+      SCM args = scm_cdr (markup);
+      if (!markup_p (markup))
+       programming_error ("Markup head has no markup signature.");
+
+      return scm_apply_2 (func, layout_smob, props, args);
+    }
+  else
+    {
+      programming_error ("Is not a markup: ");
+      scm_display (markup, scm_current_error_port ());
+      assert (false);
+      Box b;
+      b[X_AXIS].set_empty ();
+      b[Y_AXIS].set_empty ();
+
+      Stencil s (b, SCM_EOL);
+      return s.smobbed_copy ();
+    }
+}
+
+MAKE_SCHEME_CALLBACK (Text_interface, print, 1);
+SCM
+Text_interface::print (SCM grob)
 {
-  SCM style = get_elt_property (style_scm_sym);
-  String st = (style == SCM_BOOL_F) ? "" : ly_scm2string (gh_cdr (style));
-  
-  Molecule a= paper_l ()->lookup_l(0)->text (st, text_str_, paper_l ());
+  Grob *me = unsmob_grob (grob);
 
-  return new Molecule (a);
+  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);
 }
 
-void
-Text_item::do_print () const
+/* Ugh. Duplicated from Scheme.  */
+bool
+Text_interface::markup_p (SCM x)
 {
-  DEBUG_OUT <<  "text= " << text_str_;
+  return (scm_is_string (x)
+         || (scm_is_pair (x)
+             && SCM_BOOL_F
+             != scm_object_property (scm_car (x),
+                                     ly_symbol2scm ("markup-signature"))));
 }
+
+ADD_INTERFACE (Text_interface, "text-interface",
+              "A scheme markup text, see @usermanref{Text-markup}.",
+              "text baseline-skip word-space");
+