partial: 0.0.38.hanjan

[lilypond.git] / hdr / lookup.hh

diff --git a/hdr/lookup.hh b/hdr/lookup.hh
index ecb55bd03c126bb30cfbdb2a7404faf38001c0f9..28bd8677eac7df8026d1ffe57939d7844317f385 100644 (file)
--- a/hdr/lookup.hh
+++ b/hdr/lookup.hh
@@ -1,5 +1,5 @@
 /*
-  lilypond, (c) 1996 Han-Wen Nienhuys
+  lilypond, (c) 1996,97 Han-Wen Nienhuys
 */
 #ifndef LOOKUPSYMS_HH
 #define LOOKUPSYMS_HH
@@ -8,10 +8,11 @@
 #include "fproto.hh"
 #include "scalar.hh"
 
+/// intuitive interface to symbol table
 struct Lookup {
     Symtables *symtables_;
     String texsetting;
-    /****************/
+    /* *************** */
     void add(String, Symtable*);
 
     Real internote();
@@ -19,16 +20,18 @@ struct Lookup {
     Symbol linestaff(int n, Real w);
     Symbol fill(Box b);
     Symbol beam_element(int,int,Real=0);
+
     /// round slope to closest TeXslope
     Symbol beam(Real&,Real);
-    Symbol streepjes(int pos);
+
     /**
       pos == 3 : 3 lines above staff (extending below note)
 
       pos == -3: below staff
       */
+    Symbol streepjes(int pos);
 
-    Symbol meter(svec<Scalar>);
+    Symbol meter(Array<Scalar>);
     Symbol stem(Real y1_pos, Real y2_pos);
     Symbol rule_symbol(Real height, Real width);
     Symbol accidental(int);
@@ -42,8 +45,9 @@ struct Lookup {
     Symbol half_slur(int dy, Real &dx, int dir, int xpart);
     Symbol half_slur_middlepart(Real &dx, int dir);
     Symbol big_slur(int dy, Real &dx, int dir);
-    
-
+    Symbol text(String style, String text, int align = 1);
+    Symbol script(String idx);
+    Symbol hairpin(Real & width, bool decresc);
 
     Lookup();
     Lookup(Lookup const &);