X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Flookup.hh;h=0c5712dd4d14af94b35fa4a1ce6c04220258bfc4;hb=a0a40c02de757661518577105dbb644a6ecdbc4d;hp=1781679920ecb921bf60429097ef6b1816603221;hpb=2fd39fbbb1ad87d1bb7ad325862711919f3e7d4c;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 1781679920..0c5712dd4d 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,64 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LOOKUP_HH
 #define LOOKUP_HH
 
-#include "atom.hh"
-#include "fproto.hh"
-#include "scalar.hh"
+#include "string.hh"
+#include "molecule.hh"
+#include "flower-proto.hh"
 #include "direction.hh"
-#include "curve.hh"
-#include "afm.hh"
-#include "symtable.hh"
 #include "box.hh"
 
-/** handy interface to symbol table
- */
-class Lookup
+struct Lookup
 {
-public:
-  Lookup ();
-  Lookup (Lookup const&);
-  Lookup (Symtables const&);
-  ~Lookup ();
-  
-  Atom accidental (int) const;
-  void add (String, Symtable*);
-  Atom afm_find (String) const;
-  Atom ball (int) const;
-  Atom bar (String, Real height) const;
-  Atom beam (Real, Real, Real) const;
-  Atom clef (String) const;
-  Atom dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
-  Atom dots () const;
-  Atom dynamic (String) const;
-  Atom fill (Box b) const;
-  Atom flag (int, Direction) const;
-  Atom hairpin (Real width, bool decresc, bool continued) const;
-  Atom plet (Real dy, Real dx, Direction dir) const;
-  void print () const;
-  Atom rest (int, bool outside) const;
-  Atom rule_symbol (Real height, Real width) const;
-  Atom script (String idx) const;
-  Atom stem (Real y1_pos, Real y2_pos) const;
-  Atom slur (Array<Offset> controls) const;
-  Atom streepje (int type) const;
-  Atom text (String style, String text) const;
-  Atom vbrace (Real &dy) const;
-  Atom vbracket (Real &dy) const;
-  Atom special_time_signature (String, Array<Real>) const;
-  Atom time_signature (Array<Real>) const;
-
-  Paper_def * paper_l_;
-  Symtables *symtables_p_;
-  String font_;
-  String font_path_;  
-  Adobe_font_metric * afm_p_;
+  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