* 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 8a021e004b27e2e0dc35105c3f8d9904f862094b..70a7609d21144fb1fb94e1f1ae17101c2cbae084 100644 (file)
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
- (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -19,13 +19,15 @@ class Text_item
 {
 public:
   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);
-
+  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:
-  static Molecule lookup_character (Score_element *me, Font_metric*, SCM char_name);
-  static Molecule lookup_text (Score_element *me, Font_metric*, SCM text);
+  static Molecule lookup_character (Grob *me, Font_metric*, SCM char_name);
+  static Molecule lookup_text (Grob *me, Font_metric*, SCM text);
 };
 
 #endif /* TEXT_ITEM */