From: fred Date: Sun, 24 Mar 2002 20:00:12 +0000 (+0000) Subject: lilypond-0.1.22 X-Git-Tag: release/1.5.59~3740 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c5f5eb19a6d844d0b76275d5fc88be696c00fbc8;p=lilypond.git lilypond-0.1.22 --- diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly index a2984b2481..4d27f2f750 100644 --- a/init/font-en-tja16.ly +++ b/init/font-en-tja16.ly @@ -1,57 +1,58 @@ -% generated automatically by mf-to-table.py version 0.3 -% on Thu Oct 9 11:15:46 1997 +% generated automatically by mf-to-table.py version 0.4 +% on Fri Oct 10 21:22:38 1997 % Do not edit - % input from out/font-en-tja16.log % name=\symboltables { - "rests" = \table { - "0" "\wholerest" -0.00\pt 6.00\pt 1.50\pt 4.00\pt - "1" "\halfrest" -0.00\pt 6.00\pt -0.00\pt 2.50\pt - "0o" "\outsidewholerest" -2.50\pt 8.50\pt 1.50\pt 4.00\pt - "1o" "\outsidehalfrest" -2.50\pt 8.50\pt -0.00\pt 2.50\pt - "2" "\quartrest" -0.00\pt 4.00\pt 3.00\pt 14.00\pt - "3" "\eighthrest" -0.00\pt 5.33\pt 4.00\pt 11.47\pt - "4" "\sixteenthrest" -0.00\pt 5.33\pt -0.00\pt 11.47\pt - "5" "\thirtysecondrest" -0.00\pt 5.33\pt -0.00\pt 15.47\pt - "6" "\sixtyfourthrest" -0.00\pt 5.33\pt -0.00\pt 19.47\pt - "7" "\hundredtwentyeighthrest" -0.00\pt 5.33\pt -0.00\pt 23.47\pt + "rests" = \table { + "0" "\\wholerest" -0.00\pt 6.00\pt 1.50\pt 4.00\pt + "1" "\\halfrest" -0.00\pt 6.00\pt -0.00\pt 2.50\pt + "0o" "\\outsidewholerest" -2.50\pt 8.50\pt 1.50\pt 4.00\pt + "1o" "\\outsidehalfrest" -2.50\pt 8.50\pt -0.00\pt 2.50\pt + "2" "\\quartrest" -0.00\pt 4.00\pt 3.00\pt 14.00\pt + "3" "\\eighthrest" -0.00\pt 5.33\pt 4.00\pt 11.47\pt + "4" "\\sixteenthrest" -0.00\pt 5.33\pt -0.00\pt 11.47\pt + "5" "\\thirtysecondrest" -0.00\pt 5.33\pt -0.00\pt 15.47\pt + "6" "\\sixtyfourthrest" -0.00\pt 5.33\pt -0.00\pt 19.47\pt + "7" "\\hundredtwentyeighthrest" -0.00\pt 5.33\pt -0.00\pt 23.47\pt } - "accidentals" = \table { - "1" "\sharp" -0.00\pt 4.40\pt -6.00\pt 6.00\pt - "0" "\natural" -0.00\pt 2.67\pt -6.00\pt 6.00\pt - "-1" "\flat" -0.00\pt 3.00\pt -2.00\pt 8.00\pt - "-2" "\flatflat" -0.00\pt 6.00\pt -2.00\pt 8.00\pt - "2" "\sharpsharp" -0.00\pt 4.00\pt -2.00\pt 2.00\pt + "accidentals" = \table { + "1" "\\sharp" -0.00\pt 4.40\pt -6.00\pt 6.00\pt + "0" "\\natural" -0.00\pt 2.67\pt -6.00\pt 6.00\pt + "-1" "\\flat" -0.00\pt 3.00\pt -2.00\pt 8.00\pt + "-2" "\\flatflat" -0.00\pt 6.00\pt -2.00\pt 8.00\pt + "2" "\\sharpsharp" -0.00\pt 4.00\pt -2.00\pt 2.00\pt } - "dots" = \table { - "dot" "\dot" -0.00\pt 1.80\pt -0.90\pt 0.90\pt + "dots" = \table { + "dot" "\\dot" -0.00\pt 1.80\pt -0.90\pt 0.90\pt } - "balls" = \table { - "-1" "\brevisball" -0.00\pt 8.00\pt -2.20\pt 2.20\pt - "-2" "\longaball" -0.00\pt 8.00\pt -2.20\pt 2.20\pt - "0" "\wholeball" -0.00\pt 7.92\pt -2.20\pt 2.20\pt - "1" "\halfball" -0.00\pt 5.51\pt -2.20\pt 2.20\pt - "2" "\quartball" -0.00\pt 5.28\pt -2.20\pt 2.20\pt + "balls" = \table { + "-1" "\\brevisball" -0.00\pt 8.00\pt -2.20\pt 2.20\pt + "-2" "\\longaball" -0.00\pt 8.00\pt -2.20\pt 2.20\pt + "0" "\\wholeball" -0.00\pt 7.92\pt -2.20\pt 2.20\pt + "1" "\\halfball" -0.00\pt 5.51\pt -2.20\pt 2.20\pt + "2" "\\quartball" -0.00\pt 5.28\pt -2.20\pt 2.20\pt } - "foobars" = \table { - "ufermata" "\ufermata" -6.30\pt 6.30\pt -0.30\pt 6.80\pt - "dfermata" "\dfermata" -6.30\pt 6.30\pt -6.80\pt 0.00\pt - "accent" "\sforzatoaccent" -3.60\pt 3.60\pt -2.00\pt 2.00\pt - "staccato" "\staccato" -0.50\pt 0.50\pt -0.50\pt 0.50\pt - "ustaccatissimo" "\ustaccatissimo" -0.80\pt 0.80\pt -0.20\pt 4.00\pt - "dstaccatissimo" "\dstaccatissimo" -0.80\pt 0.80\pt -4.00\pt 0.20\pt - "tenuto" "\tenuto" -3.60\pt 3.60\pt -0.24\pt 0.24\pt - "umarcato" "\umarcato" -2.00\pt 2.00\pt -0.00\pt 4.40\pt - "dmarcato" "\dmarcato" -2.00\pt 2.00\pt -4.40\pt 0.00\pt - "open" "\ouvert" -1.40\pt 1.40\pt -0.00\pt 3.50\pt - "stopped" "\plusstop" -2.20\pt 2.20\pt -2.20\pt 2.20\pt - "upbow" "\upbow" -2.60\pt 2.60\pt -0.00\pt 7.80\pt - "downbow" "\downbow" -3.50\pt 3.50\pt -0.00\pt 4.00\pt - "turn" "\turn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt - "utrill" "\utrill" -0.00\pt 8.00\pt -0.00\pt 6.00\pt + "scripts" = \table { + "ufermata" "\\ufermata" -5.30\pt 5.30\pt -0.30\pt 5.80\pt + "dfermata" "\\dfermata" -5.30\pt 5.30\pt -5.80\pt 0.00\pt + "sforzato" "\\sforzatoaccent" -3.60\pt 3.60\pt -2.00\pt 2.00\pt + "staccato" "\\staccato" -0.60\pt 0.60\pt -0.60\pt 0.60\pt + "ustaccatissimo" "\\ustaccatissimo" -0.80\pt 0.80\pt -0.20\pt 4.00\pt + "dstaccatissimo" "\\dstaccatissimo" -0.80\pt 0.80\pt -4.00\pt 0.20\pt + "tenuto" "\\tenuto" -3.60\pt 3.60\pt -0.24\pt 0.24\pt + "umarcato" "\\umarcato" -2.00\pt 2.00\pt -0.00\pt 4.40\pt + "dmarcato" "\\dmarcato" -2.00\pt 2.00\pt -4.40\pt 0.00\pt + "open" "\\ouvert" -1.60\pt 1.60\pt -2.00\pt 2.00\pt + "stopped" "\\plusstop" -2.20\pt 2.20\pt -2.20\pt 2.20\pt + "upbow" "\\upbow" -2.60\pt 2.60\pt -0.00\pt 8.32\pt + "downbow" "\\downbow" -3.00\pt 3.00\pt -0.00\pt 5.33\pt + "turn" "\\turn" -4.38\pt 4.38\pt -2.12\pt 2.12\pt + "trill" "\\trill" -0.00\pt 8.00\pt -0.00\pt 9.00\pt + "pedalheel" "\\pedalheel" -2.00\pt 2.00\pt -2.00\pt 2.67\pt + "pedaltoe" "\\pedaltoe" -2.00\pt 2.00\pt -0.00\pt 6.00\pt } - "floogbars" = \table { - "3u" "\eighthflag" -0.20\pt 5.17\pt -12.77\pt 0.20\pt - "3d" "\deighthflag" -0.20\pt 5.17\pt -0.20\pt 12.77\pt + "floogbars" = \table { + "3u" "\\eighthflag" -0.20\pt 4.10\pt -12.77\pt 0.20\pt + "3d" "\\deighthflag" -0.20\pt 4.10\pt -0.20\pt 12.77\pt } % } % $name diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly index fcffbad34e..63af39049e 100644 --- a/init/font-en-tja20.ly +++ b/init/font-en-tja20.ly @@ -1,57 +1,58 @@ -% generated automatically by mf-to-table.py version 0.3 -% on Thu Oct 9 11:15:50 1997 +% generated automatically by mf-to-table.py version 0.4 +% on Fri Oct 10 21:22:44 1997 % Do not edit - % input from out/font-en-tja20.log % name=\symboltables { - "rests" = \table { - "0" "\wholerest" -0.00\pt 7.50\pt 1.88\pt 5.00\pt - "1" "\halfrest" -0.00\pt 7.50\pt -0.00\pt 3.13\pt - "0o" "\outsidewholerest" -3.13\pt 10.62\pt 1.88\pt 5.00\pt - "1o" "\outsidehalfrest" -3.13\pt 10.62\pt -0.00\pt 3.13\pt - "2" "\quartrest" -0.00\pt 5.00\pt 3.75\pt 17.50\pt - "3" "\eighthrest" -0.00\pt 6.67\pt 5.00\pt 14.33\pt - "4" "\sixteenthrest" -0.00\pt 6.67\pt -0.00\pt 14.33\pt - "5" "\thirtysecondrest" -0.00\pt 6.67\pt -0.00\pt 19.33\pt - "6" "\sixtyfourthrest" -0.00\pt 6.67\pt -0.00\pt 24.33\pt - "7" "\hundredtwentyeighthrest" -0.00\pt 6.67\pt -0.00\pt 29.33\pt + "rests" = \table { + "0" "\\wholerest" -0.00\pt 7.50\pt 1.88\pt 5.00\pt + "1" "\\halfrest" -0.00\pt 7.50\pt -0.00\pt 3.13\pt + "0o" "\\outsidewholerest" -3.13\pt 10.62\pt 1.88\pt 5.00\pt + "1o" "\\outsidehalfrest" -3.13\pt 10.62\pt -0.00\pt 3.13\pt + "2" "\\quartrest" -0.00\pt 5.00\pt 3.75\pt 17.50\pt + "3" "\\eighthrest" -0.00\pt 6.67\pt 5.00\pt 14.33\pt + "4" "\\sixteenthrest" -0.00\pt 6.67\pt -0.00\pt 14.33\pt + "5" "\\thirtysecondrest" -0.00\pt 6.67\pt -0.00\pt 19.33\pt + "6" "\\sixtyfourthrest" -0.00\pt 6.67\pt -0.00\pt 24.33\pt + "7" "\\hundredtwentyeighthrest" -0.00\pt 6.67\pt -0.00\pt 29.33\pt } - "accidentals" = \table { - "1" "\sharp" -0.00\pt 5.50\pt -7.50\pt 7.50\pt - "0" "\natural" -0.00\pt 3.33\pt -7.50\pt 7.50\pt - "-1" "\flat" -0.00\pt 3.75\pt -2.50\pt 10.00\pt - "-2" "\flatflat" -0.00\pt 7.50\pt -2.50\pt 10.00\pt - "2" "\sharpsharp" -0.00\pt 5.00\pt -2.50\pt 2.50\pt + "accidentals" = \table { + "1" "\\sharp" -0.00\pt 5.50\pt -7.50\pt 7.50\pt + "0" "\\natural" -0.00\pt 3.33\pt -7.50\pt 7.50\pt + "-1" "\\flat" -0.00\pt 3.75\pt -2.50\pt 10.00\pt + "-2" "\\flatflat" -0.00\pt 7.50\pt -2.50\pt 10.00\pt + "2" "\\sharpsharp" -0.00\pt 5.00\pt -2.50\pt 2.50\pt } - "dots" = \table { - "dot" "\dot" -0.00\pt 2.25\pt -1.13\pt 1.13\pt + "dots" = \table { + "dot" "\\dot" -0.00\pt 2.25\pt -1.13\pt 1.13\pt } - "balls" = \table { - "-1" "\brevisball" -0.00\pt 10.00\pt -2.75\pt 2.75\pt - "-2" "\longaball" -0.00\pt 10.00\pt -2.75\pt 2.75\pt - "0" "\wholeball" -0.00\pt 9.90\pt -2.75\pt 2.75\pt - "1" "\halfball" -0.00\pt 6.89\pt -2.75\pt 2.75\pt - "2" "\quartball" -0.00\pt 6.61\pt -2.75\pt 2.75\pt + "balls" = \table { + "-1" "\\brevisball" -0.00\pt 10.00\pt -2.75\pt 2.75\pt + "-2" "\\longaball" -0.00\pt 10.00\pt -2.75\pt 2.75\pt + "0" "\\wholeball" -0.00\pt 9.90\pt -2.75\pt 2.75\pt + "1" "\\halfball" -0.00\pt 6.89\pt -2.75\pt 2.75\pt + "2" "\\quartball" -0.00\pt 6.61\pt -2.75\pt 2.75\pt } - "foobars" = \table { - "ufermata" "\ufermata" -7.88\pt 7.88\pt -0.38\pt 8.50\pt - "dfermata" "\dfermata" -7.88\pt 7.88\pt -8.50\pt 0.00\pt - "accent" "\sforzatoaccent" -4.50\pt 4.50\pt -2.50\pt 2.50\pt - "staccato" "\staccato" -0.63\pt 0.63\pt -0.63\pt 0.63\pt - "ustaccatissimo" "\ustaccatissimo" -1.00\pt 1.00\pt -0.20\pt 5.00\pt - "dstaccatissimo" "\dstaccatissimo" -1.00\pt 1.00\pt -5.00\pt 0.20\pt - "tenuto" "\tenuto" -4.50\pt 4.50\pt -0.30\pt 0.30\pt - "umarcato" "\umarcato" -2.50\pt 2.50\pt -0.00\pt 5.50\pt - "dmarcato" "\dmarcato" -2.50\pt 2.50\pt -5.50\pt 0.00\pt - "open" "\ouvert" -1.75\pt 1.75\pt -0.00\pt 4.38\pt - "stopped" "\plusstop" -2.75\pt 2.75\pt -2.75\pt 2.75\pt - "upbow" "\upbow" -3.25\pt 3.25\pt -0.00\pt 9.75\pt - "downbow" "\downbow" -4.38\pt 4.38\pt -0.00\pt 5.00\pt - "turn" "\turn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt - "utrill" "\utrill" -0.00\pt 10.00\pt -0.00\pt 7.50\pt + "scripts" = \table { + "ufermata" "\\ufermata" -6.63\pt 6.63\pt -0.38\pt 7.25\pt + "dfermata" "\\dfermata" -6.63\pt 6.63\pt -7.25\pt 0.00\pt + "sforzato" "\\sforzatoaccent" -4.50\pt 4.50\pt -2.50\pt 2.50\pt + "staccato" "\\staccato" -0.75\pt 0.75\pt -0.75\pt 0.75\pt + "ustaccatissimo" "\\ustaccatissimo" -1.00\pt 1.00\pt -0.20\pt 5.00\pt + "dstaccatissimo" "\\dstaccatissimo" -1.00\pt 1.00\pt -5.00\pt 0.20\pt + "tenuto" "\\tenuto" -4.50\pt 4.50\pt -0.30\pt 0.30\pt + "umarcato" "\\umarcato" -2.50\pt 2.50\pt -0.00\pt 5.50\pt + "dmarcato" "\\dmarcato" -2.50\pt 2.50\pt -5.50\pt 0.00\pt + "open" "\\ouvert" -2.00\pt 2.00\pt -2.50\pt 2.50\pt + "stopped" "\\plusstop" -2.75\pt 2.75\pt -2.75\pt 2.75\pt + "upbow" "\\upbow" -3.25\pt 3.25\pt -0.00\pt 10.40\pt + "downbow" "\\downbow" -3.75\pt 3.75\pt -0.00\pt 6.67\pt + "turn" "\\turn" -5.47\pt 5.47\pt -2.65\pt 2.65\pt + "trill" "\\trill" -0.00\pt 10.00\pt -0.00\pt 11.25\pt + "pedalheel" "\\pedalheel" -2.50\pt 2.50\pt -2.50\pt 3.33\pt + "pedaltoe" "\\pedaltoe" -2.50\pt 2.50\pt -0.00\pt 7.50\pt } - "floogbars" = \table { - "3u" "\eighthflag" -0.25\pt 6.46\pt -15.91\pt 0.25\pt - "3d" "\deighthflag" -0.25\pt 6.46\pt -0.25\pt 15.91\pt + "floogbars" = \table { + "3u" "\\eighthflag" -0.25\pt 5.13\pt -15.91\pt 0.25\pt + "3d" "\\deighthflag" -0.25\pt 5.13\pt -0.25\pt 15.91\pt } % } % $name diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex index e09b104022..e6809e2253 100644 --- a/tex/font-en-tja16.tex +++ b/tex/font-en-tja16.tex @@ -1,7 +1,6 @@ -% generated automatically by mf-to-table.py version 0.3 -% on Thu Oct 9 11:15:46 1997 +% generated automatically by mf-to-table.py version 0.4 +% on Fri Oct 10 21:22:38 1997 % Do not edit - % input from out/font-en-tja16.log % name % rests @@ -33,7 +32,7 @@ \fetdef\halfball{19} \fetdef\quartball{20} -% foobars +% scripts \fetdef\ufermata{21} \fetdef\dfermata{22} \fetdef\sforzatoaccent{23} @@ -48,9 +47,11 @@ \fetdef\upbow{32} \fetdef\downbow{33} \fetdef\turn{34} -\fetdef\utrill{35} +\fetdef\trill{35} +\fetdef\pedalheel{36} +\fetdef\pedaltoe{37} % floogbars -\fetdef\eighthflag{36} -\fetdef\deighthflag{37} +\fetdef\eighthflag{38} +\fetdef\deighthflag{39} diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex index ff33516f8c..1791d0ebad 100644 --- a/tex/font-en-tja20.tex +++ b/tex/font-en-tja20.tex @@ -1,7 +1,6 @@ -% generated automatically by mf-to-table.py version 0.3 -% on Thu Oct 9 11:15:50 1997 +% generated automatically by mf-to-table.py version 0.4 +% on Fri Oct 10 21:22:44 1997 % Do not edit - % input from out/font-en-tja20.log % name % rests @@ -33,7 +32,7 @@ \fetdef\halfball{19} \fetdef\quartball{20} -% foobars +% scripts \fetdef\ufermata{21} \fetdef\dfermata{22} \fetdef\sforzatoaccent{23} @@ -48,9 +47,11 @@ \fetdef\upbow{32} \fetdef\downbow{33} \fetdef\turn{34} -\fetdef\utrill{35} +\fetdef\trill{35} +\fetdef\pedalheel{36} +\fetdef\pedaltoe{37} % floogbars -\fetdef\eighthflag{36} -\fetdef\deighthflag{37} +\fetdef\eighthflag{38} +\fetdef\deighthflag{39}