X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=init%2Ftable16.ly;h=5940ed8b2f1de6ac4fe7b7140e1ebf1d3a8e9e93;hb=946c135a338e2daadfed8da3026f0ed9d29bf9ad;hp=3869d070ad57b0b6512f2ab760a710340f539772;hpb=bc35d071a32034237584eb5bc06c8432271a88ac;p=lilypond.git diff --git a/init/table16.ly b/init/table16.ly index 3869d070ad..5940ed8b2f 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -10,41 +10,13 @@ table_sixteen= \texid "\input lilyponddefs \musixsixteendefs" % index TeXstring, xmin xmax ymin ymax - "scripts" = \table { - "fermata" "\fermata" 0.0\pt 0.0\pt 0.0\pt 6.0\pt - "-fermata" "\ifermata" 0.0\pt 0.0\pt -6.0\pt 0.0\pt - "portato" "\portato" 0.0\pt 4.0\pt 0.0\pt 2.0\pt - "-portato" "\iportato" 0.0\pt 4.0\pt -2.0\pt 0.0\pt - "tenuto" "\tenuto" 0.0\pt 4.0\pt -1.0\pt 1.0\pt - "-tenuto" "\itenuto" 0.0\pt 4.0\pt -1.0\pt 1.0\pt - "sforzato" "\sforzato" -0.8\pt 4.0\pt -1.92\pt 1.92\pt - "marcato" "\marcato" 0.0\pt 4.0\pt 0.0\pt 4.0\pt - "-marcato" "\imarcato" 0.0\pt 4.0\pt -4.0\pt 0.0\pt - "staccato" "\staccato" 0.0\pt 0.0\pt -1.1\pt 1.1\pt - "staccatissimo" "\staccatissimo" 0.0\pt 0.0\pt 0.0\pt 1.0\pt - "-staccatissimo" "\istaccatissimo" 0.0\pt 0.0\pt 0.0\pt 1.0\pt - "upbow" "\upbow" -1.0\pt 6.0\pt 0.0\pt 5.0\pt - "downbow" "\downbow" 0.0\pt 5.0\pt 0.0\pt 7.5\pt - "back" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "-front" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "heel" "\heel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "toe" "\toe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "bheel" "\bheel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "btoe" "\btoe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "fheel" "\fheel" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "ftoe" "\ftoe" 0.0\pt 6.0\pt -1.0\pt 5.0\pt - "-back" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "front" "\backorfront" 0.0\pt 6.0\pt 0.0\pt 3.0\pt - "turn" "\turn" -2.0\pt 7.0\pt 0.0\pt 4.0\pt - } - "style" = \table { "roman" "\settext{%}" 0.0\pt 7.50\pt 0.0\pt 8.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 + "finger" "\setfinger{%}" 0.0\pt 0.0\pt 0.0\pt 4.0\pt } "dynamics" = \table { - "mf" "\dynmf" "fff" "\dynfff" "ff" "\dynff" @@ -56,7 +28,6 @@ table_sixteen= "fp" "\dynfp" "sf" "\dynsf" "sfz" "\dynsfz" - } "align" = \table { "-1" "\leftalign{%}" @@ -64,38 +35,11 @@ table_sixteen= "1" "\rightalign{%}" } - "clefs" = \table { - "violin" "\violinclef" 0.0\pt 12.8\pt -10.0\pt 18.0\pt - "bass" "\bassclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "alto" "\altoclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "tenor" "\altoclef" 0.0\pt 12.8\pt 0.0\pt 16.0\pt - "violin_change" "\cviolinclef" 0.0\pt 11.2\pt -12.0\pt 12.0\pt - "bass_change" "\cbassclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - "alto_change" "\caltoclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - "tenor_change" "\caltoclef" 0.0\pt 11.2\pt 0.0\pt 16.0\pt - } - - % ugh what's our outdir called? - \include "mf/out/font-en-tja16.ly" - "slur" = \table { "whole" "\slurchar%{%}" "half" "\hslurchar%{%}" } - "accidentals" = \table { - "-2" "\flatflat" 0.0\pt 8.16\pt -2.5\pt 7.5\pt - "-1" "\flat" 0.0\pt 4.8\pt -2.5\pt 7.5\pt - "0" "\natural" 0.0\pt 4.8\pt -7.5\pt 7.5\pt - "1" "\sharp" 0.0\pt 3.6\pt -7.5\pt 7.5\pt - "2" "\sharpsharp" 0.0\pt 4.8\pt -2.5\pt 7.5\pt - } - - "streepjes" = \table { - "toplines" "\toplines{%}" -1.0\pt 7.0\pt 0.0\pt 0.0\pt - "botlines" "\botlines{%}" -1.0\pt 7.0\pt 0.0\pt 0.0\pt - } - "bars" = \table { "empty" "\emptybar" "" "" 0.0\pt 0.0\pt 0.0\pt 16.0\pt @@ -109,26 +53,6 @@ table_sixteen= } - "rests" = \table { - "-2o" "\longarest" 0.0\pt 6.0\pt 0.0\pt 4.0\pt - "-2" "\longarest" 0.0\pt 6.0\pt 0.0\pt 4.0\pt - "-1o" "\breverest" 0.0\pt 6.0\pt 0.0\pt 4.0\pt - "-1" "\breverest" 0.0\pt 6.0\pt 0.0\pt 4.0\pt - "0o" "\outsidewholerest" 0.0\pt 6.0\pt 0.0\pt 2.0\pt - "0" "\wholerest" 0.0\pt 6.0\pt 0.0\pt 2.0\pt - "1" "\halfrest" 0.0\pt 6.0\pt -2.0\pt 0.0\pt - "1o" "\outsidehalfrest" 0.0\pt 6.0\pt -2.0\pt 0.0\pt - "2o" "\quartrest" -5.0\pt 2.0\pt -5.0\pt 5.0\pt - "3o" "\eighthrest" 0.0\pt 5.0\pt 0.0\pt 8.0\pt - "4o" "\sixteenthrest" 0.0\pt 6.0\pt 0.0\pt 12.0\pt - "2" "\quartrest" -5.0\pt 2.0\pt -5.0\pt 5.0\pt - "3" "\eighthrest" 0.0\pt 5.0\pt 0.0\pt 8.0\pt - "4" "\sixteenthrest" 0.0\pt 6.0\pt 0.0\pt 12.0\pt - "5" "\thirtysecondrest" 0.0\pt 6.0\pt 0.0\pt 16.0\pt - "6" "\sixtyfourthrest" 0.0\pt 6.0\pt 0.0\pt 16.0\pt - "7" "\hundredtwentyeighthrest" 0.0\pt 6.0\pt 0.0\pt 16.0\pt - } - "meters" = \table { "C" "\fourfourmeter" 0.0\pt 10.0\pt -5.0\pt 5.0\pt "C2" "\allabreve" 0.0\pt 10.0\pt -5.0\pt 5.0\pt @@ -136,39 +60,21 @@ table_sixteen= % dims ignored for this table "param" = \table { - "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt - "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -5.0\pt 5.0\pt - "linestaf" "\linestafsym{%}{%}" +% "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt + "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 32.0\pt 80.0\pt + "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -8.0\pt 8.0\pt "stem" "\stem{%}{%}" "fill" "\hbox{}" % ugh. 8pt - "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt + "crescendosym" "\crescendosym{%}" 0.0\pt 0.0\pt -2.0\pt 2.0\pt "decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt } - "dots" = \table { - "1" "\lsingledot" 0.0\pt 2.0\pt -1.0\pt 1.0\pt - "2" "\ldoubledot" 0.0\pt 5.0\pt -1.0\pt 1.0\pt - "3" "\ltripledot" 0.0\pt 8.0\pt -1.0\pt 1.0\pt - } - - "flags" = \table { - "u3" "\eighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "u4" "\sixteenthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "u5" "\thirtysecondflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "u6" "\sixtyfourthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "u7" "\hundredtwentyeighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "d3" "\deighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "d4" "\dsixteenthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "d5" "\dthirtysecondflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "d6" "\dsixtyfourthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - "d7" "\dhundredtwentyeighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt - } "beamslopes" = \table { - "slope" "\beamslope{%}{%}" - "horizontal" "\rulesym{%}{%}" + "slope" "\beamslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt + "horizontal" "\rulesym{%}{%}" } - + \include "feta16.ly" }