patch::: 1.0.14.jcn1: braak

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 3993b9e9a7121f2e0d4533c28d102e58c16aec3c..9b1e198a4433cdc92051b07f91c2c8dc77c61266 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -17,6 +17,7 @@
 #include "curve.hh"
 #include "afm.hh"
 #include "symtable.hh"
+#include "box.hh"
 
 /** handy interface to symbol table
  */
@@ -31,10 +32,12 @@ public:
   Atom accidental (int) const;
   void add (String, Symtable*);
   virtual Atom afm_find (String s) const = 0;
-  Atom afm_find (String, String) const; 
+  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;
@@ -45,17 +48,27 @@ public:
   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;
-  Atom text (String style, String text) 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) const;
+  Atom special_time_signature (String, Array<Scalar>) const;
   Atom time_signature (Array<Scalar>) const;
 
   Paper_def * paper_l_;