patch::: 1.3.96.jcn7

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 7d2f0b5cb12260649773fcf65423a5485c03fa7b..80e47c21ac120d2f8b5525b45890ee71711eeb63 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,16 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2000 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 "fproto.hh"
+#include "flower-proto.hh"
 #include "direction.hh"
 #include "box.hh"
 
@@ -22,36 +24,24 @@
  */
 class Lookup
 {
-public:
   Lookup ();
   Lookup (Lookup const&);
+  DECLARE_SIMPLE_SMOBS(Lookup,);  
+public:
+
+  static SCM make_lookup ();
+  String font_name_;
+  Adobe_font_metric * afm_l_;
 
-  Molecule simple_bar (String s, Real w, Paper_def*) const;
-  Molecule accidental (int, bool cautionary) const;
   Molecule afm_find (String, bool warn=true) const;
-  Molecule notehead  (int, String) const;
-  Molecule bar (String, Real height, Paper_def*) const;
-  Molecule beam (Real, Real, Real) const;
-  Molecule clef (String) const;
-  Molecule dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
-  Molecule dots () const;
-  Molecule ledger_line (Interval) const;
-  Molecule fill (Box b) const;
-  Molecule filledbox (Box b) const;  
-  Molecule hairpin (Real width, Real height, Real thick, bool decresc, bool continued) const;
-  Molecule tuplet_bracket (Real dy, Real dx, Real gap, Real thick,Real height, Direction dir) const;
-  Molecule rest (int, bool outside, String) const;
   Molecule accordion (SCM arg, Real interline_f) const;
-  Molecule slur (Array<Offset> controls, Real thick) const;
-  Molecule text (String style, String text, Paper_def*) const;
-  Molecule staff_brace (Real dy, int) const;
-  Molecule staff_bracket (Real height, Paper_def* paper_l) const;
-  Molecule volta (Real h, Real w,  Real thick,  bool vert_start, bool vert_end) const;
-  Molecule special_time_signature (String, int,int, Paper_def*) const;
-  Molecule time_signature (int n,int d, Paper_def*) const;
 
-  String font_name_;
-  Adobe_font_metric * afm_l_;
+  static Molecule frame (Box b, Real thick);
+  static Molecule slur (Bezier controls, Real cthick, Real thick) ;
+  static Molecule beam (Real, Real, Real) ;
+  static Molecule dashed_slur (Bezier, Real thick, Real dash) ;
+  static Molecule blank (Box b) ;
+  static Molecule filledbox (Box b) ;  
 };
-
+Lookup* unsmob_lookup (SCM);
 #endif // LOOKUP_HH