release: 0.1.62

[lilypond.git] / lily / include / lookup.hh

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 42a2e03819bd986da0bf5325a9460a34faaf5a8c..292363bb9c056cae9ef0fd598278d1906806d94f 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -1,58 +1,62 @@
 /*
-  lilypond, (c) 1996,97 Han-Wen Nienhuys
+  lookup.hh -- declare Lookup
+
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
+
 #ifndef LOOKUPSYMS_HH
 #define LOOKUPSYMS_HH
 
-#include "symbol.hh"
+#include "atom.hh"
 #include "fproto.hh"
 #include "scalar.hh"
+#include "direction.hh"
+#include "curve.hh"
 
-/// intuitive interface to symbol table
+/** handy interface to symbol table
+ */
 struct Lookup {
-    Symtables *symtables_;
-    String texsetting;
-    /* *************** */
-    void add(String, Symtable*);
-    void print()const;
-    Real internote()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)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();
+  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;
+
+  Atom beam (Real,Real, Real) const;
+  Atom ps_beam (Real, 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 dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
+  Atom slur (Array<Offset> controls) const;
+  Atom plet (Real 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;
 };
 
-#endif
+#endif // LOOKUPSYMS_HH