release: 1.3.25

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index d61766a1f12be2079d1ea1c9ed3fa06760a22923..2a227470fed0d3ed23510f278459e844e8983b8f 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,61 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LOOKUP_HH
 #define LOOKUP_HH
 
+#include "lily-guile.hh"
 #include "molecule.hh"
-#include "fproto.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?
  */
 class Lookup
 {
 public:
+  String font_name_;
+  Adobe_font_metric * afm_l_;
+
+
   Lookup ();
   Lookup (Lookup const&);
 
-
-  
-  Molecule special_ball (int, String) const;
-  Molecule simple_bar (String s, Real w) const;
-  Molecule accidental (int, bool cautionary) const;
+  Molecule simple_bar (String s, Real w, Paper_def*) const;
   Molecule afm_find (String, bool warn=true) const;
-  Molecule ball (int) const;
-  Molecule bar (String, Real height) const;
-  Molecule beam (Real, Real, Real) const;
-  Molecule clef (String) const;
-  Molecule dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
-  Molecule dots () const;
-  Molecule ledger_line (Interval) const;
-  Molecule fill (Box b) const;
-  Molecule filledbox (Box b) const;  
-  Molecule flag (int, Direction) const;
-  Molecule hairpin (Real width, bool decresc, bool continued) const;
-  Molecule plet (Real dy, Real dx, Direction dir) const;
-  Molecule rest (int, bool outside) const;
-  Molecule rule_symbol (Real height, Real width) const;
-  Molecule script (String idx) const;
-  Molecule stem (Real y1_pos, Real y2_pos) const;
-  Molecule slur (Array<Offset> controls) const;
-  Molecule streepje (int type) const;
-  Molecule text (String style, String text) const;
-  Molecule staff_brace (Real dy) const;
-  Molecule staff_bracket (Real dy) const;
-  Molecule volta (Real w, bool last_b) const;
-  Molecule special_time_signature (String, int,int) const;
-  Molecule time_signature (int n,int d) const;
-
-  Paper_def * paper_l_;
-
-  String font_name_;
-  Adobe_font_metric * afm_l_;
+  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 // LOOKUP_HH