X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftext-item.hh;h=48207f9e656e271da6a9840408d086be4b117bd6;hb=a0c5f43a69fc72f878d7b3f635030f67f1a535db;hp=d70347307a86ebcb914673b2b8c96435d33ec420;hpb=b0064942493df77833e6e41e05d362850f4874b0;p=lilypond.git

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index d70347307a..48207f9e65 100644
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,30 +1,26 @@
 /*   
-  text-item.hh -- declare Text_item
-  
+  text-item.hh -- declare markup functions
+
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#ifndef Text_ITEM_HH
-#define Text_ITEM_HH
+#ifndef TEXT_ITEM
+#define TEXT_ITEM
 
-#include "item.hh"
 
-/**
-   Print a text in specified style.
- */
-class Text_item : public Item
+#include "stencil.hh"
+
+class Text_interface
 {
 public:
-  VIRTUAL_COPY_CONS (Score_element);
-   static SCM scheme_molecule (SCM);
-  
-Text_item (SCM s);
-protected:
-  virtual Molecule do_brew_molecule () const;
+  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*);
+  static bool markup_p (SCM) ;
 };
 
-#endif /* Text_ITEM_HH */
-
+#endif /* TEXT_ITEM */