remove TEXMF from variables.

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

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 931c5b843d49562570b175791c771bf9e893c340..a45a3c84b873699ec3e1056750e4c3c379cd499c 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -1,47 +1,96 @@
-/*   
-  text-item.cc -- implement Text_item
+/*
+  text-item.cc -- implement Text_interface
 
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "debug.hh"
-#include "molecule.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
-#include "staff-symbol-referencer.hh"
-
-struct Text_item
-{
-  static SCM brew_molecule (SCM);
-};
 
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "text-item.hh"
+
+#include <math.h>
 
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Text_item,brew_molecule)
+#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"
 
-SCM 
-Text_item::brew_molecule (SCM sm) 
+MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 3);
+SCM
+Text_interface::interpret_string (SCM layout_smob,
+                                 SCM props,
+                                 SCM markup)
 {
-  Score_element * s = unsmob_element (sm);
-  
-  SCM style = s->get_elt_property ("style");
-  String st = gh_string_p (style) ?  ly_scm2string (style) : "";
-  SCM txt = s-> get_elt_property ("text");
-  String t = gh_string_p (txt) ? ly_scm2string (txt) : "";
+  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);
 
-  Molecule mol =  s->paper_l ()->lookup_l(0)->text (st, t, s->paper_l ());
+  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.");
 
-  SCM space =  s->get_elt_property ("word-space");
-  if (gh_number_p (space))
+      return scm_apply_2 (func, layout_smob, props, args);
+    }
+  else
     {
-      Molecule m;
-      m.set_empty (false);
-      mol.add_at_edge (X_AXIS, RIGHT, m, gh_scm2double (space)*
-                      Staff_symbol_referencer_interface (s).staff_space ());
+      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 ();
     }
-  return mol.create_scheme (); 
 }
 
+MAKE_SCHEME_CALLBACK (Text_interface, print, 1);
+SCM
+Text_interface::print (SCM grob)
+{
+  Grob *me = unsmob_grob (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);
+}
+
+/* Ugh. Duplicated from Scheme.  */
+bool
+Text_interface::markup_p (SCM x)
+{
+  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");