lilypond-0.0.10

diff --git a/lilyponddefs.tex b/lilyponddefs.tex
index 9cf064fee846ceb95f86b303a7928d4cb78c2e61..be9aada8a27c6101e32b1804f609fd4cfaadd254 100644 (file)
--- a/lilyponddefs.tex
+++ b/lilyponddefs.tex
@@ -36,14 +36,18 @@
 \mdef\eighthrest{63}
 \mdef\sixteenthrest{64}
 \mdef\thirtysecondrest{65}
-\mdef\sharp{'065}
-\mdef\flat{'063}
-\mdef\natural{'067}
+\mdef\sharp{52}
+\mdef\flat{50}
+\mdef\natural{54}
+\mdef\sharpsharp{53}
+\mdef\flatflat{51}
+
 \mdef\singledot{'00}
 \mdef\doubledot{'01}
 \mdef\tripledot{'02}
 \mdef\mussepline{155}
-
+\mdef\violinclef{71}
+\mdef\bassclef{73}
 
 \mdef\deigthflag{45}
 \mdef\dsixteenthflag{46}
@@ -111,6 +115,8 @@
 \def\ldoubledot{\kern-6pt\doubledot}
 \def\ltripledot{\kern-6pt\tripledot}
 
+
+
 \def\stem#1#2{\vrule height#2 depth-#1}
 
 \def\placebox#1#2#3{%

diff --git a/src/lookup.cc b/src/lookup.cc
index d0ce3cb7435954df947dde61da21a3b286f61992..5eef666525b69a631e34814fdcdce17a486300cc 100644 (file)
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -35,6 +35,11 @@ Lookup::rest(int j)
 {
     return (*symtables_)("rests")->lookup(String(j));
 }
+Symbol
+Lookup::accidental(int j)
+{
+    return (*symtables_)("accidentals")->lookup(String(j));
+}
 
 
 Symbol
@@ -42,6 +47,13 @@ Lookup::bar(String s)
 {
     return (*symtables_)("bars")->lookup(s);
 }
+
+Symbol
+Lookup::clef(String s)
+{
+    return (*symtables_)("clefs")->lookup(s);
+}
+ 
  Symbol
 Lookup::dots(int j)
 {
@@ -114,9 +126,9 @@ struct Meter_sym:Parametric_symbol {
     Meter_sym(Symtables*s) : Parametric_symbol(s){  }
     Symbol eval(svec<String> a) const{
        Symbol s;
-       s.dim.x = Interval( convert_dimen(-5,"pt"),
-                           convert_dimen(5,"pt"));
-       s.dim.y = Interval(0, convert_dimen(10,"pt") ); // todo
+       s.dim.x = Interval( convert_dimen(0,"pt"),
+                           convert_dimen(10,"pt"));
+       s.dim.y = Interval(0, convert_dimen(20,"pt") ); // todo
        String src = (*symtables_)("param")->lookup("meter").tex;
        s.tex = substitute_args(src,a);
        return s;