X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=4950ce6ff5efb43d45a00a52962d1aefc5124ccc;hb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;hp=e1b827e5237ca2c3c426d0ed5ba27910e0db8ce1;hpb=a1d72ee4c631e40978415d31666337beaebceabc;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index e1b827e523..4950ce6ff5 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,55 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LOOKUP_HH
 #define LOOKUP_HH
 
-#include "lily-guile.hh"
+#include "string.hh"
 #include "molecule.hh"
-#include "fproto.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
 {
-public:
-  Lookup ();
-  Lookup (Lookup const&);
-
-  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 flag (int, Direction) const;
-  Molecule hairpin (Real width, Real height, bool decresc, bool continued) const;
-  Molecule tuplet_bracket (Real dy, Real dx, Real thick,Real interline, Direction dir) const;
-  Molecule rest (int, bool outside, String) const;
-  Molecule accordion (SCM arg, Real interline_f) const;
-  Molecule slur (Array<Offset> controls) const;
-  Molecule text (String style, String text, Paper_def*) const;
-  Molecule staff_brace (Real dy) const;
-  Molecule staff_bracket (Real dy) const;
-  Molecule volta (Real w, Real h, Real il, bool last_b) 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 dot (Offset p, Real radius);
+  static Molecule bracket (Axis a, Interval iv, Real thick, Real protude);
+  static Molecule accordion (SCM arg, Real interline_f, Font_metric*fm);
+  static Molecule round_filled_polygon (Array<Offset> points, Real blotdiameter);
+  static Molecule frame (Box b, Real thick);
+  static Molecule slur (Bezier controls, Real cthick, Real thick);
+  static Molecule bezier_sandwich (Bezier top_curve, Bezier bottom_curve);
+  static Molecule horizontal_slope (Real width, Real slope, Real height);
+  static Molecule beam (Real slope, Real width, Real thick);
+  static Molecule dashed_slur (Bezier, Real thick, Real dash);
+  static Molecule blank (Box b);
+  static Molecule filledbox (Box b);
+  static Molecule roundfilledbox (Box b, Real blotdiameter);
+  static Molecule repeat_slash (Real w, Real slope, Real th);
+  static Molecule line (Real th, Offset from, Offset to);
+  static Molecule triangle (Interval, Real, Real);
 };
 
 #endif // LOOKUP_HH