X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=9526c07cc4ce240249c4b4654124ba7d2eab5759;hb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;hp=aff20862d72c14d90637a24f0bb69497ef4c2d73;hpb=a2896b23ce12cc61e9cd4495324c9ca5551cb947;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index aff20862d7..9526c07cc4 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,61 +3,66 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--1998 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 "atom.hh"
+#include "molecule.hh"
 #include "fproto.hh"
 #include "scalar.hh"
+#include "direction.hh"
+#include "curve.hh"
+#include "symtable.hh"
+#include "box.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)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();
+/** handy interface to symbol table
+ */
+class Lookup
+{
+public:
+  Lookup ();
+  Lookup (Lookup const&);
+  Lookup (Symtables const&);
+  ~Lookup ();
+  
+  Molecule accidental (int, bool cautionary) const;
+  void add (String, Symtable*);
+  Atom afm_find (String, bool warn=true) 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 extender (Real) 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 volta (Real w, bool last_b) const;
+  Atom special_time_signature (String, Array<int>) const;
+  Atom time_signature (Array<int>) const;
+
+  Paper_def * paper_l_;
+  Symtables *symtables_p_;
+
+  String font_name_;
+  Adobe_font_metric * afm_l_;
 };
 
-#endif
+#endif // LOOKUP_HH