($(outdir)/%.pdf): add DVIPS_FLAGS. This will

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

diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh
index 70a7609d21144fb1fb94e1f1ae17101c2cbae084..1ef5255c5d301463222603949702b1280a8bae21 100644 (file)
--- 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -13,21 +13,20 @@
 
 #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));
   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) ;
+
 };
 
+
+  
+
+
 #endif /* TEXT_ITEM */