release: 1.3.131

[lilypond.git] / lily / include / lookup.hh

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 80e47c21ac120d2f8b5525b45890ee71711eeb63..4a3dea7e0f9f343cb18e8e1f6d8769e82255b6de 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,39 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LOOKUP_HH
 #define LOOKUP_HH
 
-#include "smobs.hh"
-#include "lily-guile.hh"
 #include "string.hh"
 #include "molecule.hh"
 #include "flower-proto.hh"
 #include "direction.hh"
 #include "box.hh"
 
-/**
-   handy interface to symbol table
-   TODO: move this into GUILE?
- */
-class Lookup
+struct Lookup
 {
-  Lookup ();
-  Lookup (Lookup const&);
-  DECLARE_SIMPLE_SMOBS(Lookup,);  
-public:
-
-  static SCM make_lookup ();
-  String font_name_;
-  Adobe_font_metric * afm_l_;
-
-  Molecule afm_find (String, bool warn=true) const;
-  Molecule accordion (SCM arg, Real interline_f) const;
-
+  static Molecule accordion (SCM arg, Real interline_f, Font_metric*fm);
   static Molecule frame (Box b, Real thick);
   static Molecule slur (Bezier controls, Real cthick, Real thick) ;
   static Molecule beam (Real, Real, Real) ;
@@ -43,5 +26,5 @@ public:
   static Molecule blank (Box b) ;
   static Molecule filledbox (Box b) ;  
 };
-Lookup* unsmob_lookup (SCM);
+
 #endif // LOOKUP_HH