release: 0.0.15

[lilypond.git] / src / lookup.cc

diff --git a/src/lookup.cc b/src/lookup.cc
index 018c57f9c064670dc372eb11dcd4894ead9a5b3e..7376f3c1d41265fdc7dba607ac7b3fa0cba9fdcf 100644 (file)
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -3,27 +3,37 @@
 #include "symtable.hh"
 #include "dimen.hh"
 #include "tex.hh"
+#include "scalar.hh"
 
-Real
-Lookup::internote()
+
+Lookup::Lookup()
 {
-    return ball(4).dim.y.length()/2;
+    texsetting = "\\unknowntexsetting";
+    symtables_ = new Symtables;
 }
 
-void
-Lookup::parse(Text_db&t)
+Lookup::Lookup(Lookup const &s)
+{
+    texsetting = s.texsetting;
+    symtables_ = new Symtables(*s.symtables_);
+}
+Lookup::~Lookup()
 {
-    symtables_->read(t) ;
+    delete symtables_;
 }
 
-Lookup::Lookup()
+void
+Lookup::add(String s, Symtable*p)
 {
-    symtables_ = new Symtables;
+    symtables_->add(s, p);
 }
 
-Lookup::~Lookup()
+/****************/
+
+Real
+Lookup::internote()
 {
-    delete symtables_;
+    return ball(4).dim.y.length()/2;
 }
 
 Symbol
@@ -99,8 +109,6 @@ Lookup::streepjes(int i)
     return ret;
 }
 
-/****************************************************************/
-// bare bones.
 
 
 Symbol
@@ -121,12 +129,9 @@ Lookup::linestaff(int lines, Real wid)
     return s;
 }
 
-/****************************************************************/
-
-
 
 Symbol
-Lookup::meter(svec<String> a)
+Lookup::meter(svec<Scalar> a)
 {
     Symbol s;
     s.dim.x = Interval( convert_dimen(0,"pt"),
@@ -155,5 +160,3 @@ Lookup::stem(Real y1,Real y2)
     s.tex = substitute_args(src,a);
     return s;
 }
-
-