From: fred Date: Sun, 24 Mar 2002 20:00:34 +0000 (+0000) Subject: lilypond-0.1.23 X-Git-Tag: release/1.5.59~3718 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=377bd32067dda55de2f280beb5fd6ef301cfcf24;p=lilypond.git lilypond-0.1.23 --- diff --git a/lily/lookup.cc b/lily/lookup.cc index 38e31d9000..333072ad2f 100644 --- 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 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 add2284b62..4e3b74bc83 100644 --- 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{%