*** empty log message ***

[lilypond.git] / lily / include / text-item.hh

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 70a7609d21144fb1fb94e1f1ae17101c2cbae084..b66a63b7bba313cfe56eab1521cee1e48a7b9a06 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,9 +1,9 @@
 /*   
-  text-item.hh -- declare Text_item
+  text-item.hh -- declare markup functions
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -11,23 +11,16 @@
 #define TEXT_ITEM
 
 
-#include "lily-proto.hh"
-#include "lily-guile.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 
-class Text_item
+class Text_interface
 {
 public:
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
-  DECLARE_SCHEME_CALLBACK (text_to_molecule, (SCM,SCM, SCM));
-  static Molecule text2molecule (Grob *me, SCM text, SCM properties);
-  static Molecule string2molecule (Grob *me, SCM text, SCM properties);
-  static Molecule markup_text2molecule (Grob *me, SCM markup_text, SCM properties);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (interpret_markup, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (interpret_string, (SCM, SCM, SCM));
   static bool has_interface (Grob*);
-  
-private:
-  static Molecule lookup_character (Grob *me, Font_metric*, SCM char_name);
-  static Molecule lookup_text (Grob *me, Font_metric*, SCM text);
+  static bool markup_p (SCM) ;
 };
 
 #endif /* TEXT_ITEM */