X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=e1b827e5237ca2c3c426d0ed5ba27910e0db8ce1;hb=0d11cc81d96ba3cbe5d3c221aba3ee16e916c4c9;hp=c9af80091c01cae44ee4bedfcbead1a4cc29d224;hpb=95246e47228482fbd2a99ec2d7f5d52b35cb545a;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index c9af80091c..e1b827e523 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,63 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#ifndef LOOKUPSYMS_HH
-#define LOOKUPSYMS_HH
+#ifndef LOOKUP_HH
+#define LOOKUP_HH
 
-#include "symbol.hh"
+#include "lily-guile.hh"
+#include "molecule.hh"
 #include "fproto.hh"
-#include "scalar.hh"
 #include "direction.hh"
-
-/// intuitive interface to symbol table
-struct Lookup {
-    Paper_def * paper_l_;
-    Symtables *symtables_;
-    String texsetting;
-    /* *************** */
-    void add (String, Symtable*);
-    void print() 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, Real height) const;
-    
-    Symbol dots (int) const;
-    Symbol slur (int dy, Real &dx, Direction dir) const;
-    Symbol half_slur (int dy, Real &dx, Direction dir, int xpart) const;
-    Symbol half_slur_middlepart (Real &dx, Direction dir) const;
-    Symbol big_slur (int dy, Real &dx, Direction 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();
+#include "box.hh"
+
+/** handy interface to symbol table
+    TODO: move this into GUILE?
+ */
+class 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 flag (int, Direction) const;
+  Molecule hairpin (Real width, Real height, bool decresc, bool continued) const;
+  Molecule tuplet_bracket (Real dy, Real dx, Real thick,Real interline, Direction dir) const;
+  Molecule rest (int, bool outside, String) const;
+  Molecule accordion (SCM arg, Real interline_f) const;
+  Molecule slur (Array<Offset> controls) const;
+  Molecule text (String style, String text, Paper_def*) const;
+  Molecule staff_brace (Real dy) const;
+  Molecule staff_bracket (Real dy) const;
+  Molecule volta (Real w, Real h, Real il, bool last_b) 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_;
 };
 
-#endif
+#endif // LOOKUP_HH