X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=2a227470fed0d3ed23510f278459e844e8983b8f;hb=aaa52903d633cdeaa642c20ab42ec268f4e17a2b;hp=e5cf3f10e94f2f12b485a723b04d23db3b97bc86;hpb=745b9d0980d8811783e4fe62380363d05fd6140c;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index e5cf3f10e9..2a227470fe 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,64 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2000 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 "atom.hh"
-#include "fproto.hh"
-#include "scalar.hh"
+#include "lily-guile.hh"
+#include "molecule.hh"
+#include "flower-proto.hh"
 #include "direction.hh"
+#include "box.hh"
 
-/** handy interface to symbol table
+/**
+   handy interface to symbol table
+   TODO: move this into GUILE?
  */
-struct 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;
-
-  /// round slope to closest TeXslope
-  Atom beam (Real&,Real, Real) const;
-  Atom ps_beam (Real, Real, Real)const;
-  Atom tex_beam (Real&, Real) const;
-
-  Atom streepje (int type) const;
-
-  Atom vbrace (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 slur (Real &dy, Real &dx, 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 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;
+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