lilypond-0.0.11

diff --git a/hdr/lookup.hh b/hdr/lookup.hh
index 5be2b254644b8b0923fe6b79b1603ac69041ec5e..14ed92f6b80a7c523ac9f3ddbf88656ae0f7195a 100644 (file)
--- a/hdr/lookup.hh
+++ b/hdr/lookup.hh
@@ -5,16 +5,14 @@
 #define LOOKUPSYMS_HH
 
 #include "symbol.hh"
-
+#include "fproto.hh"
 struct Lookup {
     Symtables *symtables_;
     
     /****************/
-
+    Real internote();
     void parse (Text_db&t);
     Parametric_symbol *linestaff(int n);
-    Parametric_symbol *meter(String);
-    Parametric_symbol *stem();
 
     Symbol beam_element(int,int,Real=0);
     /// round slope to closest TeXslope
@@ -26,6 +24,8 @@ struct Lookup {
       pos == -3: below staff
       */
 
+    Symbol meter(svec<String>);
+    Symbol stem(Real y1_pos, Real y2_pos);
     Symbol rule_symbol(Real height, Real width);
     Symbol accidental(int);
     Symbol ball(int);
@@ -34,6 +34,13 @@ struct Lookup {
     Symbol clef(String);
     Symbol bar(String);
     Symbol dots(int);
+    Symbol slur(int dy, Real &dx, int dir);
+    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);
+    
+
+
     Lookup();
     ~Lookup();
 };

diff --git a/src/symbol.cc b/src/symbol.cc
index 907f1d7282d34bd33111b76f5340b51c3a326bd6..02723e19b0100a34a2474d0181d8105fe302b9ea 100644 (file)
--- a/src/symbol.cc
+++ b/src/symbol.cc
@@ -1,4 +1,6 @@
 #include "symbol.hh"
+#include "vray.hh"
+#include "textdb.hh"
 
 Symbol::Symbol()
     :    dim(Interval(0,0),Interval(0,0))

diff --git a/src/tex.cc b/src/tex.cc
index ae9dc1b5f3064bb2e9d7d6fc239a046394b4030c..60d487dfd1a1a9d69ae2ac7cc09f2fc6814df372 100644 (file)
--- a/src/tex.cc
+++ b/src/tex.cc
@@ -2,6 +2,7 @@
 #include "tex.hh"
 #include "symbol.hh"
 #include "const.hh"
+#include "vray.hh"
 
 String
 vstrut(Real h)