release: 0.1.54

[lilypond.git] / init / table20.ly

diff --git a/init/table20.ly b/init/table20.ly
index dd0daaa11ae311fae7c2d2d7f98a4f637d1b2d4a..597cbe0ef3e8c20c102319d36e1b5124473d4379 100644 (file)
--- a/init/table20.ly
+++ b/init/table20.ly
@@ -12,12 +12,15 @@ table_twenty =
     % index TeXstring,         xmin xmax ymin ymax
 
      "style" = \table {
+               "bold"  "\setbold{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
+               "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  10.0\pt
+               "finger"        "\setfinger{%}" 0.0\pt  0.0\pt  0.0\pt  5.0\pt
+               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  10.0\pt
+               "large" "\setlarge{%}"  0.0\pt  9.50\pt 0.0\pt  12.0\pt
                "roman" "\settext{%}"   0.0\pt  7.5\pt  0.0\pt  10.0\pt
-               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  8.0\pt
-               "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  8.0\pt
      }
-     "dynamics" = \table {
 
+     "dynamics" = \table {
        "mf" "\dynmf"
        "fff" "\dynfff"
        "ff" "\dynff"
@@ -29,7 +32,6 @@ table_twenty =
        "fp" "\dynfp"
        "sf" "\dynsf"
        "sfz" "\dynsfz"
-
        }
      "align" = \table {
                "-1"    "\leftalign{%}"
@@ -38,17 +40,6 @@ table_twenty =
        }
 
 
-    "clefs" = \table {
-       "violin"        "\violinclef"   0.0\pt  16.0\pt -12.5\pt        22.5\pt
-       "bass"  "\bassclef"             0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "alto"  "\altoclef"             0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "tenor" "\altoclef"             0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "violin_change" "\cviolinclef"  0.0\pt  16.0\pt -12.5\pt        22.5\pt
-       "bass_change"   "\cbassclef"    0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "alto_change"   "\caltoclef"    0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "tenor_change"  "\caltoclef"    0.0\pt  16.0\pt 0.0\pt  20.0\pt
-    }
-
 
     "slur" = \table {
        "whole" "\slurchar%{%}" 0.0\pt  0.0\pt  0.0\pt  0.0\pt
@@ -56,21 +47,16 @@ table_twenty =
     }
 
 
-    "streepjes" = \table {
-       "toplines"      "\\topledgerlines{%}{%}"        -3.0\pt 9.0\pt  0.0\pt  0.0\pt
-       "botlines"      "\botledgerlines{%}{%}" -3.0\pt 9.0\pt  0.0\pt  0.0\pt
-    }
-
     "bars" = \table {
        "empty" "\emptybar"
        ""      ""                      0.0\pt  0.0\pt  0.0\pt  16.0\pt
        "|"     "\maatstreep{%}"        0.0\pt  0.64\pt         0.0\pt  20.0\pt
-       "||"    "\doublebar{%}"         0.0\pt  4.0\pt  0.0\pt  20.0\pt
-       "|."    "\finishbar{%}"         0.0\pt  2.0\pt  0.0\pt  20.0\pt
+       "||"    "\doublebar{%}"         0.0\pt  5.0\pt  0.0\pt  20.0\pt
+       "|."    "\finishbar{%}"         -5.0\pt 0.0\pt  0.0\pt  20.0\pt
        ".|"    "\startbar{%}"          0.0\pt  4.0\pt  0.0\pt  20.0\pt
-       ":|"    "\repeatbar"            -8.0\pt 0.0\pt  0.0\pt  20.0\pt
-       "|:"    "\startrepeat"          0.0\pt  8.0\pt  0.0\pt  20.0\pt
-       ":|:"   "\repeatbarstartrepeat" 0.0\pt  16.0\pt 0.0\pt  20.0\pt
+       ":|"    "\repeatbar"            -10.0\pt        0.0\pt  0.0\pt  20.0\pt
+       "|:"    "\startrepeat"          0.0\pt  10.0\pt 0.0\pt  20.0\pt
+       ":|:"   "\repeatbarstartrepeat" 0.0\pt 20.0\pt  0.0\pt  20.0\pt
     }
 
     "meters" = \table {
@@ -80,9 +66,10 @@ table_twenty =
 
     % dims ignored for this table
     "param" = \table {
-        "brace"    "\pianobrace{%}"    0.0\pt  0.0\pt  0.0\pt  0.0\pt
+%       "brace"    "\pianobrace{%}"    0.0\pt  0.0\pt  0.0\pt  0.0\pt
+       "rule" "\rulesym{%}{%}"
+       "brace"    "\pianobrace{%}"     0.0\pt  0.0\pt  40.0\pt 100.0\pt         
         "meter"        "\generalmeter{%}{%}"   0.0\pt  10.0\pt -5.0\pt 5.0\pt
-        "linestaf"     "\linestafsym{%}{%}"
         "stem" "\stem{%}{%}"
         "fill" "\hbox{}"
        % ugh. 8\pt
@@ -90,25 +77,12 @@ table_twenty =
         "decrescendosym" "\decrescendosym{%}"  0.0\pt  0.0\pt  -3.0\pt 3.0\pt
      }
 
-    "flags" = \table {
-       "u3"    "\eighthflag"           0.0\pt  5.0\pt  0.0\pt  0.0\pt  
-       "u4"    "\sixteenthflag"                0.0\pt  5.0\pt  0.0\pt  0.0\pt
-       "u5"    "\\thirtysecondflag"    0.0\pt  5.0\pt  0.0\pt  0.0\pt
-       "u6"    "\sixtyfourthflag"      0.0\pt  5.0\pt  0.0\pt  0.0\pt
-       "u7"    "\hundredtwentyeighthflag"      0.0\pt  5.0\pt  0.0\pt  0.0\pt
-       "d3"    "\deighthflag"          0.0\pt  5.0\pt  0.0\pt  0.0\pt
-       "d4"    "\dsixteenthflag"               0.0\pt  5.0\pt  0.0\pt  0.0\pt
-       "d5"    "\dthirtysecondflag"    0.0\pt  5.0\pt  0.0\pt  0.0\pt
-       "d6"    "\dsixtyfourthflag"     0.0\pt  5.0\pt  0.0\pt  0.0\pt
-       "d7"    "\dhundredtwentyeighthflag"     0.0\pt  5.0\pt  0.0\pt  0.0\pt
-     }
-
-  "beamslopes" = \table {
+     "beamslopes" = \table {
        "slope"         "\beamslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt        
        "horizontal"    "\rulesym{%}{%}"        
      }
      
     % ugh what's our outdir called?
-    \include "font-en-tja20.ly"
+    \include "feta20.ly"
 }