release: 1.5.29

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

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 4e628f27870ab4a1333f33c52a2a9e20848cfd1d..8cd1430ebe1b46c4d96aebaefe8ca9ff028bee95 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,30 +1,31 @@
 /*   
   text-item.hh -- declare Text_item
-  
+
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 1998--2002 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:
-  String text_str_;
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (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);
 
-  VIRTUAL_COPY_CONS (Score_element);
-protected:
-  virtual void do_print () const;
-  virtual Molecule *do_brew_molecule_p () const;
+private:
+  static Molecule lookup_character (Grob *me, Font_metric*, SCM char_name);
+  static Molecule lookup_text (Grob *me, Font_metric*, SCM text);
 };
 
-#endif /* Text_ITEM_HH */
-
+#endif /* TEXT_ITEM */