X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=509dece604d31f96cef2345cd141615e0c836461;hb=38925347b5370c7eb06f7baaeac8a461a0a12ac4;hp=2a227470fed0d3ed23510f278459e844e8983b8f;hpb=aaa52903d633cdeaa642c20ab42ec268f4e17a2b;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 2a227470fe..509dece604 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,47 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LOOKUP_HH
 #define LOOKUP_HH
 
-#include "lily-guile.hh"
-#include "molecule.hh"
-#include "flower-proto.hh"
-#include "direction.hh"
-#include "box.hh"
+#include "stencil.hh"
+#include "std-vector.hh"
 
-/**
-   handy interface to symbol table
-   TODO: move this into GUILE?
- */
-class Lookup
+struct Lookup
 {
-public:
-  String font_name_;
-  Adobe_font_metric * afm_l_;
-
-
-  Lookup ();
-  Lookup (Lookup const&);
-
-  Molecule simple_bar (String s, Real w, Paper_def*) const;
-  Molecule afm_find (String, bool warn=true) const;
-  Molecule bar (String, Real height, Paper_def*) const;
-  Molecule accordion (SCM arg, Real interline_f) const;
-
-  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 fill (Box b) ;
-  static Molecule filledbox (Box b) ;  
-  static Molecule text (String style, String text, Paper_def*) ;
-  static Molecule staff_brace (Real dy, int) ;
-  static Molecule staff_bracket (Real height, Paper_def* paper_l) ;
+  static Stencil dot (Offset p, Real radius);
+  static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot);
+  static Stencil rotated_box (Real slope, Real width, Real thick, Real blot);
+  static Stencil round_filled_polygon (vector<Offset> const &points, Real blotdiameter);
+  static Stencil frame (Box b, Real thick, Real blot);
+  static Stencil slur (Bezier controls, Real cthick, Real thick);
+  static Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve);
+  static Stencil beam (Real slope, Real width, Real thick, Real blot);
+  static Stencil dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction);
+  static Stencil blank (Box b);
+  static Stencil filled_box (Box b);
+  static Stencil round_filled_box (Box b, Real blotdiameter);
+  static Stencil repeat_slash (Real w, Real slope, Real th);
+  static Stencil horizontal_line (Interval w, Real th);
+  static Stencil triangle (Interval iv, Real thick, Real protrude);
+  static Stencil points_to_line_stencil (Real thick, vector<Offset> const &points);
 };
 
 #endif // LOOKUP_HH