lilypond-0.1.23

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 38e31d9000f82f1ffd91453bc6ff3c2634bc4788..333072ad2f94c9a27b372b539840b4054f69ffc2 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -216,11 +216,8 @@ Lookup::linestaff (int lines, Real interline_f, Real wid) const
 Atom
 Lookup::meter (Array<Scalar> a) const
 {
-  Atom s;
-  s.dim_.x() = Interval (0 PT, 10 PT);
-  s.dim_.y() = Interval (0, 20 PT);    // todo
-  String src = (*symtables_)("param")->lookup ("meter").tex_;
-  s.tex_ = substitute_args (src,a);
+  Atom s((*symtables_)("param")->lookup ("meter"));
+  s.tex_ = substitute_args (s.tex_,a);
   return s;    
 }
 

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index add2284b62b4939c64ccb8302cc82708db66214c..4e3b74bc83017fa269b695bd86001f38c988b7f2 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -106,7 +106,7 @@
         % We know better
         \staffrulethickness=0.1\interlinedist
         \stemthickness=\staffrulethickness
-        \ledgerlinethickness=1.5\staffrulethickness
+        \ledgerlinethickness=2\staffrulethickness
 }
 
 
@@ -196,9 +196,9 @@
 \def\hslurcharu#1{{\hslurufont\char#1}}
 \def\hslurchard#1{{\hslurdfont\char#1}}
 % stacked numbers
-\def\generalmeter#1#2{\botalign{\vbox to0.5\balkheight{\vss \meterfont#1}%
-        \nointerlineskip
-        \vbox to 0.5\balkheight{\vss\meterfont #2}}}
+\def\generalmeter#1#2{\vbox to 0pt{\vss\hbox{\meterfont
+        #1}\nointerlineskip
+        \hbox{\meterfont #2}\vss}}
 
 % stacked horizontal lines 
 \def\lines#1#2#3{%