release: 1.3.131

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 46155bded379665843b126cbff469388075495a2..4a3dea7e0f9f343cb18e8e1f6d8769e82255b6de 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,62 +3,28 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2001 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 {
-    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, 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 accordion (SCM arg, Real interline_f, Font_metric*fm);
+  static Molecule frame (Box b, Real thick);
+  static Molecule slur (Bezier controls, Real cthick, Real thick) ;
+  static Molecule beam (Real, Real, Real) ;
+  static Molecule dashed_slur (Bezier, Real thick, Real dash) ;
+  static Molecule blank (Box b) ;
+  static Molecule filledbox (Box b) ;  
 };
 
-#endif
+#endif // LOOKUP_HH