release: 1.3.25

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 524cdf1958da47f06dbb23410a56e97012095af8..2a227470fed0d3ed23510f278459e844e8983b8f 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -1,57 +1,49 @@
 /*
-  lilypond, (c) 1996,97 Han-Wen Nienhuys
+  lookup.hh -- declare Lookup
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2000 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 {
-    Symtables *symtables_;
-    String texsetting;
-    /* *************** */
-    void add(String, Symtable*);
-    void print()const;
-    Real internote();
-
-    Symbol linestaff(int n, Real w);
-    Symbol fill(Box b);
-    Symbol beam_element(int,int,Real=0);
-
-    /// round slope to closest TeXslope
-    Symbol beam(Real&,Real);
-
-    /**
-      pos == 3 : 3 lines above staff (extending below note)
-
-      pos == -3: below staff
-      */
-    Symbol streepjes(int pos);
-
-    Symbol meter(Array<Scalar>);
-    Symbol stem(Real y1_pos, Real y2_pos);
-    Symbol rule_symbol(Real height, Real width);
-    Symbol accidental(int);
-    Symbol ball(int);
-    Symbol flag(int);
-    Symbol rest(int);
-    Symbol clef(String);
-    Symbol bar(String);
-    Symbol dots(int);
-    Symbol slur(int dy, Real &dx, int dir);
-    Symbol half_slur(int dy, Real &dx, int dir, int xpart);
-    Symbol half_slur_middlepart(Real &dx, int dir);
-    Symbol big_slur(int dy, Real &dx, int dir);
-    Symbol text(String style, String text, int align = 1);
-    Symbol script(String idx);
-    Symbol hairpin(Real & width, bool decresc);
-
-    Lookup();
-    Lookup(Lookup const &);
-    ~Lookup();
+
+#ifndef LOOKUP_HH
+#define LOOKUP_HH
+
+#include "lily-guile.hh"
+#include "molecule.hh"
+#include "flower-proto.hh"
+#include "direction.hh"
+#include "box.hh"
+
+/**
+   handy interface to symbol table
+   TODO: move this into GUILE?
+ */
+class Lookup
+{
+public:
+  String font_name_;
+  Adobe_font_metric * afm_l_;
+
+
+  Lookup ();
+  Lookup (Lookup const&);
+
+  Molecule simple_bar (String s, Real w, Paper_def*) const;
+  Molecule afm_find (String, bool warn=true) const;
+  Molecule bar (String, Real height, Paper_def*) const;
+  Molecule accordion (SCM arg, Real interline_f) const;
+
+  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 fill (Box b) ;
+  static Molecule filledbox (Box b) ;  
+  static Molecule text (String style, String text, Paper_def*) ;
+  static Molecule staff_brace (Real dy, int) ;
+  static Molecule staff_bracket (Real height, Paper_def* paper_l) ;
 };
 
-#endif
+#endif // LOOKUP_HH