patch::: 1.3.108.jcn1

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

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 818a5a3139e77fd337b8532ca6a57979e4c982d7..8a021e004b27e2e0dc35105c3f8d9904f862094b 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,28 +1,31 @@
 /*   
   text-item.hh -- declare Text_item
-  
+
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+ (c) 1998--2000 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);
-  Text_item (SCM s);
-protected:
-  virtual Molecule do_brew_molecule () const;
-};
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
+  static Molecule text2molecule (Score_element *me, SCM text, SCM properties);
+  static Molecule string2molecule (Score_element *me, SCM text, SCM properties);
+  static Molecule markup_sentence2molecule (Score_element *me, SCM markup_sentence, SCM properties);
 
-#endif /* Text_ITEM_HH */
+private:
+  static Molecule lookup_character (Score_element *me, Font_metric*, SCM char_name);
+  static Molecule lookup_text (Score_element *me, Font_metric*, SCM text);
+};
 
+#endif /* TEXT_ITEM */