Merge with master

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index d0f5e33f2c54a4b36933afa8bbf30df0e30810c9..ec8aeede49863aac272095760f1d72810fac4291 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,50 +3,35 @@
 
   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 "smobs.hh"
-#include "lily-guile.hh"
-#include "string.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
 {
-
-
-  Lookup ();
-  Lookup (Lookup const&);
-
-  friend class Brutus;         // kai su, teknon. (make GCC shut up.)
-  
-public:
-  DECLARE_SMOBS;
-  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 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) ;  
-  static Molecule text (String style, String text, Paper_def*) ;
+  static Stencil dot (Offset p, Real radius);
+  static Stencil bracket (Axis a, Interval iv, Real thick, Real protude, Real blot);
+  static Stencil accordion (SCM arg, Real interline_f, Font_metric *fm);
+  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, 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, Real, Real);
+  static Stencil points_to_line_stencil (Real thick, vector<Offset> const &points);
 };
-Lookup* unsmob_lookup (SCM);
+
 #endif // LOOKUP_HH