patch::: 1.1.23.ms2

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 292363bb9c056cae9ef0fd598278d1906806d94f..c0fc047926fc654f7f08e741a30aba61f53ac0c9 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,60 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--1998 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 "molecule.hh"
 #include "fproto.hh"
 #include "scalar.hh"
 #include "direction.hh"
 #include "curve.hh"
+#include "symtable.hh"
+#include "box.hh"
 
 /** handy interface to symbol table
  */
-struct Lookup {
-  Paper_def * paper_l_;
-  Symtables *symtables_p_;
-  String texsetting;
-
-  Lookup();
-  Lookup (Lookup const &);
-  ~Lookup();
+class Lookup
+{
+public:
+  Lookup ();
+  Lookup (Lookup const&);
+  Lookup (Symtables const&);
+  ~Lookup ();
   
+  Molecule accidental (int, bool cautionary) const;
   void add (String, Symtable*);
-  void print() const;
-
-  Atom fill (Box b) const;
-  Atom beam_element (int,int,Real=0) 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 stem (Real y1_pos, Real y2_pos) const;
-  Atom rule_symbol (Real height, Real width) const;
-  Atom accidental (int) const;
+  Atom afm_find (String, bool warn=true) const;
   Atom ball (int) const;
-  Atom flag (int, Direction) const;
-  Atom rest (int, bool outside) const;
-  Atom clef (String) const;
+  //
+  Atom special_ball (int, String) const;
+  //
   Atom bar (String, Real height) const;
-    
-  Atom dots () const;
+  Atom beam (Real, Real, Real) const;
+  Atom clef (String) const;
   Atom dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
-  Atom slur (Array<Offset> controls) const;
+  Atom dots () const;
+  Atom dynamic (String) const;
+  Atom extender (Real) const;
+  Atom fill (Box b) const;
+  Atom flag (int, Direction) const;
+  Atom hairpin (Real width, bool decresc, bool continued) const;
   Atom plet (Real dy, Real dx, Direction dir) const;
-  Atom text (String style, String text, int align = 1) const;
+  void print () const;
+  Atom rest (int, bool outside) const;
+  Atom rule_symbol (Real height, Real width) const;
   Atom script (String idx) const;
-  Atom hairpin (Real width, bool decresc, bool continued) const;
-  Atom dynamic (String) const;
+  Atom stem (Real y1_pos, Real y2_pos) const;
+  Atom slur (Array<Offset> controls) const;
+  Atom streepje (int type) const;
+  Atom text (String style, String text) const;
+  Atom vbrace (Real &dy) const;
+  Atom vbracket (Real &dy) const;
+  Atom volta (Real w, bool last_b) const;
+  Atom special_time_signature (String, Array<int>) const;
+  Atom time_signature (Array<int>) const;
+
+  Paper_def * paper_l_;
+  Symtables *symtables_p_;
+
+  String font_name_;
+  Adobe_font_metric * afm_l_;
 };
 
-#endif // LOOKUPSYMS_HH
+#endif // LOOKUP_HH