X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=a86be7885218cc1f3f000f55d51b40dd13615d88;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=4b1479090a47a8a503d52bacf1524c7bd5a73ba1;hpb=0dc651561ed849b121d26cbd07a192e9fefeb832;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 4b1479090a..a86be78852 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,62 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#ifndef LOOKUPSYMS_HH
-#define LOOKUPSYMS_HH
-
-#include "symbol.hh"
-#include "fproto.hh"
-#include "scalar.hh"
-
-/// intuitive interface to symbol table
-struct Lookup {
-    Symtables *symtables_;
-    String texsetting;
-    /* *************** */
-    void add(String, Symtable*);
-    void print()const;
-    Real internote_f()const;
-    Real interbeam_f()const;
-
-    Symbol linestaff(int n, Real w)const;
-    Symbol fill(Box b)const;
-    Symbol beam_element(int,int,Real=0)const;
-
-    /// round slope to closest TeXslope
-    Symbol beam(Real&,Real)const;
-
-    /**
-      pos == 3 : 3 lines above staff (extending below note)
-
-      pos == -3: below staff
-      */
-    Symbol streepjes(int pos)const;
-
-    Symbol vbrace(Real &dy) const;
-    Symbol meter(Array<Scalar>)const;
-    Symbol stem(Real y1_pos, Real y2_pos)const;
-    Symbol rule_symbol(Real height, Real width)const;
-    Symbol accidental(int)const;
-    Symbol ball(int)const;
-    Symbol flag(int)const;
-    Symbol rest(int, bool outside)const;
-    Symbol clef(String)const;
-    Symbol bar(String)const;
-    Symbol dots(int)const;
-    Symbol slur(int dy, Real &dx, int dir)const;
-    Symbol half_slur(int dy, Real &dx, int dir, int xpart)const;
-    Symbol half_slur_middlepart(Real &dx, int dir)const;
-    Symbol big_slur(int dy, Real &dx, int dir)const;
-    Symbol text(String style, String text, int align = 1)const;
-    Symbol script(String idx)const;
-    Symbol hairpin(Real & width, bool decresc)const;
-    Symbol dynamic(String)const;
-    Lookup();
-    Lookup(Lookup const &);
-    ~Lookup();
+#ifndef LOOKUP_HH
+#define LOOKUP_HH
+
+#include "string.hh"
+#include "molecule.hh"
+#include "flower-proto.hh"
+#include "direction.hh"
+#include "box.hh"
+
+struct Lookup
+{
+  static Molecule dot (Offset p, Real radius);
+  static Molecule bracket (Axis a, Interval iv, Real thick, Real protude, Real blot);
+  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, Real blot);
+  static Molecule slur (Bezier controls, Real cthick, Real thick);
+  static Molecule bezier_sandwich (Bezier top_curve, Bezier bottom_curve);
+  static Molecule beam (Real slope, Real width, Real thick, Real blot);
+  static Molecule dashed_slur (Bezier, Real thick, Real dash);
+  static Molecule blank (Box b);
+  static Molecule filled_box (Box b);
+  static Molecule round_filled_box (Box b, Real blotdiameter);
+  static Molecule repeat_slash (Real w, Real slope, Real th);
+  static Molecule horizontal_line (Interval w, Real th);
+  static Molecule triangle (Interval, Real, Real);
 };
 
-#endif
+#endif // LOOKUP_HH