Run `make grand-replace'.

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 7d2f0b5cb12260649773fcf65423a5485c03fa7b..8de676f26254eedc6b29e22514a363894145d6ba 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,55 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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 "fproto.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:
-  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 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 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