lilypond-0.0.73pre

diff --git a/init/table16.ini b/init/table16.ini
index 62abd29e37565c0aff787e654858f8b01bb541e9..6d202aa4200422517b19924f7910fcff5a4aec48 100644 (file)
--- 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 dd33fa3df68296836333cdd4d6a969048252d268..e4a92693db53492c47d81ff48c5e70fe820e1564 100644 (file)
--- 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<String> 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