X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=b07acd6ef0b4f6477ed646da3d49a7e20c5299c0;hb=37ca1f80bf5401accd17056938f4f7b2c147ddb2;hp=9f7bb3f023a2915e82107aadcf68a9b44523d6bb;hpb=51c60f298f38254add022ecc3df3c7c8a265b1b4;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 9f7bb3f023..b07acd6ef0 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,65 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#ifndef LOOKUPSYMS_HH
-#define LOOKUPSYMS_HH
-
-#include "atom.hh"
-#include "fproto.hh"
-#include "scalar.hh"
-#include "direction.hh"
-
-/** handy interface to symbol table
- */
-struct Lookup {
-  Paper_def * paper_l_;
-  Symtables *symtables_p_;
-  String texsetting;
-
-  Lookup();
-  Lookup (Lookup const &);
-  ~Lookup();
-  
-  void add (String, Symtable*);
-  void print() const;
-
-  Atom fill (Box b) const;
-  Atom beam_element (int,int,Real=0) const;
-
-  /// round slope to closest TeXslope
-  Atom beam (Real&,Real, Real) const;
-  Atom ps_beam (Real, Real, Real)const;
-  Atom tex_beam (Real&, Real) const;
-
-  Atom streepje (int type) const;
-
-  Atom vbrace (Real &dy) const;
-  Atom vbracket (Real &dy) const;
-  Atom meter (Array<Scalar>) const;
-  Atom stem (Real y1_pos, Real y2_pos) const;
-  Atom rule_symbol (Real height, Real width) const;
-  Atom accidental (int) const;
-  Atom ball (int) const;
-  Atom flag (int, Direction) const;
-  Atom rest (int, bool outside) const;
-  Atom clef (String) const;
-  Atom bar (String, Real height) const;
-    
-  Atom dots () const;
-  Atom slur (Real &dy, Real &dx, Real ht, Direction dir) const;
-  Atom plet (Real &dy, Real &dx, Direction dir) const;
-  Atom tex_slur (int dy, Real &dx, Direction dir) const;
-  Atom ps_slur (Real dy, Real dx, Real ht, Real dir) const;
-  Atom half_slur (int dy, Real &dx, Direction dir, int xpart) const;
-  Atom half_slur_middlepart (Real &dx, Direction dir) const;
-  Atom big_slur (int dy, Real &dx, Direction dir) const;
-  Atom text (String style, String text, int align = 1) const;
-  Atom script (String idx) const;
-  Atom hairpin (Real & width, bool decresc, bool continued) const;
-  Atom dynamic (String) const;
+#ifndef LOOKUP_HH
+#define LOOKUP_HH
+
+#include "stencil.hh"
+#include "std-vector.hh"
+
+struct Lookup
+{
+  static Stencil dot (Offset p, Real radius);
+  static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, 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 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
+#endif // LOOKUP_HH