* lily/text-item.cc (text_to_molecule): new function

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

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 4102ba5e88207d2e41fafe341c556ac94a971812..70a7609d21144fb1fb94e1f1ae17101c2cbae084 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,47 +1,33 @@
-/*
-  text-item.hh -- part of GNU LilyPond
+/*   
+  text-item.hh -- declare Text_item
 
-  (c) 1996,97 Han-Wen Nienhuys
-*/
-
-#ifndef TEXT_ITEM_HH
-#define TEXT_ITEM_HH
-
-#include "text-def.hh"
-#include "item.hh"
-#include "staff-side.hh"
-
-/**
-  print a fixed width text above or below the staff.
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
  */
-class Text_item : public Item ,public Staff_side
-{
-public:
-public:
 
-    /// do I have width?
-    bool fat_b_;
-    
-    /* ***************/
+#ifndef TEXT_ITEM
+#define TEXT_ITEM
 
-    Text_item (General_script_def* ,Direction dir=0);
-    virtual ~Text_item ();
-    DECLARE_MY_RUNTIME_TYPEINFO;
 
-protected:
-    // ugh: so, are we a text-def, or can this vary?
-    General_script_def* tdef_p_;
-
-    virtual Interval symbol_height () const;
-
-    virtual Molecule* brew_molecule_p () const;
-    virtual void do_pre_processing ();
-    virtual Real get_position_f () const;
+#include "lily-proto.hh"
+#include "lily-guile.hh"
+#include "molecule.hh"
 
+class Text_item
+{
+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);
+  static bool has_interface (Grob*);
+  
 private:
-//    void init (Text_def* tdef_l); 
+  static Molecule lookup_character (Grob *me, Font_metric*, SCM char_name);
+  static Molecule lookup_text (Grob *me, Font_metric*, SCM text);
 };
 
-
-#endif // TEXT_HH
-
+#endif /* TEXT_ITEM */