2003 -> 2004

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

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 041db0f26e2bd751dbdf61e2119b77670f5955d2..bfdfb009916681a2072859df6f08e5f2f792ad1b 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,45 +1,32 @@
-/*
-  text-item.hh -- part of GNU LilyPond
+/*   
+  text-item.hh -- declare markup functions
 
-  (c) 1996,97 Han-Wen Nienhuys
-*/
+  source file of the GNU LilyPond music typesetter
+  
+  (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 "text-def.hh"
-#include "item.hh"
-#include "staff-side.hh"
 
-/**
-  print a fixed width text above or below the staff.
- */
-class Text_item : public Item ,public Staff_side{
-    void init(Text_def* tdef_l); 
- 
+#include "lily-proto.hh"
+#include "lily-guile.hh"
+#include "molecule.hh"
+
+class Text_item
+{
 public:
-    Text_def * tdef_l();
-    Text_def const* tdef_c_l();
-    int pos_i_;
-
-    /// do I have width?
-    bool fat_b_;
-    
-    /* ***************/
-
-    Text_item(Text_def*,int dir=0);
-    virtual ~Text_item();
-    NAME_MEMBERS(Text_item);
-
-protected:
-    Text_def* tdef_p_;
-
-    virtual void set_default_index();
-    virtual Molecule* brew_molecule_p() const;
-    virtual void do_post_processing();
-    virtual void do_pre_processing();
+  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_HH
+  
+
 
+#endif /* TEXT_ITEM */