From 40a21b475df52337f872ac766e6fc86afe4982f1 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:47:03 +0000 Subject: [PATCH] lilypond-0.0.73pre --- init/table16.ini | 12 ++++++------ lily/lookup.cc | 9 +++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/init/table16.ini b/init/table16.ini index 62abd29e37..6d202aa420 100644 --- a/init/table16.ini +++ b/init/table16.ini @@ -97,12 +97,12 @@ table_sixteen= "bars" = \table { "empty" "\emptybar" - "|" "\maatstreep" 0.0\pt 0.64\pt -8.0\pt 8.0\pt - "||" "\doublebar" 0.0\pt 4.0\pt -8.0\pt 8.0\pt - "|." "\finishbar" -4.0\pt 0.0\pt -8.0\pt 8.0\pt - ":|" "\repeatbar" -4.0\pt 0.0\pt -8.0\pt 8.0\pt - "|:" "\startrepeat" 0.0\pt 4.0\pt -8.0\pt 8.0\pt - ":|:" "\repeatbarstartrepeat" 0.0\pt 16.0\pt -8.0\pt 8.0\pt + "|" "\maatstreep{%}" 0.0\pt 0.64\pt .0\pt 16.0\pt + "||" "\doublebar{%}" 0.0\pt 4.0\pt .0\pt 16.0\pt + "|." "\finishbar{%}" -4.0\pt 0.0\pt .0\pt 16.0\pt + ":|" "\repeatbar" -4.0\pt 0.0\pt .0\pt 16.0\pt + "|:" "\startrepeat" 0.0\pt 4.0\pt 0.0\pt 16.0\pt + ":|:" "\repeatbarstartrepeat" 0.0\pt 16.0\pt 0.0\pt 16.0\pt } diff --git a/lily/lookup.cc b/lily/lookup.cc index dd33fa3df6..e4a92693db 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -101,9 +101,14 @@ Lookup::accidental(int j) const Symbol -Lookup::bar(String s) const +Lookup::bar(String s, Real h) const { - return (*symtables_)("bars")->lookup(s); + Array a; + a.push(print_dimen( h)); + Symbol ret=(*symtables_)("bars")->lookup(s);; + ret.tex = substitute_args(ret.tex, a); + ret.dim.y = Interval( 0, h); + return ret; } Symbol -- 2.39.5