release: 1.0.12

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 523a00b8657ecae2b0dd7c4df340b4d28db419c3..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
@@ -14,34 +14,34 @@
 #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_p_;
-  String texsetting;
-
+  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_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 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 meter (Array<Scalar>) 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;
@@ -50,20 +50,14 @@ struct Lookup {
   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, Real ht, Direction dir) const;
-  Atom control_slur (Array<Offset> controls, Real dx, Real dy) 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 ht, 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 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 hairpin (Real width, bool decresc, bool continued) const;
   Atom dynamic (String) const;
 };
 
-#endif
+#endif // LOOKUPSYMS_HH