2003 -> 2004

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

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index e3c7a89c33fc66ff398b809f62e43167b837507d..bfdfb009916681a2072859df6f08e5f2f792ad1b 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,27 +1,32 @@
 /*   
-  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 "lily-proto.hh"
+#include "lily-guile.hh"
+#include "molecule.hh"
+
+class Text_item
 {
 public:
-  VIRTUAL_COPY_CONS (Score_element);
-protected:
-  virtual Molecule *do_brew_molecule_p () const;
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
+  DECLARE_SCHEME_CALLBACK (interpret_markup, (SCM, SCM, SCM));
+  static bool has_interface (Grob*);
+  static bool markup_p (SCM) ;
+
 };
 
-#endif /* Text_ITEM_HH */
 
+  
+
+
+#endif /* TEXT_ITEM */