X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftext-item.hh;h=3ae5cda3fb7b0fa84e4d4ac44e83a0d16052fb1c;hb=5856b3f565bfa6ef87d53b9fa9db7ec961ecf452;hp=1bbd4a689ead3d4755cf0236dab3b1934b2cdac6;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 1bbd4a689e..3ae5cda3fb 100644
--- a/lily/include/text-item.hh
+++ b/lily/include/text-item.hh
@@ -1,9 +1,9 @@
 /*   
-  text-item.hh -- declare Text_item
+  text-item.hh -- declare markup functions
 
   source file of the GNU LilyPond music typesetter
   
-  (c)  1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -13,25 +13,21 @@
 
 #include "lily-proto.hh"
 #include "lily-guile.hh"
-#include "molecule.hh"
+#include "stencil.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);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (interpret_markup, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (interpret_string, (SCM, SCM, SCM, SCM));
   static bool has_interface (Grob*);
-  
-private:
-  static Molecule lookup_character (Grob *me, Font_metric*, SCM char_name);
-  static Molecule lookup_text (Grob *me, Font_metric*, SCM text);
+  static bool markup_p (SCM) ;
+
 };
 
-bool new_markup_p (SCM) ;
-SCM new_markup_brewer ();
+
+  
 
 
 #endif /* TEXT_ITEM */