release: 1.1.51

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

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 9b988f4978eb5d45a36bab4355d72eed5668c291..e1b827e5237ca2c3c426d0ed5ba27910e0db8ce1 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -10,12 +10,14 @@
 #ifndef LOOKUP_HH
 #define LOOKUP_HH
 
+#include "lily-guile.hh"
 #include "molecule.hh"
 #include "fproto.hh"
 #include "direction.hh"
 #include "box.hh"
 
 /** handy interface to symbol table
+    TODO: move this into GUILE?
  */
 class Lookup
 {
@@ -23,14 +25,11 @@ public:
   Lookup ();
   Lookup (Lookup const&);
 
-
-  
-  Molecule special_ball (int, String) const;
-  Molecule simple_bar (String s, Real w) const;
+  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 ball (int) const;
-  Molecule bar (String, Real height) 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;
@@ -39,22 +38,17 @@ public:
   Molecule fill (Box b) const;
   Molecule filledbox (Box b) const;  
   Molecule flag (int, Direction) const;
-  Molecule hairpin (Real width, bool decresc, bool continued) const;
-  Molecule plet (Real dy, Real dx, Direction dir) const;
-  Molecule rest (int, bool outside) const;
-  Molecule rule_symbol (Real height, Real width) const;
-  Molecule script (String idx) const;
-  Molecule stem (Real y1_pos, Real y2_pos) 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 streepje (int type) const;
-  Molecule text (String style, String text) 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, bool last_b) const;
-  Molecule special_time_signature (String, int,int) const;
-  Molecule time_signature (int n,int d) const;
-
-  Paper_def * paper_l_;
+  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_;