From: fred Date: Sun, 24 Mar 2002 20:04:47 +0000 (+0000) Subject: lilypond-0.1.41 X-Git-Tag: release/1.5.59~3491 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a4866a32df2267a2c512c365fa35d7113e1b3803;p=lilypond.git lilypond-0.1.41 --- diff --git a/ANNOUNCE b/ANNOUNCE index 6bdaf16333..f21190a248 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -4,31 +4,27 @@ Subject: LilyPond 0.2 released - The GNU Project music typesetter GNU LilyPond - The GNU Project Music Typesetter -``WHAT IS GNU LilyPond?'' +WHAT IS LilyPond? GNU LilyPond is the GNU Project Music typesetter: it reads a music definition file and outputs formatted sheet music to a TeX file or (mechanical) performances to MIDI files. -WHY ? +WHAT'S NEW SINCE VERSION 0.1? -We want to create tools to produce production quality scores and parts -of public domain music. - - -WHAT'S NEW - -* LilyPond now includes a completely rewritten font: the Feta font. -We did our best to copy the best symbol designs available and We're -proud of the result. We hope you agree, so go check it out! +* LilyPond now includes a completely new music font: the Feta font. + We were quite disappointed with available music fonts, so we rolled + our own. We did our best to copy the best symbol designs available, + and we think that we've succeeded in doing so. We're proud of the + result, and we hope you agree, so go check it out! * More elegant output due to * better spacing - * better breaking + * better line breaking * better font design - * PostScript output for variable symbols. + * PostScript output for variable symbols * Lots of bugfixes @@ -36,7 +32,7 @@ proud of the result. We hope you agree, so go check it out! * Better MIDI importing -* Easier to use due to better scripts and input format enhancements. +* Easier to use due to better scripts and input format enhancements * MusixTeX not needed anymore @@ -49,10 +45,11 @@ customizable notenames. MIDI output lets you check if you have entered the correct notes. MIDI to Mudela conversion through the mi2mu program. -Multiple staffs in one score. Each staff can have a different meters. -Multiple voices within one staff (up to four handled graciously); -beams optionally shared between voices. Multiple scores within one -input file. Each score is output to a different file. +Font size selectable (26pt, 20pt, 16pt staffsize) for each score. +Multiple staffs in one score. Each staff may have various different +meters. Multiple voices within one staff (up to four handled +graciously); beams optionally shared between voices. Multiple scores +within one input file. Each score is output to a different file. Beams, slurs, chords, super/subscripts (accents and text), general n-plet (triplet, quadruplets, etc.), lyrics, transposition, diff --git a/bin/make-website.py b/bin/make-website.py index 52bc149378..e0f8480ac1 100644 --- a/bin/make-website.py +++ b/bin/make-website.py @@ -13,13 +13,24 @@ The WWW site is my test-suite for LilyPond, I usually don't distribute versions that fail to complete this script """ +import sys +import os + +lilypath ='' +try: + lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/' +except IndexError: + lilypath = os.environ['HOME'] + 'musix/current' +lilypath = lilypath + '/bin/' +sys.path.append(lilypath) + from lilypython import * import __main__ import glob depth = '' makewebsite_id = ""; -id_str = "make-website 0.6"; +id_str = "make-website 0.7"; tar = "tar"; make = "make"; mailaddress = "unknown" @@ -79,7 +90,7 @@ examples=["twinkle-pop", "gallina", "twinkle", "collisions", - "font", + "font16", "font20", #"scales", "rhythm", diff --git a/init/feta11.ly b/init/feta11.ly new file mode 100644 index 0000000000..0ecd6c7ada --- /dev/null +++ b/init/feta11.ly @@ -0,0 +1,79 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from out/feta11.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" -0.00\pt 4.13\pt -1.72\pt 0.00\pt + "1" "\\halfrest" -0.00\pt 4.13\pt -0.00\pt 1.72\pt + "0o" "\\outsidewholerest" -1.72\pt 5.84\pt -1.72\pt 0.28\pt + "1o" "\\outsidehalfrest" -1.72\pt 5.84\pt -0.28\pt 1.72\pt + "2" "\\quartrest" -0.00\pt 2.97\pt 2.06\pt 9.90\pt + "3" "\\eighthrest" -0.00\pt 3.67\pt 2.75\pt 7.81\pt + "4" "\\sixteenthrest" -0.00\pt 4.27\pt -0.00\pt 7.81\pt + "5" "\\thirtysecondrest" -0.00\pt 4.81\pt -0.00\pt 10.56\pt + "6" "\\sixtyfourthrest" -0.00\pt 5.16\pt -0.00\pt 13.31\pt + "7" "\\hundredtwentyeighthrest" -0.00\pt 5.75\pt -0.00\pt 16.06\pt + } + "accidentals" = \table { + "1" "\\sharp" -0.00\pt 3.03\pt -4.13\pt 4.13\pt + "0" "\\natural" -0.00\pt 1.83\pt -4.13\pt 4.13\pt + "-1" "\\flat" -0.33\pt 2.20\pt -1.38\pt 5.50\pt + "-2" "\\flatflat" -0.33\pt 3.99\pt -1.38\pt 5.50\pt + "2" "\\sharpsharp" -0.00\pt 2.75\pt -1.38\pt 1.38\pt + } + "dots" = \table { + "dot" "\\dot" -0.00\pt 1.24\pt -0.62\pt 0.62\pt + "repeatcolon" "\\repeatcolon" -0.00\pt 1.24\pt -1.38\pt 1.38\pt + } + "balls" = \table { + "-1" "\\brevisball" -0.00\pt 5.50\pt -1.51\pt 1.51\pt + "-1l" "\\brevisledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt + "-2" "\\longaball" -0.00\pt 5.50\pt -1.51\pt 1.51\pt + "-2l" "\\longaledger" -1.38\pt 6.88\pt -0.28\pt 0.28\pt + "0" "\\wholeball" -0.00\pt 5.45\pt -1.51\pt 1.51\pt + "0l" "\\wholeledger" -1.36\pt 6.81\pt -0.28\pt 0.28\pt + "1" "\\halfball" -0.00\pt 3.79\pt -1.51\pt 1.51\pt + "1l" "\\halfledger" -0.95\pt 4.74\pt -0.28\pt 0.28\pt + "2" "\\quartball" -0.00\pt 3.63\pt -1.51\pt 1.51\pt + "2l" "\\quartledger" -0.91\pt 4.54\pt -0.28\pt 0.28\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -3.64\pt 3.64\pt -0.21\pt 3.99\pt + "dfermata" "\\dfermata" -3.64\pt 3.64\pt -3.99\pt 0.21\pt + "sforzato" "\\sforzatoaccent" -2.47\pt 2.47\pt -1.38\pt 1.38\pt + "staccato" "\\staccato" -0.41\pt 0.41\pt -0.41\pt 0.41\pt + "ustaccatissimo" "\\ustaccatissimo" -0.55\pt 0.55\pt -0.20\pt 2.75\pt + "dstaccatissimo" "\\dstaccatissimo" -0.55\pt 0.55\pt -2.75\pt 0.20\pt + "tenuto" "\\tenuto" -2.47\pt 2.47\pt -0.17\pt 0.17\pt + "umarcato" "\\umarcato" -1.38\pt 1.38\pt -0.00\pt 3.03\pt + "dmarcato" "\\dmarcato" -1.38\pt 1.38\pt -3.03\pt 0.00\pt + "open" "\\ouvert" -1.10\pt 1.10\pt -1.38\pt 1.38\pt + "stopped" "\\plusstop" -1.51\pt 1.51\pt -1.51\pt 1.51\pt + "upbow" "\\upbow" -1.79\pt 1.79\pt -0.00\pt 5.72\pt + "downbow" "\\downbow" -2.06\pt 2.06\pt -0.00\pt 3.67\pt + "turn" "\\turn" -3.01\pt 3.01\pt -1.46\pt 1.46\pt + "trill" "\\trill" -2.75\pt 2.75\pt -0.00\pt 6.19\pt + "pedalheel" "\\pedalheel" -1.38\pt 1.38\pt -1.38\pt 1.83\pt + "pedaltoe" "\\pedaltoe" -1.38\pt 1.38\pt -0.00\pt 4.13\pt + "flageolet" "\\flageolet" -1.47\pt 1.47\pt -1.47\pt 1.47\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.14\pt 3.39\pt -8.43\pt 0.14\pt + "u4" "\\sixteenthflag" -0.14\pt 3.39\pt -9.80\pt 0.14\pt + "u5" "\\thirtysecondflag" -0.14\pt 3.39\pt -11.87\pt 0.14\pt + "u6" "\\sixtyfourthflag" -0.14\pt 3.39\pt -14.62\pt 0.14\pt + "d3" "\\deighthflag" -0.14\pt 3.76\pt -0.14\pt 8.02\pt + "d4" "\\dsixteenthflag" -0.14\pt 3.76\pt -0.14\pt 8.43\pt + "d5" "\\dthirtysecondflag" -0.14\pt 3.76\pt -0.14\pt 10.77\pt + "d6" "\\dsixtyfourthflag" -0.14\pt 3.76\pt -0.14\pt 12.14\pt + } + "clefs" = \table { + "alto" "\\altoclef" -2.75\pt 10.24\pt -5.50\pt 5.50\pt + "alto_change" "\\caltoclef" -2.20\pt 8.19\pt -4.40\pt 4.40\pt + "bass" "\\bassclef" -1.38\pt 9.90\pt -6.88\pt 2.75\pt + "bass_change" "\\cbassclef" -1.10\pt 7.92\pt -5.50\pt 2.20\pt + "violin" "\\violinclef" -2.40\pt 10.28\pt -8.25\pt 13.75\pt + "violin_change" "\\cviolinclef" -2.08\pt 8.06\pt -6.60\pt 11.00\pt + } + % } % $name diff --git a/init/feta16.ly b/init/feta16.ly index 8cee634ab2..520fde4b34 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ -% Creator: mf-to-table.py version 0.4 -% Automatically generated on Mon Jan 5 15:23:51 1998 +% Creator: mf-to-table.py version 0.5 +% Automatically generated on % Do not edit % input from out/feta16.log % name=\symboltables { diff --git a/init/feta19.ly b/init/feta19.ly new file mode 100644 index 0000000000..1b8d266f5c --- /dev/null +++ b/init/feta19.ly @@ -0,0 +1,79 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from out/feta19.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" -0.00\pt 7.13\pt -2.97\pt 0.00\pt + "1" "\\halfrest" -0.00\pt 7.13\pt -0.00\pt 2.97\pt + "0o" "\\outsidewholerest" -2.97\pt 10.09\pt -2.97\pt 0.48\pt + "1o" "\\outsidehalfrest" -2.97\pt 10.09\pt -0.48\pt 2.97\pt + "2" "\\quartrest" -0.00\pt 5.13\pt 3.56\pt 17.10\pt + "3" "\\eighthrest" -0.00\pt 6.33\pt 4.75\pt 13.50\pt + "4" "\\sixteenthrest" -0.00\pt 7.37\pt -0.00\pt 13.50\pt + "5" "\\thirtysecondrest" -0.00\pt 8.32\pt -0.00\pt 18.25\pt + "6" "\\sixtyfourthrest" -0.00\pt 8.92\pt -0.00\pt 23.00\pt + "7" "\\hundredtwentyeighthrest" -0.00\pt 9.93\pt -0.00\pt 27.75\pt + } + "accidentals" = \table { + "1" "\\sharp" -0.00\pt 5.23\pt -7.13\pt 7.13\pt + "0" "\\natural" -0.00\pt 3.17\pt -7.13\pt 7.13\pt + "-1" "\\flat" -0.57\pt 3.80\pt -2.38\pt 9.50\pt + "-2" "\\flatflat" -0.57\pt 6.89\pt -2.38\pt 9.50\pt + "2" "\\sharpsharp" -0.00\pt 4.75\pt -2.38\pt 2.38\pt + } + "dots" = \table { + "dot" "\\dot" -0.00\pt 2.14\pt -1.07\pt 1.07\pt + "repeatcolon" "\\repeatcolon" -0.00\pt 2.14\pt -2.38\pt 2.38\pt + } + "balls" = \table { + "-1" "\\brevisball" -0.00\pt 9.50\pt -2.61\pt 2.61\pt + "-1l" "\\brevisledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt + "-2" "\\longaball" -0.00\pt 9.50\pt -2.61\pt 2.61\pt + "-2l" "\\longaledger" -2.38\pt 11.88\pt -0.48\pt 0.48\pt + "0" "\\wholeball" -0.00\pt 9.41\pt -2.61\pt 2.61\pt + "0l" "\\wholeledger" -2.35\pt 11.76\pt -0.48\pt 0.48\pt + "1" "\\halfball" -0.00\pt 6.54\pt -2.61\pt 2.61\pt + "1l" "\\halfledger" -1.64\pt 8.18\pt -0.48\pt 0.48\pt + "2" "\\quartball" -0.00\pt 6.27\pt -2.61\pt 2.61\pt + "2l" "\\quartledger" -1.57\pt 7.84\pt -0.48\pt 0.48\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -6.29\pt 6.29\pt -0.36\pt 6.89\pt + "dfermata" "\\dfermata" -6.29\pt 6.29\pt -6.89\pt 0.36\pt + "sforzato" "\\sforzatoaccent" -4.27\pt 4.27\pt -2.38\pt 2.38\pt + "staccato" "\\staccato" -0.71\pt 0.71\pt -0.71\pt 0.71\pt + "ustaccatissimo" "\\ustaccatissimo" -0.95\pt 0.95\pt -0.20\pt 4.75\pt + "dstaccatissimo" "\\dstaccatissimo" -0.95\pt 0.95\pt -4.75\pt 0.20\pt + "tenuto" "\\tenuto" -4.27\pt 4.27\pt -0.29\pt 0.29\pt + "umarcato" "\\umarcato" -2.38\pt 2.38\pt -0.00\pt 5.23\pt + "dmarcato" "\\dmarcato" -2.38\pt 2.38\pt -5.23\pt 0.00\pt + "open" "\\ouvert" -1.90\pt 1.90\pt -2.38\pt 2.38\pt + "stopped" "\\plusstop" -2.61\pt 2.61\pt -2.61\pt 2.61\pt + "upbow" "\\upbow" -3.09\pt 3.09\pt -0.00\pt 9.88\pt + "downbow" "\\downbow" -3.56\pt 3.56\pt -0.00\pt 6.33\pt + "turn" "\\turn" -5.20\pt 5.20\pt -2.51\pt 2.51\pt + "trill" "\\trill" -4.75\pt 4.75\pt -0.00\pt 10.69\pt + "pedalheel" "\\pedalheel" -2.38\pt 2.38\pt -2.38\pt 3.17\pt + "pedaltoe" "\\pedaltoe" -2.38\pt 2.38\pt -0.00\pt 7.13\pt + "flageolet" "\\flageolet" -2.53\pt 2.53\pt -2.53\pt 2.53\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.24\pt 5.86\pt -14.56\pt 0.24\pt + "u4" "\\sixteenthflag" -0.24\pt 5.86\pt -16.93\pt 0.24\pt + "u5" "\\thirtysecondflag" -0.24\pt 5.86\pt -20.50\pt 0.24\pt + "u6" "\\sixtyfourthflag" -0.24\pt 5.86\pt -25.25\pt 0.24\pt + "d3" "\\deighthflag" -0.24\pt 6.49\pt -0.24\pt 13.85\pt + "d4" "\\dsixteenthflag" -0.24\pt 6.49\pt -0.24\pt 14.56\pt + "d5" "\\dthirtysecondflag" -0.24\pt 6.49\pt -0.24\pt 18.60\pt + "d6" "\\dsixtyfourthflag" -0.24\pt 6.49\pt -0.24\pt 20.97\pt + } + "clefs" = \table { + "alto" "\\altoclef" -4.75\pt 17.68\pt -9.50\pt 9.50\pt + "alto_change" "\\caltoclef" -3.80\pt 14.14\pt -7.60\pt 7.60\pt + "bass" "\\bassclef" -2.38\pt 17.10\pt -11.88\pt 4.75\pt + "bass_change" "\\cbassclef" -1.90\pt 13.68\pt -9.50\pt 3.80\pt + "violin" "\\violinclef" -4.14\pt 17.75\pt -14.25\pt 23.75\pt + "violin_change" "\\cviolinclef" -3.60\pt 13.92\pt -11.40\pt 19.00\pt + } + % } % $name diff --git a/init/feta23.ly b/init/feta23.ly new file mode 100644 index 0000000000..bdebc4e996 --- /dev/null +++ b/init/feta23.ly @@ -0,0 +1,79 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from out/feta23.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" -0.00\pt 8.44\pt -3.52\pt 0.00\pt + "1" "\\halfrest" -0.00\pt 8.44\pt -0.00\pt 3.52\pt + "0o" "\\outsidewholerest" -3.52\pt 11.95\pt -3.52\pt 0.56\pt + "1o" "\\outsidehalfrest" -3.52\pt 11.95\pt -0.56\pt 3.52\pt + "2" "\\quartrest" -0.00\pt 6.08\pt 4.22\pt 20.25\pt + "3" "\\eighthrest" -0.00\pt 7.50\pt 5.63\pt 15.98\pt + "4" "\\sixteenthrest" -0.00\pt 8.73\pt -0.00\pt 15.98\pt + "5" "\\thirtysecondrest" -0.00\pt 9.85\pt -0.00\pt 21.61\pt + "6" "\\sixtyfourthrest" -0.00\pt 10.56\pt -0.00\pt 27.23\pt + "7" "\\hundredtwentyeighthrest" -0.00\pt 11.75\pt -0.00\pt 32.86\pt + } + "accidentals" = \table { + "1" "\\sharp" -0.00\pt 6.19\pt -8.44\pt 8.44\pt + "0" "\\natural" -0.00\pt 3.75\pt -8.44\pt 8.44\pt + "-1" "\\flat" -0.68\pt 4.50\pt -2.81\pt 11.25\pt + "-2" "\\flatflat" -0.68\pt 8.16\pt -2.81\pt 11.25\pt + "2" "\\sharpsharp" -0.00\pt 5.63\pt -2.81\pt 2.81\pt + } + "dots" = \table { + "dot" "\\dot" -0.00\pt 2.53\pt -1.27\pt 1.27\pt + "repeatcolon" "\\repeatcolon" -0.00\pt 2.53\pt -2.81\pt 2.81\pt + } + "balls" = \table { + "-1" "\\brevisball" -0.00\pt 11.25\pt -3.09\pt 3.09\pt + "-1l" "\\brevisledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt + "-2" "\\longaball" -0.00\pt 11.25\pt -3.09\pt 3.09\pt + "-2l" "\\longaledger" -2.81\pt 14.06\pt -0.56\pt 0.56\pt + "0" "\\wholeball" -0.00\pt 11.14\pt -3.09\pt 3.09\pt + "0l" "\\wholeledger" -2.78\pt 13.92\pt -0.56\pt 0.56\pt + "1" "\\halfball" -0.00\pt 7.75\pt -3.09\pt 3.09\pt + "1l" "\\halfledger" -1.94\pt 9.69\pt -0.56\pt 0.56\pt + "2" "\\quartball" -0.00\pt 7.43\pt -3.09\pt 3.09\pt + "2l" "\\quartledger" -1.86\pt 9.29\pt -0.56\pt 0.56\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -7.45\pt 7.45\pt -0.42\pt 8.16\pt + "dfermata" "\\dfermata" -7.45\pt 7.45\pt -8.16\pt 0.42\pt + "sforzato" "\\sforzatoaccent" -5.06\pt 5.06\pt -2.81\pt 2.81\pt + "staccato" "\\staccato" -0.84\pt 0.84\pt -0.84\pt 0.84\pt + "ustaccatissimo" "\\ustaccatissimo" -1.13\pt 1.13\pt -0.20\pt 5.63\pt + "dstaccatissimo" "\\dstaccatissimo" -1.13\pt 1.13\pt -5.63\pt 0.20\pt + "tenuto" "\\tenuto" -5.06\pt 5.06\pt -0.34\pt 0.34\pt + "umarcato" "\\umarcato" -2.81\pt 2.81\pt -0.00\pt 6.19\pt + "dmarcato" "\\dmarcato" -2.81\pt 2.81\pt -6.19\pt 0.00\pt + "open" "\\ouvert" -2.25\pt 2.25\pt -2.81\pt 2.81\pt + "stopped" "\\plusstop" -3.09\pt 3.09\pt -3.09\pt 3.09\pt + "upbow" "\\upbow" -3.66\pt 3.66\pt -0.00\pt 11.70\pt + "downbow" "\\downbow" -4.22\pt 4.22\pt -0.00\pt 7.50\pt + "turn" "\\turn" -6.15\pt 6.15\pt -2.98\pt 2.98\pt + "trill" "\\trill" -5.63\pt 5.63\pt -0.00\pt 12.66\pt + "pedalheel" "\\pedalheel" -2.81\pt 2.81\pt -2.81\pt 3.75\pt + "pedaltoe" "\\pedaltoe" -2.81\pt 2.81\pt -0.00\pt 8.44\pt + "flageolet" "\\flageolet" -3.00\pt 3.00\pt -3.00\pt 3.00\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.28\pt 6.94\pt -17.24\pt 0.28\pt + "u4" "\\sixteenthflag" -0.28\pt 6.94\pt -20.05\pt 0.28\pt + "u5" "\\thirtysecondflag" -0.28\pt 6.94\pt -24.27\pt 0.28\pt + "u6" "\\sixtyfourthflag" -0.28\pt 6.94\pt -29.90\pt 0.28\pt + "d3" "\\deighthflag" -0.28\pt 7.68\pt -0.28\pt 16.40\pt + "d4" "\\dsixteenthflag" -0.28\pt 7.68\pt -0.28\pt 17.24\pt + "d5" "\\dthirtysecondflag" -0.28\pt 7.68\pt -0.28\pt 22.02\pt + "d6" "\\dsixtyfourthflag" -0.28\pt 7.68\pt -0.28\pt 24.83\pt + } + "clefs" = \table { + "alto" "\\altoclef" -5.63\pt 20.94\pt -11.25\pt 11.25\pt + "alto_change" "\\caltoclef" -4.50\pt 16.75\pt -9.00\pt 9.00\pt + "bass" "\\bassclef" -2.81\pt 20.25\pt -14.06\pt 5.63\pt + "bass_change" "\\cbassclef" -2.25\pt 16.20\pt -11.25\pt 4.50\pt + "violin" "\\violinclef" -4.90\pt 21.02\pt -16.88\pt 28.12\pt + "violin_change" "\\cviolinclef" -4.26\pt 16.48\pt -13.50\pt 22.50\pt + } + % } % $name diff --git a/init/feta26.ly b/init/feta26.ly new file mode 100644 index 0000000000..ac951291ab --- /dev/null +++ b/init/feta26.ly @@ -0,0 +1,79 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from out/feta26.log +% name=\symboltables { + "rests" = \table { + "0" "\\wholerest" -0.00\pt 9.75\pt -4.06\pt 0.00\pt + "1" "\\halfrest" -0.00\pt 9.75\pt -0.00\pt 4.06\pt + "0o" "\\outsidewholerest" -4.06\pt 13.81\pt -4.06\pt 0.65\pt + "1o" "\\outsidehalfrest" -4.06\pt 13.81\pt -0.65\pt 4.06\pt + "2" "\\quartrest" -0.00\pt 7.02\pt 4.88\pt 23.40\pt + "3" "\\eighthrest" -0.00\pt 8.67\pt 6.50\pt 18.47\pt + "4" "\\sixteenthrest" -0.00\pt 10.08\pt -0.00\pt 18.47\pt + "5" "\\thirtysecondrest" -0.00\pt 11.38\pt -0.00\pt 24.97\pt + "6" "\\sixtyfourthrest" -0.00\pt 12.20\pt -0.00\pt 31.47\pt + "7" "\\hundredtwentyeighthrest" -0.00\pt 13.58\pt -0.00\pt 37.97\pt + } + "accidentals" = \table { + "1" "\\sharp" -0.00\pt 7.15\pt -9.75\pt 9.75\pt + "0" "\\natural" -0.00\pt 4.33\pt -9.75\pt 9.75\pt + "-1" "\\flat" -0.78\pt 5.20\pt -3.25\pt 13.00\pt + "-2" "\\flatflat" -0.78\pt 9.42\pt -3.25\pt 13.00\pt + "2" "\\sharpsharp" -0.00\pt 6.50\pt -3.25\pt 3.25\pt + } + "dots" = \table { + "dot" "\\dot" -0.00\pt 2.92\pt -1.46\pt 1.46\pt + "repeatcolon" "\\repeatcolon" -0.00\pt 2.92\pt -3.25\pt 3.25\pt + } + "balls" = \table { + "-1" "\\brevisball" -0.00\pt 13.00\pt -3.58\pt 3.58\pt + "-1l" "\\brevisledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt + "-2" "\\longaball" -0.00\pt 13.00\pt -3.58\pt 3.58\pt + "-2l" "\\longaledger" -3.25\pt 16.25\pt -0.65\pt 0.65\pt + "0" "\\wholeball" -0.00\pt 12.87\pt -3.58\pt 3.58\pt + "0l" "\\wholeledger" -3.22\pt 16.09\pt -0.65\pt 0.65\pt + "1" "\\halfball" -0.00\pt 8.95\pt -3.58\pt 3.58\pt + "1l" "\\halfledger" -2.24\pt 11.19\pt -0.65\pt 0.65\pt + "2" "\\quartball" -0.00\pt 8.59\pt -3.58\pt 3.58\pt + "2l" "\\quartledger" -2.15\pt 10.73\pt -0.65\pt 0.65\pt + } + "scripts" = \table { + "ufermata" "\\ufermata" -8.61\pt 8.61\pt -0.49\pt 9.43\pt + "dfermata" "\\dfermata" -8.61\pt 8.61\pt -9.43\pt 0.49\pt + "sforzato" "\\sforzatoaccent" -5.85\pt 5.85\pt -3.25\pt 3.25\pt + "staccato" "\\staccato" -0.98\pt 0.98\pt -0.98\pt 0.98\pt + "ustaccatissimo" "\\ustaccatissimo" -1.30\pt 1.30\pt -0.20\pt 6.50\pt + "dstaccatissimo" "\\dstaccatissimo" -1.30\pt 1.30\pt -6.50\pt 0.20\pt + "tenuto" "\\tenuto" -5.85\pt 5.85\pt -0.39\pt 0.39\pt + "umarcato" "\\umarcato" -3.25\pt 3.25\pt -0.00\pt 7.15\pt + "dmarcato" "\\dmarcato" -3.25\pt 3.25\pt -7.15\pt 0.00\pt + "open" "\\ouvert" -2.60\pt 2.60\pt -3.25\pt 3.25\pt + "stopped" "\\plusstop" -3.58\pt 3.58\pt -3.58\pt 3.58\pt + "upbow" "\\upbow" -4.23\pt 4.23\pt -0.00\pt 13.52\pt + "downbow" "\\downbow" -4.88\pt 4.88\pt -0.00\pt 8.67\pt + "turn" "\\turn" -7.11\pt 7.11\pt -3.44\pt 3.44\pt + "trill" "\\trill" -6.50\pt 6.50\pt -0.00\pt 14.62\pt + "pedalheel" "\\pedalheel" -3.25\pt 3.25\pt -3.25\pt 4.33\pt + "pedaltoe" "\\pedaltoe" -3.25\pt 3.25\pt -0.00\pt 9.75\pt + "flageolet" "\\flageolet" -3.47\pt 3.47\pt -3.47\pt 3.47\pt + } + "flags" = \table { + "u3" "\\eighthflag" -0.33\pt 8.02\pt -19.92\pt 0.33\pt + "u4" "\\sixteenthflag" -0.33\pt 8.02\pt -23.17\pt 0.33\pt + "u5" "\\thirtysecondflag" -0.33\pt 8.02\pt -28.05\pt 0.33\pt + "u6" "\\sixtyfourthflag" -0.33\pt 8.02\pt -34.55\pt 0.33\pt + "d3" "\\deighthflag" -0.33\pt 8.88\pt -0.33\pt 18.95\pt + "d4" "\\dsixteenthflag" -0.33\pt 8.88\pt -0.33\pt 19.92\pt + "d5" "\\dthirtysecondflag" -0.33\pt 8.88\pt -0.33\pt 25.45\pt + "d6" "\\dsixtyfourthflag" -0.33\pt 8.88\pt -0.33\pt 28.70\pt + } + "clefs" = \table { + "alto" "\\altoclef" -6.50\pt 24.19\pt -13.00\pt 13.00\pt + "alto_change" "\\caltoclef" -5.20\pt 19.36\pt -10.40\pt 10.40\pt + "bass" "\\bassclef" -3.25\pt 23.40\pt -16.25\pt 6.50\pt + "bass_change" "\\cbassclef" -2.60\pt 18.72\pt -13.00\pt 5.20\pt + "violin" "\\violinclef" -5.66\pt 24.29\pt -19.50\pt 32.50\pt + "violin_change" "\\cviolinclef" -4.92\pt 19.04\pt -15.60\pt 26.00\pt + } + % } % $name diff --git a/mf/README b/mf/README index 9724af42b2..bbbfa3a021 100644 --- a/mf/README +++ b/mf/README @@ -34,7 +34,8 @@ Staffsize Numbers Name This table is partially taken from [Ross]. Most music is set in No.3, but the papersizes usually are bigger than standard printer paper -(such as A4). +(such as A4). If you plot these, you'll notice that the sizes (With +exception of 26) almost (but not quite) form a arithmetic progression. [Ross] states that the dies (the stamps to make the symbols) come in 12 different sizes. diff --git a/mf/TODO b/mf/TODO index b1e9c59a82..4607752e69 100644 --- a/mf/TODO +++ b/mf/TODO @@ -13,3 +13,4 @@ - 128th flags - include important spacing dims in fetalog + - more sizes, see readme diff --git a/mf/dimen.tex b/mf/dimen.tex index b900b40e55..8ab57c66f6 100644 --- a/mf/dimen.tex +++ b/mf/dimen.tex @@ -4,7 +4,7 @@ \font\black=black %\font\taupin=musix16 -%\font\fet=font-en-tja16 + %\font\vet=vette-beams16 %\font\slurs=xslhd16 %\font\specfont=musixspx diff --git a/mf/feta-beams16.mf b/mf/feta-beams16.mf index 62eff27315..27968efe98 100644 --- a/mf/feta-beams16.mf +++ b/mf/feta-beams16.mf @@ -1,8 +1,6 @@ % vette-beams16.mf % part of LilyPond's pretty-but-neat music font -% font_identifier:="font-en-tja16"; -% font_size 16pt#; font_identifier:="vette-beams16"; font_size 16; mode_setup; diff --git a/mf/feta-black16.mf b/mf/feta-black16.mf new file mode 100644 index 0000000000..beb6b070d4 --- /dev/null +++ b/mf/feta-black16.mf @@ -0,0 +1,22 @@ +% feta-test16 +% part of LilyPond's pretty-but-neat music font + + +input feta-autometric; +fet_beginfont("feta-test", 16); +staffsize#:=16pt#; +test:=1; + +% smoked cheese +test := -1; + + +% dem piksels. +%test := 1; + +input feta-generic; + +fet_endfont("feta"); + +end. + diff --git a/mf/feta-test16.mf b/mf/feta-test16.mf index c7c8db872b..3d2ed3cea2 100644 --- a/mf/feta-test16.mf +++ b/mf/feta-test16.mf @@ -1,9 +1,6 @@ % feta-test16 % part of LilyPond's pretty-but-neat music font -% font_identifier:="font-en-tja16"; -% font_size 16pt#; - input feta-autometric; fet_beginfont("feta-test", 16); staffsize#:=16pt#; @@ -18,7 +15,7 @@ test:=1; input feta-generic; -fet_endfont("font-en-tja"); +fet_endfont("feta"); end. diff --git a/mf/feta-test20.mf b/mf/feta-test20.mf index b70e54a4f6..72f9a87758 100644 --- a/mf/feta-test20.mf +++ b/mf/feta-test20.mf @@ -1,8 +1,6 @@ % feta-test20 % part of LilyPond's pretty-but-neat music font -% font_identifier:="font-en-tja20"; -% font_size 20pt#; input feta-autometric; fet_beginfont("feta-test", 20); @@ -18,7 +16,7 @@ test:=1; input feta-generic; -fet_endfont("font-en-tja"); +fet_endfont("feta"); end. diff --git a/mf/feta11.mf b/mf/feta11.mf new file mode 100644 index 0000000000..95785f3595 --- /dev/null +++ b/mf/feta11.mf @@ -0,0 +1,16 @@ +% feta16.mf +% part of LilyPond's pretty-but-neat music font + + +input feta-autometric; +fet_beginfont("feta", 11); +staffsize#:=11pt#; +test:=0; + + +input feta-generic; + +fet_endfont("feta"); + +end. + diff --git a/mf/feta16.mf b/mf/feta16.mf index bcc8c41c7f..8d7d9538ab 100644 --- a/mf/feta16.mf +++ b/mf/feta16.mf @@ -1,9 +1,6 @@ -% font-en-tja16.mf +% feta16.mf % part of LilyPond's pretty-but-neat music font -% font_identifier:="font-en-tja16"; -% font_size 16pt#; - input feta-autometric; fet_beginfont("feta", 16); staffsize#:=16pt#; diff --git a/mf/feta19.mf b/mf/feta19.mf new file mode 100644 index 0000000000..ef9a48cfd2 --- /dev/null +++ b/mf/feta19.mf @@ -0,0 +1,18 @@ +% feta16.mf +% part of LilyPond's pretty-but-neat music font + +% font_identifier:="feta16"; +% font_size 16pt#; + +input feta-autometric; +fet_beginfont("feta", 19); +staffsize#:=19pt#; +test:=0; + + +input feta-generic; + +fet_endfont("feta"); + +end. + diff --git a/mf/feta20.mf b/mf/feta20.mf index f4cbfaa95f..e2dfa7dd06 100644 --- a/mf/feta20.mf +++ b/mf/feta20.mf @@ -1,4 +1,4 @@ -% font-en-tja20.mf +% feta20.mf % part of LilyPond's pretty-but-neat music font staffsize#:=20pt#; diff --git a/mf/feta23.mf b/mf/feta23.mf new file mode 100644 index 0000000000..b4dcaea7ad --- /dev/null +++ b/mf/feta23.mf @@ -0,0 +1,18 @@ +% feta16.mf +% part of LilyPond's pretty-but-neat music font + +% font_identifier:="feta16"; +% font_size 16pt#; + +input feta-autometric; +fet_beginfont("feta", 22.5); +staffsize#:=22.5pt#; +test:=0; + + +input feta-generic; + +fet_endfont("feta"); + +end. + diff --git a/mf/feta26.mf b/mf/feta26.mf new file mode 100644 index 0000000000..add32d85f9 --- /dev/null +++ b/mf/feta26.mf @@ -0,0 +1,16 @@ +% feta16.mf +% part of LilyPond's pretty-but-neat music font + +input feta-autometric; +fet_beginfont("feta", 26); +staffsize#:=26pt#; +test:=0; + + +input feta-generic; + +fet_endfont("feta"); + +end. + + diff --git a/tex/feta11.tex b/tex/feta11.tex new file mode 100644 index 0000000000..cc41d5b43d --- /dev/null +++ b/tex/feta11.tex @@ -0,0 +1,78 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from out/feta11.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\pedalheel{42} +\fetdef\pedaltoe{43} +\fetdef\flageolet{44} + +% flags +\fetdef\eighthflag{45} +\fetdef\sixteenthflag{46} +\fetdef\thirtysecondflag{47} +\fetdef\sixtyfourthflag{48} +\fetdef\deighthflag{49} +\fetdef\dsixteenthflag{50} +\fetdef\dthirtysecondflag{51} +\fetdef\dsixtyfourthflag{52} + +% clefs +\fetdef\altoclef{53} +\fetdef\caltoclef{54} +\fetdef\bassclef{55} +\fetdef\cbassclef{56} +\fetdef\violinclef{57} +\fetdef\cviolinclef{58} + diff --git a/tex/feta16.tex b/tex/feta16.tex index c7d3d10960..db0adac5e9 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -1,5 +1,5 @@ -% Creator: mf-to-table.py version 0.4 -% Automatically generated on Mon Jan 5 15:23:51 1998 +% Creator: mf-to-table.py version 0.5 +% Automatically generated on % Do not edit % input from out/feta16.log % name diff --git a/tex/feta19.tex b/tex/feta19.tex new file mode 100644 index 0000000000..992b3bfc10 --- /dev/null +++ b/tex/feta19.tex @@ -0,0 +1,78 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from out/feta19.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\pedalheel{42} +\fetdef\pedaltoe{43} +\fetdef\flageolet{44} + +% flags +\fetdef\eighthflag{45} +\fetdef\sixteenthflag{46} +\fetdef\thirtysecondflag{47} +\fetdef\sixtyfourthflag{48} +\fetdef\deighthflag{49} +\fetdef\dsixteenthflag{50} +\fetdef\dthirtysecondflag{51} +\fetdef\dsixtyfourthflag{52} + +% clefs +\fetdef\altoclef{53} +\fetdef\caltoclef{54} +\fetdef\bassclef{55} +\fetdef\cbassclef{56} +\fetdef\violinclef{57} +\fetdef\cviolinclef{58} + diff --git a/tex/feta20.tex b/tex/feta20.tex index f45420f5c0..7b3b459a2a 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -1,5 +1,5 @@ -% Creator: mf-to-table.py version 0.4 -% Automatically generated on Mon Jan 5 15:23:56 1998 +% Creator: mf-to-table.py version 0.5 +% Automatically generated on % Do not edit % input from out/feta20.log % name diff --git a/tex/feta23.tex b/tex/feta23.tex new file mode 100644 index 0000000000..031ebf9b61 --- /dev/null +++ b/tex/feta23.tex @@ -0,0 +1,78 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from out/feta23.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\pedalheel{42} +\fetdef\pedaltoe{43} +\fetdef\flageolet{44} + +% flags +\fetdef\eighthflag{45} +\fetdef\sixteenthflag{46} +\fetdef\thirtysecondflag{47} +\fetdef\sixtyfourthflag{48} +\fetdef\deighthflag{49} +\fetdef\dsixteenthflag{50} +\fetdef\dthirtysecondflag{51} +\fetdef\dsixtyfourthflag{52} + +% clefs +\fetdef\altoclef{53} +\fetdef\caltoclef{54} +\fetdef\bassclef{55} +\fetdef\cbassclef{56} +\fetdef\violinclef{57} +\fetdef\cviolinclef{58} + diff --git a/tex/feta26.tex b/tex/feta26.tex new file mode 100644 index 0000000000..a8d47ee860 --- /dev/null +++ b/tex/feta26.tex @@ -0,0 +1,78 @@ +% Creator: mf-to-table.py version 0.5 +% Automatically generated on +% Do not edit +% input from out/feta26.log +% name +% rests +\fetdef\wholerest{0} +\fetdef\halfrest{1} +\fetdef\outsidewholerest{2} +\fetdef\outsidehalfrest{3} +\fetdef\quartrest{4} +\fetdef\eighthrest{5} +\fetdef\sixteenthrest{6} +\fetdef\thirtysecondrest{7} +\fetdef\sixtyfourthrest{8} +\fetdef\hundredtwentyeighthrest{9} + +% accidentals +\fetdef\sharp{10} +\fetdef\natural{11} +\fetdef\flat{12} +\fetdef\flatflat{13} +\fetdef\sharpsharp{14} + +% dots +\fetdef\dot{15} +\fetdef\repeatcolon{16} + +% balls +\fetdef\brevisball{17} +\fetdef\brevisledger{18} +\fetdef\longaball{19} +\fetdef\longaledger{20} +\fetdef\wholeball{21} +\fetdef\wholeledger{22} +\fetdef\halfball{23} +\fetdef\halfledger{24} +\fetdef\quartball{25} +\fetdef\quartledger{26} + +% scripts +\fetdef\ufermata{27} +\fetdef\dfermata{28} +\fetdef\sforzatoaccent{29} +\fetdef\staccato{30} +\fetdef\ustaccatissimo{31} +\fetdef\dstaccatissimo{32} +\fetdef\tenuto{33} +\fetdef\umarcato{34} +\fetdef\dmarcato{35} +\fetdef\ouvert{36} +\fetdef\plusstop{37} +\fetdef\upbow{38} +\fetdef\downbow{39} +\fetdef\turn{40} +\fetdef\trill{41} +\fetdef\pedalheel{42} +\fetdef\pedaltoe{43} +\fetdef\flageolet{44} + +% flags +\fetdef\eighthflag{45} +\fetdef\sixteenthflag{46} +\fetdef\thirtysecondflag{47} +\fetdef\sixtyfourthflag{48} +\fetdef\deighthflag{49} +\fetdef\dsixteenthflag{50} +\fetdef\dthirtysecondflag{51} +\fetdef\dsixtyfourthflag{52} + +% clefs +\fetdef\altoclef{53} +\fetdef\caltoclef{54} +\fetdef\bassclef{55} +\fetdef\cbassclef{56} +\fetdef\violinclef{57} +\fetdef\cviolinclef{58} +