release: 1.0.12

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 96cd46e6b707186778e1407a22bd867629d4c8a3..5dc56d279c4e1e388e7e45c0ff91acbecf2793ed 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LOOKUPSYMS_HH
@@ -13,54 +13,51 @@
 #include "fproto.hh"
 #include "scalar.hh"
 #include "direction.hh"
+#include "curve.hh"
+#include "afm.hh"
 
 /** handy interface to symbol table
  */
 struct Lookup {
-    Paper_def * paper_l_;
-    Symtables *symtables_;
-    String texsetting;
-    /* *************** */
-    void add (String, Symtable*);
-    void print() const;
-
-    Atom linestaff (int n, Real w) const;
-    Atom fill (Box b) const;
-    Atom beam_element (int,int,Real=0) const;
-
-    /// round slope to closest TeXslope
-    Atom beam (Real&,Real) const;
-
-    /**
-      pos == 3 : 3 lines above staff (extending below note)
-
-      pos == -3: below staff
-      */
-    Atom streepjes (int type, int pos) 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 (int) const;
-    Atom slur (int dy, Real &dx, Direction 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) const;
-    Atom dynamic (String) const;
-    Lookup();
-    Lookup (Lookup const &);
-    ~Lookup();
+  Paper_def * paper_l_;
+  Symtables *symtables_p_;
+  String font_;
+  String font_path_;  
+  Adobe_font_metric * afm_p_;
+  
+  
+  Lookup();
+  Lookup (Lookup const &);
+  ~Lookup();
+  
+  void add (String, Symtable*);
+  void print() const;
+  Atom afm_find (String) const; 
+
+  Atom fill (Box b) const;
+  Atom beam (Real,Real, Real) const;
+  Atom ps_beam (Real, Real, Real) const;
+  Atom streepje (int type) const;
+  Atom vbrace (Real &dy) const;
+  Atom vbracket (Real &dy) const;
+  Atom time_signature (Array<Scalar>) const;
+  Atom special_time_signature (String) 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 dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
+  Atom slur (Array<Offset> controls) const;
+  Atom plet (Real dy, Real dx, Direction dir) const;
+  Atom text (String style, String text) const;
+  Atom script (String idx) const;
+  Atom hairpin (Real width, bool decresc, bool continued) const;
+  Atom dynamic (String) const;
 };
 
-#endif
+#endif // LOOKUPSYMS_HH