release: 1.1.18

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index ab761ac955940f58a89986db84edc735d0e0efe7..9526c07cc4ce240249c4b4654124ba7d2eab5759 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -11,11 +11,11 @@
 #define LOOKUP_HH
 
 #include "atom.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"
 
@@ -27,61 +27,42 @@ public:
   Lookup ();
   Lookup (Lookup const&);
   Lookup (Symtables const&);
-  virtual ~Lookup ();
+  ~Lookup ();
   
-  Atom accidental (int) const;
+  Molecule accidental (int, bool cautionary) const;
   void add (String, Symtable*);
-  virtual Atom afm_find (String s, bool warn=true) const = 0;
-  Atom afm_find (String, String, bool warn=true) const;
-  virtual Atom* atom_p (String, int, Box) const = 0;
+  Atom afm_find (String, bool warn=true) const;
   Atom ball (int) const;
   Atom bar (String, Real height) const;
-  String base_output_str () const;
-  Atom beam (Real,Real, Real) const;
-  virtual String character_str (int i) const;
+  Atom beam (Real, Real, Real) const;
   Atom clef (String) const;
-  virtual Atom dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
+  Atom dashed_slur (Array<Offset> controls, Real thick, Real dash) const;
   Atom dots () const;
   Atom dynamic (String) const;
+  Atom extender (Real) const;
   Atom fill (Box b) const;
   Atom flag (int, Direction) const;
-  virtual Atom hairpin (Real width, bool decresc, bool continued) const = 0;
-  virtual Lookup* lookup_p (Lookup const&) const = 0;
-  virtual Lookup* lookup_p (Symtables const&) const = 0;
-  virtual Paper_outputter* paper_outputter_p (Paper_stream*, Paper_def*, Scope*, String) const = 0;
-  virtual Paper_stream* paper_stream_p () const = 0;
-  virtual Atom plet (Real dy, Real dx, Direction dir) const = 0;
+  Atom hairpin (Real width, bool decresc, bool continued) const;
+  Atom plet (Real dy, Real dx, Direction dir) const;
   void print () const;
-  virtual Atom ps_beam (Real slope, Real width, Real thick) const = 0;
-  virtual 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 stem (Real y1_pos, Real y2_pos) const;
+  Atom slur (Array<Offset> controls) const;
   Atom streepje (int type) const;
-  virtual Atom text (String style, String text) const;
-  virtual String unknown_str () const = 0;
+  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;
+  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_;
-  String font_path_;  
-  Adobe_font_metric * afm_p_;
+
+  String font_name_;
+  Adobe_font_metric * afm_l_;
 };
 
 #endif // LOOKUP_HH