X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flookup.hh;h=e1b827e5237ca2c3c426d0ed5ba27910e0db8ce1;hb=0d11cc81d96ba3cbe5d3c221aba3ee16e916c4c9;hp=9b1e198a4433cdc92051b07f91c2c8dc77c61266;hpb=6dfa9e3be119a27e17be77c6374ada2e173cda3e;p=lilypond.git

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 9b1e198a44..e1b827e523 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -3,79 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LOOKUP_HH
 #define LOOKUP_HH
 
-#include "atom.hh"
+#include "lily-guile.hh"
+#include "molecule.hh"
 #include "fproto.hh"
-#include "scalar.hh"
 #include "direction.hh"
-#include "curve.hh"
-#include "afm.hh"
-#include "symtable.hh"
 #include "box.hh"
 
 /** handy interface to symbol table
+    TODO: move this into GUILE?
  */
 class Lookup
 {
 public:
   Lookup ();
   Lookup (Lookup const&);
-  Lookup (Symtables const&);
-  virtual ~Lookup ();
-  
-  Atom accidental (int) const;
-  void add (String, Symtable*);
-  virtual Atom afm_find (String s) const = 0;
-  Atom afm_find (String, String) const;
-  virtual Atom* atom_p (String, int, Box) const = 0;
-  Atom ball (int) const;
-  Atom bar (String, Real height) const;
-  Atom beam (Real,Real, Real) const;
-  virtual String character_str (int i) const;
-  Atom clef (String) const;
-  virtual Atom dashed_slur (Array<Offset> controls, Real thick, Real dash) const = 0;
-  Atom dots () const;
-  Atom dynamic (String) const;
-  Atom fill (Box b) const;
-  Atom flag (int, Direction) const;
-  virtual Atom hairpin (Real width, bool decresc, bool continued) const = 0;
-  virtual Atom plet (Real dy, Real dx, Direction dir) const = 0;
-  void print () const;
-  virtual Atom ps_beam (Real slope, Real width, Real thick) const = 0;
-  String print_dimen (Real) const;
-  Atom rest (int, bool outside) const;
-  Atom rule_symbol (Real height, Real width) const;
-  Atom script (String idx) const;
-  /** paratime_signature substitution in lookup strings.
-      this function provides a simple macro mechanism:
 
-      if source == "tex%bla%", then
-      substitute_args (source, {"X","Y"})  == "texXblaY"
-  */
-  String substitute_args (String source, Array<String> args) const;
-  /// paratime_signature substitution in lookup strings
-  String substitute_args (String source, Array<Scalar> args) const;
-  virtual Atom stem (Real y1_pos, Real y2_pos) const = 0;
-  Atom stem (Real y1_pos, Real y2_pos, String) const;
-  virtual Atom slur (Array<Offset> controls) const = 0;
-  Atom streepje (int type) const;
-  virtual Atom text (String style, String text) const;
-  Atom vbrace (Real &dy) const;
-  virtual Atom vbracket (Real &dy) const = 0;
-  Atom special_time_signature (String, Array<Scalar>) const;
-  Atom time_signature (Array<Scalar>) const;
-
-  Paper_def * paper_l_;
-  Symtables *symtables_p_;
-  String font_;
-  String font_path_;  
-  Adobe_font_metric * afm_p_;
+  Molecule simple_bar (String s, Real w, Paper_def*) const;
+  Molecule accidental (int, bool cautionary) const;
+  Molecule afm_find (String, bool warn=true) const;
+  Molecule notehead  (int, String) const;
+  Molecule bar (String, Real height, Paper_def*) 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, Real height, bool decresc, bool continued) const;
+  Molecule tuplet_bracket (Real dy, Real dx, Real thick,Real interline, Direction dir) const;
+  Molecule rest (int, bool outside, String) const;
+  Molecule accordion (SCM arg, Real interline_f) const;
+  Molecule slur (Array<Offset> controls) const;
+  Molecule text (String style, String text, Paper_def*) const;
+  Molecule staff_brace (Real dy) const;
+  Molecule staff_bracket (Real dy) const;
+  Molecule volta (Real w, Real h, Real il, bool last_b) const;
+  Molecule special_time_signature (String, int,int, Paper_def*) const;
+  Molecule time_signature (int n,int d, Paper_def*) const;
+
+  String font_name_;
+  Adobe_font_metric * afm_l_;
 };
 
 #endif // LOOKUP_HH