release: 0.1.55

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 638e8c3bdffce990e67562dee83c55844869a4f3..9f7bb3f023a2915e82107aadcf68a9b44523d6bb 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -9,57 +9,59 @@
 #ifndef LOOKUPSYMS_HH
 #define LOOKUPSYMS_HH
 
-#include "symbol.hh"
+#include "atom.hh"
 #include "fproto.hh"
 #include "scalar.hh"
 #include "direction.hh"
 
-/// intuitive interface to symbol table
+/** handy interface to symbol table
+ */
 struct Lookup {
-    Paper_def * paper_l_;
-    Symtables *symtables_;
-    String texsetting;
-    /* *************** */
-    void add (String, Symtable*);
-    void print() const;
+  Paper_def * paper_l_;
+  Symtables *symtables_p_;
+  String texsetting;
 
-    Symbol linestaff (int n, Real w) const;
-    Symbol fill (Box b) const;
-    Symbol beam_element (int,int,Real=0) const;
+  Lookup();
+  Lookup (Lookup const &);
+  ~Lookup();
+  
+  void add (String, Symtable*);
+  void print() const;
 
-    /// round slope to closest TeXslope
-    Symbol beam (Real&,Real) const;
+  Atom fill (Box b) const;
+  Atom beam_element (int,int,Real=0) const;
 
-    /**
-      pos == 3 : 3 lines above staff (extending below note)
+  /// round slope to closest TeXslope
+  Atom beam (Real&,Real, Real) const;
+  Atom ps_beam (Real, Real, Real)const;
+  Atom tex_beam (Real&, Real) const;
 
-      pos == -3: below staff
-      */
-    Symbol streepjes (int pos) const;
+  Atom streepje (int type) 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, Direction) const;
-    Symbol rest (int, bool outside) const;
-    Symbol clef (String) const;
-    Symbol bar (String, Real height) 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;
     
-    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();
+  Atom dots () const;
+  Atom slur (Real &dy, Real &dx, Real ht, Direction dir) const;
+  Atom plet (Real &dy, Real &dx, Direction dir) const;
+  Atom tex_slur (int dy, Real &dx, Direction dir) const;
+  Atom ps_slur (Real dy, Real dx, Real ht, Real dir) const;
+  Atom half_slur (int dy, Real &dx, Direction dir, int xpart) const;
+  Atom half_slur_middlepart (Real &dx, Direction dir) const;
+  Atom big_slur (int 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