release: 1.0.19.uu1

diff --git a/NEWS b/NEWS
index aadb5066fd0b75f8d4111ae47989100736829b84..63288f943f08e086602852cb4db31f30a48de1b0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+pl 19.uu1
+       - MF fixes.
+       
 pl 18.uu1
        - gcc 2.7 fixes
 

diff --git a/VERSION b/VERSION
index 3744a3b3127cd6e3f4d914047d5c6711b987fe3f..ab1e7c06196567f94c27397c279545804d9ccd2d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=19
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=uu1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh
index d4a482ebe6b3bdd7ef90acd838e1f85e8af9d6fe..23ba2f9a9f6946bc1e0e9b7cae3c1718edc0743f 100644 (file)
--- a/buildscripts/lilypond-login.sh
+++ b/buildscripts/lilypond-login.sh
@@ -8,6 +8,6 @@ setenv GS_FONTPATH "@datadir@/ps"
 setenv LILYINCLUDE "@datadir@/ly:@datadir@/afm"
 
 # include an empty path component for the system wide includes.
-setenv MFINPUTS "@datadir@/mf:"${MFINPUTS:=":"}
-setenv TEXINPUTS "@datadir@/tex:"${TEXINPUTS:=":"}
+setenv MFINPUTS "@datadir@/mf:$MFINPUTS::"    # urg.
+setenv TEXINPUTS "@datadir@/tex:$TEXINPUTS::"
 

diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm
index a8364ec135c9936531a524ce655cd84dc1d12c74..6f49b18b364092f821c7a1828db99c7c1b0f3be4 100644 (file)
--- a/make/out/lelievijver.lsm
+++ b/make/out/lelievijver.lsm
@@ -1,15 +1,15 @@
 Begin3
 Titel: LilyPond
-Versie: 1.0.19
-Inschrijf datum: 26NOV98
+Versie: 1.0.19.uu1
+Inschrijf datum: 07DEC98
 Beschrijving: @FLAPTEKST@
 Trefwoorden: muziek typezetten midi notatie
 Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
-       770k lilypond-1.0.19.tar.gz 
+       770k lilypond-1.0.19.uu1.tar.gz 
 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-       770k lilypond-1.0.19.tar.gz 
+       770k lilypond-1.0.19.uu1.tar.gz 
 Copi-eer voorwaarden: GPL
 End

diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm
index 59b457ac61c092c403d3d715d14d24181c208866..c801d5ccff3b841a0132205ca14f244aa1db54b7 100644 (file)
--- a/make/out/lilypond.lsm
+++ b/make/out/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
-Version: 1.0.19
-Entered-date: 26NOV98
+Version: 1.0.19.uu1
+Entered-date: 07DEC98
 Description: 
 LilyPond is the GNU Project music typesetter.  This program can print
 beautiful sheet music from a music definition file.  It can also play
@@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-       770k lilypond-1.0.19.tar.gz 
+       770k lilypond-1.0.19.uu1.tar.gz 
 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-       770k lilypond-1.0.19.tar.gz 
+       770k lilypond-1.0.19.uu1.tar.gz 
 Copying-policy: GPL
 End

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index 9e947861d07a8fe656ffbbe649e3b4b589791c25..08b33d7219cc6c95f0d4b41b779ff017376428c4 100644 (file)
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 1.0.19
+Version: 1.0.19.uu1
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.19.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.19.uu1.tar.gz
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index dfc37de8c9a28afbd88fa8395c2e3fdae78a066b..25f478d4bd6251b0631e65a9a46e3d8c15fc4f94 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -18,6 +18,7 @@ XPM_FONTS = feta20
 ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES)
 
 OUT_DIST_FILES += $(AFM_FILES)
+export MFINPUTS:=.:$(MFINPUTS)
 
 include $(depth)/make/stepmake.make 
 

diff --git a/mf/out/feta11.afm b/mf/out/feta11.afm
index 80e4e0d8c2aec653758feb2333e9017a51719175..7e8f6f28d67d42c178a2ab3a4261636f6353e365 100644 (file)
--- a/mf/out/feta11.afm
+++ b/mf/out/feta11.afm
@@ -18,69 +18,66 @@ C 13; N accidentals-0; B 0.00 -4125.00 1833.33 4125.00 ;
 C 14; N accidentals--1; B -330.03 -1375.00 2200.01 5500.00 ;
 C 15; N accidentals--2; B -330.03 -1375.00 3987.49 5500.00 ;
 C 16; N accidentals-2; B 0.00 -1375.00 2750.00 1375.00 ;
-C 17; N accidentals-); B 0.00 -2750.00 1650.02 2750.00 ;
-C 18; N accidentals-(; B -1650.02 -2750.00 0.00 2750.00 ;
-C 19; N dots-dot; B 0.00 -618.74 1237.49 618.74 ;
-C 20; N dots-repeatcolon; B 0.00 -1375.00 1237.49 1375.00 ;
-C 21; N balls--1; B 0.00 -1512.51 5500.00 1512.51 ;
-C 22; N balls--1l; B -1375.00 -275.02 6875.00 275.02 ;
-C 23; N balls--2; B 0.00 -1512.51 5500.00 1512.51 ;
-C 24; N balls--2l; B -1375.00 -275.02 6875.00 275.02 ;
-C 25; N balls-0; B 0.00 -1512.51 5445.07 1512.51 ;
-C 26; N balls-0l; B -1361.27 -275.02 6806.34 275.02 ;
-C 27; N balls-1; B 0.00 -1512.51 3788.07 1512.51 ;
-C 28; N balls-1l; B -947.02 -275.02 4735.09 275.02 ;
-C 29; N balls-2; B 0.00 -1512.51 3632.84 1512.51 ;
-C 30; N balls-2l; B -908.22 -275.02 4541.06 275.02 ;
-C 31; N scripts-ufermata; B -3643.77 -206.27 3643.77 3987.55 ;
-C 32; N scripts-dfermata; B -3643.77 -3987.55 3643.77 206.27 ;
-C 33; N scripts-thumb; B -1100.00 -1375.00 1100.00 1375.00 ;
-C 34; N scripts-sforzato; B -2474.99 -1375.00 2474.99 1375.00 ;
-C 35; N scripts-staccato; B -412.54 -412.54 412.54 412.54 ;
-C 36; N scripts-ustaccatissimo; B -550.05 -200.00 550.05 2750.06 ;
-C 37; N scripts-dstaccatissimo; B -550.05 -2750.06 550.05 200.00 ;
-C 38; N scripts-tenuto; B -1650.02 -192.52 1650.02 192.52 ;
-C 39; N scripts-umarcato; B -1375.00 0.00 1375.00 3025.02 ;
-C 40; N scripts-dmarcato; B -1375.00 -3025.02 1375.00 0.00 ;
-C 41; N scripts-open; B -1100.00 -1375.00 1100.00 1375.00 ;
-C 42; N scripts-stopped; B -1512.51 -1512.51 1512.51 1512.51 ;
-C 43; N scripts-upbow; B -1787.50 0.00 1787.50 5720.05 ;
-C 44; N scripts-downbow; B -2062.50 0.00 2062.50 3666.66 ;
-C 45; N scripts-reverseturn; B -3007.81 -1455.89 3007.81 1455.89 ;
-C 46; N scripts-turn; B -3007.81 -1455.89 3007.81 1455.89 ;
-C 47; N scripts-trill; B -2750.00 0.00 2750.00 6187.50 ;
-C 48; N scripts-upedalheel; B -1375.00 -1375.00 1375.00 1833.33 ;
-C 49; N scripts-dpedalheel; B -1375.00 -1833.33 1375.00 1375.00 ;
-C 50; N scripts-upedaltoe; B -1375.00 0.00 1375.00 4125.00 ;
-C 51; N scripts-dpedaltoe; B -1375.00 -4125.00 1375.00 0.00 ;
-C 52; N scripts-flageolet; B -1466.67 -1466.67 1466.67 1466.67 ;
-C 53; N scripts-trilelement; B -1833.33 -1375.00 718.64 1375.00 ;
-C 54; N scripts-prall; B -3109.31 -1375.00 3109.31 1375.00 ;
-C 55; N scripts-mordent; B -3109.31 -1375.00 3109.31 1375.00 ;
-C 56; N scripts-prallprall; B -4385.30 -1375.00 4385.30 1375.00 ;
-C 57; N scripts-prallmordent; B -4385.30 -1375.00 4385.30 1375.00 ;
-C 58; N scripts-upprall; B -4385.30 -1375.00 4385.30 1375.00 ;
-C 59; N scripts-downprall; B -4385.30 -1375.00 4385.30 1375.00 ;
-C 60; N flags-u3; B -137.51 -8428.77 3393.31 137.51 ;
-C 61; N flags-u4; B -137.51 -9803.77 3393.31 137.51 ;
-C 62; N flags-u5; B -137.51 -11866.27 3393.31 137.51 ;
-C 63; N flags-u6; B -137.51 -14616.27 3393.31 137.51 ;
-C 64; N flags-d3; B -137.51 -137.51 3755.11 8016.30 ;
-C 65; N flags-d4; B -137.51 -137.51 3755.11 8428.77 ;
-C 66; N flags-d5; B -137.51 -137.51 3755.11 10766.30 ;
-C 67; N flags-d6; B -137.51 -137.51 3755.11 12141.30 ;
-C 68; N clefs-alto; B -2750.00 -5500.00 10236.10 5500.00 ;
-C 69; N clefs-alto_change; B -2200.01 -4400.02 8188.93 4400.02 ;
-C 70; N clefs-bass; B -1375.00 -6875.00 9900.02 2750.00 ;
-C 71; N clefs-bass_change; B -1100.02 -5500.03 7920.04 2200.01 ;
-C 72; N clefs-violin; B -2396.44 -8250.00 10277.13 13750.00 ;
-C 73; N clefs-violin_change; B -2082.15 -6600.04 8056.75 11000.06 ;
-C 74; N timesig-C4/4; B -4950.01 -2750.00 4674.99 2750.00 ;
-C 75; N timesig-C2/2; B -4950.01 -3849.99 4674.99 3849.99 ;
-C 76; N timesig-old4/4; B -4812.50 -2062.50 4812.50 2062.50 ;
-C 77; N timesig-old2/2; B -4812.50 -2750.00 4812.50 2750.00 ;
-C 78; N timesig-old3/2; B -4812.50 -2062.50 4812.50 2062.50 ;
-C 79; N timesig-old6/4; B -4812.50 -3437.50 4812.50 3437.50 ;
-C 80; N timesig-old9/4; B -4812.50 -3437.50 4812.50 3437.50 ;
+C 17; N dots-dot; B 0.00 -618.74 1237.49 618.74 ;
+C 18; N dots-repeatcolon; B 0.00 -1375.00 1237.49 1375.00 ;
+C 19; N balls--1; B 0.00 -1512.51 5500.00 1512.51 ;
+C 20; N balls--1l; B -1375.00 -275.02 6875.00 275.02 ;
+C 21; N balls--2; B 0.00 -1512.51 5500.00 1512.51 ;
+C 22; N balls--2l; B -1375.00 -275.02 6875.00 275.02 ;
+C 23; N balls-0; B 0.00 -1512.51 5445.07 1512.51 ;
+C 24; N balls-0l; B -1361.27 -275.02 6806.34 275.02 ;
+C 25; N balls-1; B 0.00 -1512.51 3788.07 1512.51 ;
+C 26; N balls-1l; B -947.02 -275.02 4735.09 275.02 ;
+C 27; N balls-2; B 0.00 -1512.51 3632.84 1512.51 ;
+C 28; N balls-2l; B -908.22 -275.02 4541.06 275.02 ;
+C 29; N scripts-ufermata; B -3643.77 -206.27 3643.77 3987.55 ;
+C 30; N scripts-dfermata; B -3643.77 -3987.55 3643.77 206.27 ;
+C 31; N scripts-sforzato; B -2474.99 -1375.00 2474.99 1375.00 ;
+C 32; N scripts-staccato; B -412.54 -412.54 412.54 412.54 ;
+C 33; N scripts-ustaccatissimo; B -550.05 -200.00 550.05 2750.06 ;
+C 34; N scripts-dstaccatissimo; B -550.05 -2750.06 550.05 200.00 ;
+C 35; N scripts-tenuto; B -1650.02 -192.52 1650.02 192.52 ;
+C 36; N scripts-umarcato; B -1375.00 0.00 1375.00 3025.02 ;
+C 37; N scripts-dmarcato; B -1375.00 -3025.02 1375.00 0.00 ;
+C 38; N scripts-open; B -1100.00 -1375.00 1100.00 1375.00 ;
+C 39; N scripts-stopped; B -1512.51 -1512.51 1512.51 1512.51 ;
+C 40; N scripts-upbow; B -1787.50 0.00 1787.50 5720.05 ;
+C 41; N scripts-downbow; B -2062.50 0.00 2062.50 3666.66 ;
+C 42; N scripts-reverseturn; B -3007.81 -1455.89 3007.81 1455.89 ;
+C 43; N scripts-turn; B -3007.81 -1455.89 3007.81 1455.89 ;
+C 44; N scripts-trill; B -2750.00 0.00 2750.00 6187.50 ;
+C 45; N scripts-upedalheel; B -1375.00 -1375.00 1375.00 1833.33 ;
+C 46; N scripts-dpedalheel; B -1375.00 -1833.33 1375.00 1375.00 ;
+C 47; N scripts-upedaltoe; B -1375.00 0.00 1375.00 4125.00 ;
+C 48; N scripts-dpedaltoe; B -1375.00 -4125.00 1375.00 0.00 ;
+C 49; N scripts-flageolet; B -1466.67 -1466.67 1466.67 1466.67 ;
+C 50; N scripts-trilelement; B -1833.33 -1375.00 718.64 1375.00 ;
+C 51; N scripts-prall; B -3109.31 -1375.00 3109.31 1375.00 ;
+C 52; N scripts-mordent; B -3109.31 -1375.00 3109.31 1375.00 ;
+C 53; N scripts-prallprall; B -4385.30 -1375.00 4385.30 1375.00 ;
+C 54; N scripts-prallmordent; B -4385.30 -1375.00 4385.30 1375.00 ;
+C 55; N scripts-upprall; B -4385.30 -1375.00 4385.30 1375.00 ;
+C 56; N scripts-downprall; B -4385.30 -1375.00 4385.30 1375.00 ;
+C 57; N flags-u3; B -137.51 -8428.77 3393.31 137.51 ;
+C 58; N flags-u4; B -137.51 -9803.77 3393.31 137.51 ;
+C 59; N flags-u5; B -137.51 -11866.27 3393.31 137.51 ;
+C 60; N flags-u6; B -137.51 -14616.27 3393.31 137.51 ;
+C 61; N flags-d3; B -137.51 -137.51 3755.11 8016.30 ;
+C 62; N flags-d4; B -137.51 -137.51 3755.11 8428.77 ;
+C 63; N flags-d5; B -137.51 -137.51 3755.11 10766.30 ;
+C 64; N flags-d6; B -137.51 -137.51 3755.11 12141.30 ;
+C 65; N clefs-alto; B -2750.00 -5500.00 10236.10 5500.00 ;
+C 66; N clefs-alto_change; B -2200.01 -4400.02 8188.93 4400.02 ;
+C 67; N clefs-bass; B -1375.00 -6875.00 9900.02 2750.00 ;
+C 68; N clefs-bass_change; B -1100.02 -5500.03 7920.04 2200.01 ;
+C 69; N clefs-violin; B -2396.44 -8250.00 10277.13 13750.00 ;
+C 70; N clefs-violin_change; B -2082.15 -6600.04 8056.75 11000.06 ;
+C 71; N timesig-C4/4; B -4950.01 -2750.00 4674.99 2750.00 ;
+C 72; N timesig-C2/2; B -4950.01 -3849.99 4674.99 3849.99 ;
+C 73; N timesig-old4/4; B -4812.50 -2062.50 4812.50 2062.50 ;
+C 74; N timesig-old2/2; B -4812.50 -2750.00 4812.50 2750.00 ;
+C 75; N timesig-old3/2; B -4812.50 -2062.50 4812.50 2062.50 ;
+C 76; N timesig-old6/4; B -4812.50 -3437.50 4812.50 3437.50 ;
+C 77; N timesig-old9/4; B -4812.50 -3437.50 4812.50 3437.50 ;
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta13.afm b/mf/out/feta13.afm
index 28475dec29798d759e8534b5059fc1970cb1f3a3..7679a06b19f91a1882eba3652067d2915ed8b6d7 100644 (file)
--- a/mf/out/feta13.afm
+++ b/mf/out/feta13.afm
@@ -18,69 +18,66 @@ C 13; N accidentals-0; B 0.00 -4875.00 2166.67 4875.00 ;
 C 14; N accidentals--1; B -390.03 -1625.00 2600.00 6500.00 ;
 C 15; N accidentals--2; B -390.03 -1625.00 4712.50 6500.00 ;
 C 16; N accidentals-2; B 0.00 -1625.00 3250.00 1625.00 ;
-C 17; N accidentals-); B 0.00 -3250.00 1950.03 3250.00 ;
-C 18; N accidentals-(; B -1950.03 -3250.00 0.00 3250.00 ;
-C 19; N dots-dot; B 0.00 -731.25 1462.50 731.25 ;
-C 20; N dots-repeatcolon; B 0.00 -1625.00 1462.50 1625.00 ;
-C 21; N balls--1; B 0.00 -1787.52 6500.00 1787.52 ;
-C 22; N balls--1l; B -1625.00 -325.03 8125.00 325.03 ;
-C 23; N balls--2; B 0.00 -1787.52 6500.00 1787.52 ;
-C 24; N balls--2l; B -1625.00 -325.03 8125.00 325.03 ;
-C 25; N balls-0; B 0.00 -1787.52 6435.09 1787.52 ;
-C 26; N balls-0l; B -1608.78 -325.03 8043.87 325.03 ;
-C 27; N balls-1; B 0.00 -1787.52 4476.79 1787.52 ;
-C 28; N balls-1l; B -1119.20 -325.03 5596.00 325.03 ;
-C 29; N balls-2; B 0.00 -1787.52 4293.33 1787.52 ;
-C 30; N balls-2l; B -1073.33 -325.03 5366.67 325.03 ;
-C 31; N scripts-ufermata; B -4306.27 -243.77 4306.27 4712.55 ;
-C 32; N scripts-dfermata; B -4306.27 -4712.55 4306.27 243.77 ;
-C 33; N scripts-thumb; B -1300.00 -1625.00 1300.00 1625.00 ;
-C 34; N scripts-sforzato; B -2924.99 -1625.00 2924.99 1625.00 ;
-C 35; N scripts-staccato; B -487.55 -487.55 487.55 487.55 ;
-C 36; N scripts-ustaccatissimo; B -650.05 -200.00 650.05 3250.06 ;
-C 37; N scripts-dstaccatissimo; B -650.05 -3250.06 650.05 200.00 ;
-C 38; N scripts-tenuto; B -1950.03 -227.52 1950.03 227.52 ;
-C 39; N scripts-umarcato; B -1625.00 0.00 1625.00 3575.03 ;
-C 40; N scripts-dmarcato; B -1625.00 -3575.03 1625.00 0.00 ;
-C 41; N scripts-open; B -1300.00 -1625.00 1300.00 1625.00 ;
-C 42; N scripts-stopped; B -1787.52 -1787.52 1787.52 1787.52 ;
-C 43; N scripts-upbow; B -2112.50 0.00 2112.50 6760.04 ;
-C 44; N scripts-downbow; B -2437.50 0.00 2437.50 4333.31 ;
-C 45; N scripts-reverseturn; B -3554.69 -1720.60 3554.69 1720.60 ;
-C 46; N scripts-turn; B -3554.69 -1720.60 3554.69 1720.60 ;
-C 47; N scripts-trill; B -3250.00 0.00 3250.00 7312.50 ;
-C 48; N scripts-upedalheel; B -1625.00 -1625.00 1625.00 2166.67 ;
-C 49; N scripts-dpedalheel; B -1625.00 -2166.67 1625.00 1625.00 ;
-C 50; N scripts-upedaltoe; B -1625.00 0.00 1625.00 4875.00 ;
-C 51; N scripts-dpedaltoe; B -1625.00 -4875.00 1625.00 0.00 ;
-C 52; N scripts-flageolet; B -1733.34 -1733.34 1733.34 1733.34 ;
-C 53; N scripts-trilelement; B -2166.67 -1625.00 849.30 1625.00 ;
-C 54; N scripts-prall; B -3674.65 -1625.00 3674.65 1625.00 ;
-C 55; N scripts-mordent; B -3674.65 -1625.00 3674.65 1625.00 ;
-C 56; N scripts-prallprall; B -5182.63 -1625.00 5182.63 1625.00 ;
-C 57; N scripts-prallmordent; B -5182.63 -1625.00 5182.63 1625.00 ;
-C 58; N scripts-upprall; B -5182.63 -1625.00 5182.63 1625.00 ;
-C 59; N scripts-downprall; B -5182.63 -1625.00 5182.63 1625.00 ;
-C 60; N flags-u3; B -162.52 -9961.27 4010.27 162.52 ;
-C 61; N flags-u4; B -162.52 -11586.27 4010.27 162.52 ;
-C 62; N flags-u5; B -162.52 -14023.77 4010.27 162.52 ;
-C 63; N flags-u6; B -162.52 -17273.77 4010.27 162.52 ;
-C 64; N flags-d3; B -162.52 -162.52 4437.84 9473.80 ;
-C 65; N flags-d4; B -162.52 -162.52 4437.84 9961.27 ;
-C 66; N flags-d5; B -162.52 -162.52 4437.84 12723.80 ;
-C 67; N flags-d6; B -162.52 -162.52 4437.84 14348.80 ;
-C 68; N clefs-alto; B -3250.00 -6500.00 12097.24 6500.00 ;
-C 69; N clefs-alto_change; B -2600.00 -5200.01 9677.81 5200.01 ;
-C 70; N clefs-bass; B -1625.00 -8125.00 11700.03 3250.00 ;
-C 71; N clefs-bass_change; B -1300.02 -6500.02 9360.02 2600.00 ;
-C 72; N clefs-violin; B -2832.14 -9750.00 12145.70 16250.00 ;
-C 73; N clefs-violin_change; B -2460.72 -7800.02 9521.58 13000.03 ;
-C 74; N timesig-C4/4; B -5850.00 -3250.00 5525.00 3250.00 ;
-C 75; N timesig-C2/2; B -5850.00 -4549.99 5525.00 4549.99 ;
-C 76; N timesig-old4/4; B -5687.50 -2437.50 5687.50 2437.50 ;
-C 77; N timesig-old2/2; B -5687.50 -3250.00 5687.50 3250.00 ;
-C 78; N timesig-old3/2; B -5687.50 -2437.50 5687.50 2437.50 ;
-C 79; N timesig-old6/4; B -5687.50 -4062.50 5687.50 4062.50 ;
-C 80; N timesig-old9/4; B -5687.50 -4062.50 5687.50 4062.50 ;
+C 17; N dots-dot; B 0.00 -731.25 1462.50 731.25 ;
+C 18; N dots-repeatcolon; B 0.00 -1625.00 1462.50 1625.00 ;
+C 19; N balls--1; B 0.00 -1787.52 6500.00 1787.52 ;
+C 20; N balls--1l; B -1625.00 -325.03 8125.00 325.03 ;
+C 21; N balls--2; B 0.00 -1787.52 6500.00 1787.52 ;
+C 22; N balls--2l; B -1625.00 -325.03 8125.00 325.03 ;
+C 23; N balls-0; B 0.00 -1787.52 6435.09 1787.52 ;
+C 24; N balls-0l; B -1608.78 -325.03 8043.87 325.03 ;
+C 25; N balls-1; B 0.00 -1787.52 4476.79 1787.52 ;
+C 26; N balls-1l; B -1119.20 -325.03 5596.00 325.03 ;
+C 27; N balls-2; B 0.00 -1787.52 4293.33 1787.52 ;
+C 28; N balls-2l; B -1073.33 -325.03 5366.67 325.03 ;
+C 29; N scripts-ufermata; B -4306.27 -243.77 4306.27 4712.55 ;
+C 30; N scripts-dfermata; B -4306.27 -4712.55 4306.27 243.77 ;
+C 31; N scripts-sforzato; B -2924.99 -1625.00 2924.99 1625.00 ;
+C 32; N scripts-staccato; B -487.55 -487.55 487.55 487.55 ;
+C 33; N scripts-ustaccatissimo; B -650.05 -200.00 650.05 3250.06 ;
+C 34; N scripts-dstaccatissimo; B -650.05 -3250.06 650.05 200.00 ;
+C 35; N scripts-tenuto; B -1950.03 -227.52 1950.03 227.52 ;
+C 36; N scripts-umarcato; B -1625.00 0.00 1625.00 3575.03 ;
+C 37; N scripts-dmarcato; B -1625.00 -3575.03 1625.00 0.00 ;
+C 38; N scripts-open; B -1300.00 -1625.00 1300.00 1625.00 ;
+C 39; N scripts-stopped; B -1787.52 -1787.52 1787.52 1787.52 ;
+C 40; N scripts-upbow; B -2112.50 0.00 2112.50 6760.04 ;
+C 41; N scripts-downbow; B -2437.50 0.00 2437.50 4333.31 ;
+C 42; N scripts-reverseturn; B -3554.69 -1720.60 3554.69 1720.60 ;
+C 43; N scripts-turn; B -3554.69 -1720.60 3554.69 1720.60 ;
+C 44; N scripts-trill; B -3250.00 0.00 3250.00 7312.50 ;
+C 45; N scripts-upedalheel; B -1625.00 -1625.00 1625.00 2166.67 ;
+C 46; N scripts-dpedalheel; B -1625.00 -2166.67 1625.00 1625.00 ;
+C 47; N scripts-upedaltoe; B -1625.00 0.00 1625.00 4875.00 ;
+C 48; N scripts-dpedaltoe; B -1625.00 -4875.00 1625.00 0.00 ;
+C 49; N scripts-flageolet; B -1733.34 -1733.34 1733.34 1733.34 ;
+C 50; N scripts-trilelement; B -2166.67 -1625.00 849.30 1625.00 ;
+C 51; N scripts-prall; B -3674.65 -1625.00 3674.65 1625.00 ;
+C 52; N scripts-mordent; B -3674.65 -1625.00 3674.65 1625.00 ;
+C 53; N scripts-prallprall; B -5182.63 -1625.00 5182.63 1625.00 ;
+C 54; N scripts-prallmordent; B -5182.63 -1625.00 5182.63 1625.00 ;
+C 55; N scripts-upprall; B -5182.63 -1625.00 5182.63 1625.00 ;
+C 56; N scripts-downprall; B -5182.63 -1625.00 5182.63 1625.00 ;
+C 57; N flags-u3; B -162.52 -9961.27 4010.27 162.52 ;
+C 58; N flags-u4; B -162.52 -11586.27 4010.27 162.52 ;
+C 59; N flags-u5; B -162.52 -14023.77 4010.27 162.52 ;
+C 60; N flags-u6; B -162.52 -17273.77 4010.27 162.52 ;
+C 61; N flags-d3; B -162.52 -162.52 4437.84 9473.80 ;
+C 62; N flags-d4; B -162.52 -162.52 4437.84 9961.27 ;
+C 63; N flags-d5; B -162.52 -162.52 4437.84 12723.80 ;
+C 64; N flags-d6; B -162.52 -162.52 4437.84 14348.80 ;
+C 65; N clefs-alto; B -3250.00 -6500.00 12097.24 6500.00 ;
+C 66; N clefs-alto_change; B -2600.00 -5200.01 9677.81 5200.01 ;
+C 67; N clefs-bass; B -1625.00 -8125.00 11700.03 3250.00 ;
+C 68; N clefs-bass_change; B -1300.02 -6500.02 9360.02 2600.00 ;
+C 69; N clefs-violin; B -2832.14 -9750.00 12145.70 16250.00 ;
+C 70; N clefs-violin_change; B -2460.72 -7800.02 9521.58 13000.03 ;
+C 71; N timesig-C4/4; B -5850.00 -3250.00 5525.00 3250.00 ;
+C 72; N timesig-C2/2; B -5850.00 -4549.99 5525.00 4549.99 ;
+C 73; N timesig-old4/4; B -5687.50 -2437.50 5687.50 2437.50 ;
+C 74; N timesig-old2/2; B -5687.50 -3250.00 5687.50 3250.00 ;
+C 75; N timesig-old3/2; B -5687.50 -2437.50 5687.50 2437.50 ;
+C 76; N timesig-old6/4; B -5687.50 -4062.50 5687.50 4062.50 ;
+C 77; N timesig-old9/4; B -5687.50 -4062.50 5687.50 4062.50 ;
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta16.afm b/mf/out/feta16.afm
index dc4514f3244b6df64663fb91ff2c5690b60658f0..f1562888fd34784293f30d831739ef068724c064 100644 (file)
--- a/mf/out/feta16.afm
+++ b/mf/out/feta16.afm
@@ -18,69 +18,66 @@ C 13; N accidentals-0; B 0.00 -6000.00 2666.67 6000.00 ;
 C 14; N accidentals--1; B -480.03 -2000.00 3200.01 8000.00 ;
 C 15; N accidentals--2; B -480.03 -2000.00 5799.99 8000.00 ;
 C 16; N accidentals-2; B 0.00 -2000.00 4000.00 2000.00 ;
-C 17; N accidentals-); B 0.00 -4000.00 2400.02 4000.00 ;
-C 18; N accidentals-(; B -2400.02 -4000.00 0.00 4000.00 ;
-C 19; N dots-dot; B 0.00 -900.00 1799.99 900.00 ;
-C 20; N dots-repeatcolon; B 0.00 -2000.00 1799.99 2000.00 ;
-C 21; N balls--1; B 0.00 -2200.01 8000.00 2200.01 ;
-C 22; N balls--1l; B -2000.00 -400.02 10000.00 400.02 ;
-C 23; N balls--2; B 0.00 -2200.01 8000.00 2200.01 ;
-C 24; N balls--2l; B -2000.00 -400.02 10000.00 400.02 ;
-C 25; N balls-0; B 0.00 -2200.01 7920.04 2200.01 ;
-C 26; N balls-0l; B -1980.01 -400.02 9900.05 400.02 ;
-C 27; N balls-1; B 0.00 -2200.01 5509.86 2200.01 ;
-C 28; N balls-1l; B -1377.47 -400.02 6887.33 400.02 ;
-C 29; N balls-2; B 0.00 -2200.01 5284.09 2200.01 ;
-C 30; N balls-2l; B -1321.03 -400.02 6605.12 400.02 ;
-C 31; N scripts-ufermata; B -5300.02 -300.02 5300.02 5800.05 ;
-C 32; N scripts-dfermata; B -5300.02 -5800.05 5300.02 300.02 ;
-C 33; N scripts-thumb; B -1600.00 -2000.00 1600.00 2000.00 ;
-C 34; N scripts-sforzato; B -3599.98 -2000.00 3599.98 2000.00 ;
-C 35; N scripts-staccato; B -600.04 -600.04 600.04 600.04 ;
-C 36; N scripts-ustaccatissimo; B -800.05 -200.00 800.05 4000.06 ;
-C 37; N scripts-dstaccatissimo; B -800.05 -4000.06 800.05 200.00 ;
-C 38; N scripts-tenuto; B -2400.02 -280.01 2400.02 280.01 ;
-C 39; N scripts-umarcato; B -2000.00 0.00 2000.00 4400.02 ;
-C 40; N scripts-dmarcato; B -2000.00 -4400.02 2000.00 0.00 ;
-C 41; N scripts-open; B -1600.00 -2000.00 1600.00 2000.00 ;
-C 42; N scripts-stopped; B -2200.01 -2200.01 2200.01 2200.01 ;
-C 43; N scripts-upbow; B -2600.00 0.00 2600.00 8320.05 ;
-C 44; N scripts-downbow; B -3000.00 0.00 3000.00 5333.31 ;
-C 45; N scripts-reverseturn; B -4375.00 -2117.65 4375.00 2117.65 ;
-C 46; N scripts-turn; B -4375.00 -2117.65 4375.00 2117.65 ;
-C 47; N scripts-trill; B -4000.00 0.00 4000.00 9000.00 ;
-C 48; N scripts-upedalheel; B -2000.00 -2000.00 2000.00 2666.67 ;
-C 49; N scripts-dpedalheel; B -2000.00 -2666.67 2000.00 2000.00 ;
-C 50; N scripts-upedaltoe; B -2000.00 0.00 2000.00 6000.00 ;
-C 51; N scripts-dpedaltoe; B -2000.00 -6000.00 2000.00 0.00 ;
-C 52; N scripts-flageolet; B -2133.33 -2133.33 2133.33 2133.33 ;
-C 53; N scripts-trilelement; B -2666.67 -2000.00 1045.30 2000.00 ;
-C 54; N scripts-prall; B -4522.66 -2000.00 4522.66 2000.00 ;
-C 55; N scripts-mordent; B -4522.66 -2000.00 4522.66 2000.00 ;
-C 56; N scripts-prallprall; B -6378.65 -2000.00 6378.65 2000.00 ;
-C 57; N scripts-prallmordent; B -6378.65 -2000.00 6378.65 2000.00 ;
-C 58; N scripts-upprall; B -6378.65 -2000.00 6378.65 2000.00 ;
-C 59; N scripts-downprall; B -6378.65 -2000.00 6378.65 2000.00 ;
-C 60; N flags-u3; B -200.01 -12260.03 4935.68 200.01 ;
-C 61; N flags-u4; B -200.01 -14260.03 4935.68 200.01 ;
-C 62; N flags-u5; B -200.01 -17260.03 4935.68 200.01 ;
-C 63; N flags-u6; B -200.01 -21260.03 4935.68 200.01 ;
-C 64; N flags-d3; B -200.01 -200.01 5461.91 11660.05 ;
-C 65; N flags-d4; B -200.01 -200.01 5461.91 12260.03 ;
-C 66; N flags-d5; B -200.01 -200.01 5461.91 15660.05 ;
-C 67; N flags-d6; B -200.01 -200.01 5461.91 17660.05 ;
-C 68; N clefs-alto; B -4000.00 -8000.00 14888.90 8000.00 ;
-C 69; N clefs-alto_change; B -3200.01 -6400.02 11911.18 6400.02 ;
-C 70; N clefs-bass; B -2000.00 -10000.00 14400.02 4000.00 ;
-C 71; N clefs-bass_change; B -1600.04 -8000.03 11520.03 3200.01 ;
-C 72; N clefs-violin; B -3485.72 -12000.00 14948.55 20000.00 ;
-C 73; N clefs-violin_change; B -3028.58 -9600.04 11718.89 16000.06 ;
-C 74; N timesig-C4/4; B -7200.01 -4000.00 6799.99 4000.00 ;
-C 75; N timesig-C2/2; B -7200.01 -5599.98 6799.99 5599.98 ;
-C 76; N timesig-old4/4; B -7000.00 -3000.00 7000.00 3000.00 ;
-C 77; N timesig-old2/2; B -7000.00 -4000.00 7000.00 4000.00 ;
-C 78; N timesig-old3/2; B -7000.00 -3000.00 7000.00 3000.00 ;
-C 79; N timesig-old6/4; B -7000.00 -5000.00 7000.00 5000.00 ;
-C 80; N timesig-old9/4; B -7000.00 -5000.00 7000.00 5000.00 ;
+C 17; N dots-dot; B 0.00 -900.00 1799.99 900.00 ;
+C 18; N dots-repeatcolon; B 0.00 -2000.00 1799.99 2000.00 ;
+C 19; N balls--1; B 0.00 -2200.01 8000.00 2200.01 ;
+C 20; N balls--1l; B -2000.00 -400.02 10000.00 400.02 ;
+C 21; N balls--2; B 0.00 -2200.01 8000.00 2200.01 ;
+C 22; N balls--2l; B -2000.00 -400.02 10000.00 400.02 ;
+C 23; N balls-0; B 0.00 -2200.01 7920.04 2200.01 ;
+C 24; N balls-0l; B -1980.01 -400.02 9900.05 400.02 ;
+C 25; N balls-1; B 0.00 -2200.01 5509.86 2200.01 ;
+C 26; N balls-1l; B -1377.47 -400.02 6887.33 400.02 ;
+C 27; N balls-2; B 0.00 -2200.01 5284.09 2200.01 ;
+C 28; N balls-2l; B -1321.03 -400.02 6605.12 400.02 ;
+C 29; N scripts-ufermata; B -5300.02 -300.02 5300.02 5800.05 ;
+C 30; N scripts-dfermata; B -5300.02 -5800.05 5300.02 300.02 ;
+C 31; N scripts-sforzato; B -3599.98 -2000.00 3599.98 2000.00 ;
+C 32; N scripts-staccato; B -600.04 -600.04 600.04 600.04 ;
+C 33; N scripts-ustaccatissimo; B -800.05 -200.00 800.05 4000.06 ;
+C 34; N scripts-dstaccatissimo; B -800.05 -4000.06 800.05 200.00 ;
+C 35; N scripts-tenuto; B -2400.02 -280.01 2400.02 280.01 ;
+C 36; N scripts-umarcato; B -2000.00 0.00 2000.00 4400.02 ;
+C 37; N scripts-dmarcato; B -2000.00 -4400.02 2000.00 0.00 ;
+C 38; N scripts-open; B -1600.00 -2000.00 1600.00 2000.00 ;
+C 39; N scripts-stopped; B -2200.01 -2200.01 2200.01 2200.01 ;
+C 40; N scripts-upbow; B -2600.00 0.00 2600.00 8320.05 ;
+C 41; N scripts-downbow; B -3000.00 0.00 3000.00 5333.31 ;
+C 42; N scripts-reverseturn; B -4375.00 -2117.65 4375.00 2117.65 ;
+C 43; N scripts-turn; B -4375.00 -2117.65 4375.00 2117.65 ;
+C 44; N scripts-trill; B -4000.00 0.00 4000.00 9000.00 ;
+C 45; N scripts-upedalheel; B -2000.00 -2000.00 2000.00 2666.67 ;
+C 46; N scripts-dpedalheel; B -2000.00 -2666.67 2000.00 2000.00 ;
+C 47; N scripts-upedaltoe; B -2000.00 0.00 2000.00 6000.00 ;
+C 48; N scripts-dpedaltoe; B -2000.00 -6000.00 2000.00 0.00 ;
+C 49; N scripts-flageolet; B -2133.33 -2133.33 2133.33 2133.33 ;
+C 50; N scripts-trilelement; B -2666.67 -2000.00 1045.30 2000.00 ;
+C 51; N scripts-prall; B -4522.66 -2000.00 4522.66 2000.00 ;
+C 52; N scripts-mordent; B -4522.66 -2000.00 4522.66 2000.00 ;
+C 53; N scripts-prallprall; B -6378.65 -2000.00 6378.65 2000.00 ;
+C 54; N scripts-prallmordent; B -6378.65 -2000.00 6378.65 2000.00 ;
+C 55; N scripts-upprall; B -6378.65 -2000.00 6378.65 2000.00 ;
+C 56; N scripts-downprall; B -6378.65 -2000.00 6378.65 2000.00 ;
+C 57; N flags-u3; B -200.01 -12260.03 4935.68 200.01 ;
+C 58; N flags-u4; B -200.01 -14260.03 4935.68 200.01 ;
+C 59; N flags-u5; B -200.01 -17260.03 4935.68 200.01 ;
+C 60; N flags-u6; B -200.01 -21260.03 4935.68 200.01 ;
+C 61; N flags-d3; B -200.01 -200.01 5461.91 11660.05 ;
+C 62; N flags-d4; B -200.01 -200.01 5461.91 12260.03 ;
+C 63; N flags-d5; B -200.01 -200.01 5461.91 15660.05 ;
+C 64; N flags-d6; B -200.01 -200.01 5461.91 17660.05 ;
+C 65; N clefs-alto; B -4000.00 -8000.00 14888.90 8000.00 ;
+C 66; N clefs-alto_change; B -3200.01 -6400.02 11911.18 6400.02 ;
+C 67; N clefs-bass; B -2000.00 -10000.00 14400.02 4000.00 ;
+C 68; N clefs-bass_change; B -1600.04 -8000.03 11520.03 3200.01 ;
+C 69; N clefs-violin; B -3485.72 -12000.00 14948.55 20000.00 ;
+C 70; N clefs-violin_change; B -3028.58 -9600.04 11718.89 16000.06 ;
+C 71; N timesig-C4/4; B -7200.01 -4000.00 6799.99 4000.00 ;
+C 72; N timesig-C2/2; B -7200.01 -5599.98 6799.99 5599.98 ;
+C 73; N timesig-old4/4; B -7000.00 -3000.00 7000.00 3000.00 ;
+C 74; N timesig-old2/2; B -7000.00 -4000.00 7000.00 4000.00 ;
+C 75; N timesig-old3/2; B -7000.00 -3000.00 7000.00 3000.00 ;
+C 76; N timesig-old6/4; B -7000.00 -5000.00 7000.00 5000.00 ;
+C 77; N timesig-old9/4; B -7000.00 -5000.00 7000.00 5000.00 ;
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta19.afm b/mf/out/feta19.afm
index a47de18d5289b2b1785b6da3a7447087c0e258f1..e1f742fdbd9877dd7aefaa43acd9c5ff7e119473 100644 (file)
--- a/mf/out/feta19.afm
+++ b/mf/out/feta19.afm
@@ -18,69 +18,66 @@ C 13; N accidentals-0; B 0.00 -7125.00 3166.67 7125.00 ;
 C 14; N accidentals--1; B -570.04 -2375.00 3800.02 9500.00 ;
 C 15; N accidentals--2; B -570.04 -2375.00 6887.48 9500.00 ;
 C 16; N accidentals-2; B 0.00 -2375.00 4750.00 2375.00 ;
-C 17; N accidentals-); B 0.00 -4750.00 2850.04 4750.00 ;
-C 18; N accidentals-(; B -2850.04 -4750.00 0.00 4750.00 ;
-C 19; N dots-dot; B 0.00 -1068.74 2137.48 1068.74 ;
-C 20; N dots-repeatcolon; B 0.00 -2375.00 2137.48 2375.00 ;
-C 21; N balls--1; B 0.00 -2612.52 9500.00 2612.52 ;
-C 22; N balls--1l; B -2375.00 -475.04 11875.00 475.04 ;
-C 23; N balls--2; B 0.00 -2612.52 9500.00 2612.52 ;
-C 24; N balls--2l; B -2375.00 -475.04 11875.00 475.04 ;
-C 25; N balls-0; B 0.00 -2612.52 9405.09 2612.52 ;
-C 26; N balls-0l; B -2351.27 -475.04 11756.36 475.04 ;
-C 27; N balls-1; B 0.00 -2612.52 6543.00 2612.52 ;
-C 28; N balls-1l; B -1635.76 -475.04 8178.76 475.04 ;
-C 29; N balls-2; B 0.00 -2612.52 6274.89 2612.52 ;
-C 30; N balls-2l; B -1568.73 -475.04 7843.61 475.04 ;
-C 31; N scripts-ufermata; B -6293.78 -356.28 6293.78 6887.57 ;
-C 32; N scripts-dfermata; B -6293.78 -6887.57 6293.78 356.28 ;
-C 33; N scripts-thumb; B -1900.01 -2375.00 1900.01 2375.00 ;
-C 34; N scripts-sforzato; B -4274.98 -2375.00 4274.98 2375.00 ;
-C 35; N scripts-staccato; B -712.55 -712.55 712.55 712.55 ;
-C 36; N scripts-ustaccatissimo; B -950.07 -200.00 950.07 4750.09 ;
-C 37; N scripts-dstaccatissimo; B -950.07 -4750.09 950.07 200.00 ;
-C 38; N scripts-tenuto; B -2850.04 -332.53 2850.04 332.53 ;
-C 39; N scripts-umarcato; B -2375.00 0.00 2375.00 5225.04 ;
-C 40; N scripts-dmarcato; B -2375.00 -5225.04 2375.00 0.00 ;
-C 41; N scripts-open; B -1900.01 -2375.00 1900.01 2375.00 ;
-C 42; N scripts-stopped; B -2612.52 -2612.52 2612.52 2612.52 ;
-C 43; N scripts-upbow; B -3087.51 0.00 3087.51 9880.07 ;
-C 44; N scripts-downbow; B -3562.50 0.00 3562.50 6333.31 ;
-C 45; N scripts-reverseturn; B -5195.31 -2514.71 5195.31 2514.71 ;
-C 46; N scripts-turn; B -5195.31 -2514.71 5195.31 2514.71 ;
-C 47; N scripts-trill; B -4750.00 0.00 4750.00 10687.50 ;
-C 48; N scripts-upedalheel; B -2375.00 -2375.00 2375.00 3166.67 ;
-C 49; N scripts-dpedalheel; B -2375.00 -3166.67 2375.00 2375.00 ;
-C 50; N scripts-upedaltoe; B -2375.00 0.00 2375.00 7125.00 ;
-C 51; N scripts-dpedaltoe; B -2375.00 -7125.00 2375.00 0.00 ;
-C 52; N scripts-flageolet; B -2533.34 -2533.34 2533.34 2533.34 ;
-C 53; N scripts-trilelement; B -3166.67 -2375.00 1241.30 2375.00 ;
-C 54; N scripts-prall; B -5370.65 -2375.00 5370.65 2375.00 ;
-C 55; N scripts-mordent; B -5370.65 -2375.00 5370.65 2375.00 ;
-C 56; N scripts-prallprall; B -7574.63 -2375.00 7574.63 2375.00 ;
-C 57; N scripts-prallmordent; B -7574.63 -2375.00 7574.63 2375.00 ;
-C 58; N scripts-upprall; B -7574.63 -2375.00 7574.63 2375.00 ;
-C 59; N scripts-downprall; B -7574.63 -2375.00 7574.63 2375.00 ;
-C 60; N flags-u3; B -237.52 -14558.78 5861.15 237.52 ;
-C 61; N flags-u4; B -237.52 -16933.78 5861.15 237.52 ;
-C 62; N flags-u5; B -237.52 -20496.28 5861.15 237.52 ;
-C 63; N flags-u6; B -237.52 -25246.28 5861.15 237.52 ;
-C 64; N flags-d3; B -237.52 -237.52 6486.07 13846.31 ;
-C 65; N flags-d4; B -237.52 -237.52 6486.07 14558.78 ;
-C 66; N flags-d5; B -237.52 -237.52 6486.07 18596.31 ;
-C 67; N flags-d6; B -237.52 -237.52 6486.07 20971.31 ;
-C 68; N clefs-alto; B -4750.00 -9500.00 17680.59 9500.00 ;
-C 69; N clefs-alto_change; B -3800.02 -7600.04 14144.50 7600.04 ;
-C 70; N clefs-bass; B -2375.00 -11875.00 17100.04 4750.00 ;
-C 71; N clefs-bass_change; B -1900.04 -9500.05 13680.05 3800.02 ;
-C 72; N clefs-violin; B -4139.30 -14250.00 17751.40 23750.00 ;
-C 73; N clefs-violin_change; B -3596.45 -11400.05 13916.18 19000.09 ;
-C 74; N timesig-C4/4; B -8550.02 -4750.00 8074.98 4750.00 ;
-C 75; N timesig-C2/2; B -8550.02 -6649.98 8074.98 6649.98 ;
-C 76; N timesig-old4/4; B -8312.50 -3562.50 8312.50 3562.50 ;
-C 77; N timesig-old2/2; B -8312.50 -4750.00 8312.50 4750.00 ;
-C 78; N timesig-old3/2; B -8312.50 -3562.50 8312.50 3562.50 ;
-C 79; N timesig-old6/4; B -8312.50 -5937.50 8312.50 5937.50 ;
-C 80; N timesig-old9/4; B -8312.50 -5937.50 8312.50 5937.50 ;
+C 17; N dots-dot; B 0.00 -1068.74 2137.48 1068.74 ;
+C 18; N dots-repeatcolon; B 0.00 -2375.00 2137.48 2375.00 ;
+C 19; N balls--1; B 0.00 -2612.52 9500.00 2612.52 ;
+C 20; N balls--1l; B -2375.00 -475.04 11875.00 475.04 ;
+C 21; N balls--2; B 0.00 -2612.52 9500.00 2612.52 ;
+C 22; N balls--2l; B -2375.00 -475.04 11875.00 475.04 ;
+C 23; N balls-0; B 0.00 -2612.52 9405.09 2612.52 ;
+C 24; N balls-0l; B -2351.27 -475.04 11756.36 475.04 ;
+C 25; N balls-1; B 0.00 -2612.52 6543.00 2612.52 ;
+C 26; N balls-1l; B -1635.76 -475.04 8178.76 475.04 ;
+C 27; N balls-2; B 0.00 -2612.52 6274.89 2612.52 ;
+C 28; N balls-2l; B -1568.73 -475.04 7843.61 475.04 ;
+C 29; N scripts-ufermata; B -6293.78 -356.28 6293.78 6887.57 ;
+C 30; N scripts-dfermata; B -6293.78 -6887.57 6293.78 356.28 ;
+C 31; N scripts-sforzato; B -4274.98 -2375.00 4274.98 2375.00 ;
+C 32; N scripts-staccato; B -712.55 -712.55 712.55 712.55 ;
+C 33; N scripts-ustaccatissimo; B -950.07 -200.00 950.07 4750.09 ;
+C 34; N scripts-dstaccatissimo; B -950.07 -4750.09 950.07 200.00 ;
+C 35; N scripts-tenuto; B -2850.04 -332.53 2850.04 332.53 ;
+C 36; N scripts-umarcato; B -2375.00 0.00 2375.00 5225.04 ;
+C 37; N scripts-dmarcato; B -2375.00 -5225.04 2375.00 0.00 ;
+C 38; N scripts-open; B -1900.01 -2375.00 1900.01 2375.00 ;
+C 39; N scripts-stopped; B -2612.52 -2612.52 2612.52 2612.52 ;
+C 40; N scripts-upbow; B -3087.51 0.00 3087.51 9880.07 ;
+C 41; N scripts-downbow; B -3562.50 0.00 3562.50 6333.31 ;
+C 42; N scripts-reverseturn; B -5195.31 -2514.71 5195.31 2514.71 ;
+C 43; N scripts-turn; B -5195.31 -2514.71 5195.31 2514.71 ;
+C 44; N scripts-trill; B -4750.00 0.00 4750.00 10687.50 ;
+C 45; N scripts-upedalheel; B -2375.00 -2375.00 2375.00 3166.67 ;
+C 46; N scripts-dpedalheel; B -2375.00 -3166.67 2375.00 2375.00 ;
+C 47; N scripts-upedaltoe; B -2375.00 0.00 2375.00 7125.00 ;
+C 48; N scripts-dpedaltoe; B -2375.00 -7125.00 2375.00 0.00 ;
+C 49; N scripts-flageolet; B -2533.34 -2533.34 2533.34 2533.34 ;
+C 50; N scripts-trilelement; B -3166.67 -2375.00 1241.30 2375.00 ;
+C 51; N scripts-prall; B -5370.65 -2375.00 5370.65 2375.00 ;
+C 52; N scripts-mordent; B -5370.65 -2375.00 5370.65 2375.00 ;
+C 53; N scripts-prallprall; B -7574.63 -2375.00 7574.63 2375.00 ;
+C 54; N scripts-prallmordent; B -7574.63 -2375.00 7574.63 2375.00 ;
+C 55; N scripts-upprall; B -7574.63 -2375.00 7574.63 2375.00 ;
+C 56; N scripts-downprall; B -7574.63 -2375.00 7574.63 2375.00 ;
+C 57; N flags-u3; B -237.52 -14558.78 5861.15 237.52 ;
+C 58; N flags-u4; B -237.52 -16933.78 5861.15 237.52 ;
+C 59; N flags-u5; B -237.52 -20496.28 5861.15 237.52 ;
+C 60; N flags-u6; B -237.52 -25246.28 5861.15 237.52 ;
+C 61; N flags-d3; B -237.52 -237.52 6486.07 13846.31 ;
+C 62; N flags-d4; B -237.52 -237.52 6486.07 14558.78 ;
+C 63; N flags-d5; B -237.52 -237.52 6486.07 18596.31 ;
+C 64; N flags-d6; B -237.52 -237.52 6486.07 20971.31 ;
+C 65; N clefs-alto; B -4750.00 -9500.00 17680.59 9500.00 ;
+C 66; N clefs-alto_change; B -3800.02 -7600.04 14144.50 7600.04 ;
+C 67; N clefs-bass; B -2375.00 -11875.00 17100.04 4750.00 ;
+C 68; N clefs-bass_change; B -1900.04 -9500.05 13680.05 3800.02 ;
+C 69; N clefs-violin; B -4139.30 -14250.00 17751.40 23750.00 ;
+C 70; N clefs-violin_change; B -3596.45 -11400.05 13916.18 19000.09 ;
+C 71; N timesig-C4/4; B -8550.02 -4750.00 8074.98 4750.00 ;
+C 72; N timesig-C2/2; B -8550.02 -6649.98 8074.98 6649.98 ;
+C 73; N timesig-old4/4; B -8312.50 -3562.50 8312.50 3562.50 ;
+C 74; N timesig-old2/2; B -8312.50 -4750.00 8312.50 4750.00 ;
+C 75; N timesig-old3/2; B -8312.50 -3562.50 8312.50 3562.50 ;
+C 76; N timesig-old6/4; B -8312.50 -5937.50 8312.50 5937.50 ;
+C 77; N timesig-old9/4; B -8312.50 -5937.50 8312.50 5937.50 ;
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta20.afm b/mf/out/feta20.afm
index 6a7654ac97e1e7736fdf86a33069993d55495c58..7b7bb8be82e0587b2f2ffd57141832f8935c68d6 100644 (file)
--- a/mf/out/feta20.afm
+++ b/mf/out/feta20.afm
@@ -18,69 +18,66 @@ C 13; N accidentals-0; B 0.00 -7500.00 3333.33 7500.00 ;
 C 14; N accidentals--1; B -600.04 -2500.00 4000.02 10000.00 ;
 C 15; N accidentals--2; B -600.04 -2500.00 7249.98 10000.00 ;
 C 16; N accidentals-2; B 0.00 -2500.00 5000.00 2500.00 ;
-C 17; N accidentals-); B 0.00 -5000.00 3000.03 5000.00 ;
-C 18; N accidentals-(; B -3000.03 -5000.00 0.00 5000.00 ;
-C 19; N dots-dot; B 0.00 -1125.00 2249.98 1125.00 ;
-C 20; N dots-repeatcolon; B 0.00 -2500.00 2249.98 2500.00 ;
-C 21; N balls--1; B 0.00 -2750.02 10000.00 2750.02 ;
-C 22; N balls--1l; B -2500.00 -500.03 12500.00 500.03 ;
-C 23; N balls--2; B 0.00 -2750.02 10000.00 2750.02 ;
-C 24; N balls--2l; B -2500.00 -500.03 12500.00 500.03 ;
-C 25; N balls-0; B 0.00 -2750.02 9900.09 2750.02 ;
-C 26; N balls-0l; B -2475.02 -500.03 12375.10 500.03 ;
-C 27; N balls-1; B 0.00 -2750.02 6887.33 2750.02 ;
-C 28; N balls-1l; B -1721.83 -500.03 8609.16 500.03 ;
-C 29; N balls-2; B 0.00 -2750.02 6605.15 2750.02 ;
-C 30; N balls-2l; B -1651.29 -500.03 8256.44 500.03 ;
-C 31; N scripts-ufermata; B -6625.03 -375.03 6625.03 7250.06 ;
-C 32; N scripts-dfermata; B -6625.03 -7250.06 6625.03 375.03 ;
-C 33; N scripts-thumb; B -2000.00 -2500.00 2000.00 2500.00 ;
-C 34; N scripts-sforzato; B -4499.97 -2500.00 4499.97 2500.00 ;
-C 35; N scripts-staccato; B -750.05 -750.05 750.05 750.05 ;
-C 36; N scripts-ustaccatissimo; B -1000.06 -200.00 1000.06 5000.08 ;
-C 37; N scripts-dstaccatissimo; B -1000.06 -5000.08 1000.06 200.00 ;
-C 38; N scripts-tenuto; B -3000.03 -350.02 3000.03 350.02 ;
-C 39; N scripts-umarcato; B -2500.00 0.00 2500.00 5500.03 ;
-C 40; N scripts-dmarcato; B -2500.00 -5500.03 2500.00 0.00 ;
-C 41; N scripts-open; B -2000.00 -2500.00 2000.00 2500.00 ;
-C 42; N scripts-stopped; B -2750.02 -2750.02 2750.02 2750.02 ;
-C 43; N scripts-upbow; B -3250.02 0.00 3250.02 10400.07 ;
-C 44; N scripts-downbow; B -3750.00 0.00 3750.00 6666.64 ;
-C 45; N scripts-reverseturn; B -5468.75 -2647.06 5468.75 2647.06 ;
-C 46; N scripts-turn; B -5468.75 -2647.06 5468.75 2647.06 ;
-C 47; N scripts-trill; B -5000.00 0.00 5000.00 11250.00 ;
-C 48; N scripts-upedalheel; B -2500.00 -2500.00 2500.00 3333.33 ;
-C 49; N scripts-dpedalheel; B -2500.00 -3333.33 2500.00 2500.00 ;
-C 50; N scripts-upedaltoe; B -2500.00 0.00 2500.00 7500.00 ;
-C 51; N scripts-dpedaltoe; B -2500.00 -7500.00 2500.00 0.00 ;
-C 52; N scripts-flageolet; B -2666.67 -2666.67 2666.67 2666.67 ;
-C 53; N scripts-trilelement; B -3333.33 -2500.00 1306.64 2500.00 ;
-C 54; N scripts-prall; B -5653.30 -2500.00 5653.30 2500.00 ;
-C 55; N scripts-mordent; B -5653.30 -2500.00 5653.30 2500.00 ;
-C 56; N scripts-prallprall; B -7973.28 -2500.00 7973.28 2500.00 ;
-C 57; N scripts-prallmordent; B -7973.28 -2500.00 7973.28 2500.00 ;
-C 58; N scripts-upprall; B -7973.28 -2500.00 7973.28 2500.00 ;
-C 59; N scripts-downprall; B -7973.28 -2500.00 7973.28 2500.00 ;
-C 60; N flags-u3; B -250.02 -15325.03 6169.62 250.02 ;
-C 61; N flags-u4; B -250.02 -17825.03 6169.62 250.02 ;
-C 62; N flags-u5; B -250.02 -21575.03 6169.62 250.02 ;
-C 63; N flags-u6; B -250.02 -26575.03 6169.62 250.02 ;
-C 64; N flags-d3; B -250.02 -250.02 6827.44 14575.06 ;
-C 65; N flags-d4; B -250.02 -250.02 6827.44 15325.03 ;
-C 66; N flags-d5; B -250.02 -250.02 6827.44 19575.06 ;
-C 67; N flags-d6; B -250.02 -250.02 6827.44 22075.06 ;
-C 68; N clefs-alto; B -5000.00 -10000.00 18611.10 10000.00 ;
-C 69; N clefs-alto_change; B -4000.02 -8000.03 14888.92 8000.03 ;
-C 70; N clefs-bass; B -2500.00 -12500.00 18000.03 5000.00 ;
-C 71; N clefs-bass_change; B -2000.05 -10000.05 14400.04 4000.02 ;
-C 72; N clefs-violin; B -4357.15 -15000.00 18685.68 25000.00 ;
-C 73; N clefs-violin_change; B -3785.74 -12000.05 14648.60 20000.08 ;
-C 74; N timesig-C4/4; B -9000.02 -5000.00 8499.98 5000.00 ;
-C 75; N timesig-C2/2; B -9000.02 -6999.97 8499.98 6999.97 ;
-C 76; N timesig-old4/4; B -8750.00 -3750.00 8750.00 3750.00 ;
-C 77; N timesig-old2/2; B -8750.00 -5000.00 8750.00 5000.00 ;
-C 78; N timesig-old3/2; B -8750.00 -3750.00 8750.00 3750.00 ;
-C 79; N timesig-old6/4; B -8750.00 -6250.00 8750.00 6250.00 ;
-C 80; N timesig-old9/4; B -8750.00 -6250.00 8750.00 6250.00 ;
+C 17; N dots-dot; B 0.00 -1125.00 2249.98 1125.00 ;
+C 18; N dots-repeatcolon; B 0.00 -2500.00 2249.98 2500.00 ;
+C 19; N balls--1; B 0.00 -2750.02 10000.00 2750.02 ;
+C 20; N balls--1l; B -2500.00 -500.03 12500.00 500.03 ;
+C 21; N balls--2; B 0.00 -2750.02 10000.00 2750.02 ;
+C 22; N balls--2l; B -2500.00 -500.03 12500.00 500.03 ;
+C 23; N balls-0; B 0.00 -2750.02 9900.09 2750.02 ;
+C 24; N balls-0l; B -2475.02 -500.03 12375.10 500.03 ;
+C 25; N balls-1; B 0.00 -2750.02 6887.33 2750.02 ;
+C 26; N balls-1l; B -1721.83 -500.03 8609.16 500.03 ;
+C 27; N balls-2; B 0.00 -2750.02 6605.15 2750.02 ;
+C 28; N balls-2l; B -1651.29 -500.03 8256.44 500.03 ;
+C 29; N scripts-ufermata; B -6625.03 -375.03 6625.03 7250.06 ;
+C 30; N scripts-dfermata; B -6625.03 -7250.06 6625.03 375.03 ;
+C 31; N scripts-sforzato; B -4499.97 -2500.00 4499.97 2500.00 ;
+C 32; N scripts-staccato; B -750.05 -750.05 750.05 750.05 ;
+C 33; N scripts-ustaccatissimo; B -1000.06 -200.00 1000.06 5000.08 ;
+C 34; N scripts-dstaccatissimo; B -1000.06 -5000.08 1000.06 200.00 ;
+C 35; N scripts-tenuto; B -3000.03 -350.02 3000.03 350.02 ;
+C 36; N scripts-umarcato; B -2500.00 0.00 2500.00 5500.03 ;
+C 37; N scripts-dmarcato; B -2500.00 -5500.03 2500.00 0.00 ;
+C 38; N scripts-open; B -2000.00 -2500.00 2000.00 2500.00 ;
+C 39; N scripts-stopped; B -2750.02 -2750.02 2750.02 2750.02 ;
+C 40; N scripts-upbow; B -3250.02 0.00 3250.02 10400.07 ;
+C 41; N scripts-downbow; B -3750.00 0.00 3750.00 6666.64 ;
+C 42; N scripts-reverseturn; B -5468.75 -2647.06 5468.75 2647.06 ;
+C 43; N scripts-turn; B -5468.75 -2647.06 5468.75 2647.06 ;
+C 44; N scripts-trill; B -5000.00 0.00 5000.00 11250.00 ;
+C 45; N scripts-upedalheel; B -2500.00 -2500.00 2500.00 3333.33 ;
+C 46; N scripts-dpedalheel; B -2500.00 -3333.33 2500.00 2500.00 ;
+C 47; N scripts-upedaltoe; B -2500.00 0.00 2500.00 7500.00 ;
+C 48; N scripts-dpedaltoe; B -2500.00 -7500.00 2500.00 0.00 ;
+C 49; N scripts-flageolet; B -2666.67 -2666.67 2666.67 2666.67 ;
+C 50; N scripts-trilelement; B -3333.33 -2500.00 1306.64 2500.00 ;
+C 51; N scripts-prall; B -5653.30 -2500.00 5653.30 2500.00 ;
+C 52; N scripts-mordent; B -5653.30 -2500.00 5653.30 2500.00 ;
+C 53; N scripts-prallprall; B -7973.28 -2500.00 7973.28 2500.00 ;
+C 54; N scripts-prallmordent; B -7973.28 -2500.00 7973.28 2500.00 ;
+C 55; N scripts-upprall; B -7973.28 -2500.00 7973.28 2500.00 ;
+C 56; N scripts-downprall; B -7973.28 -2500.00 7973.28 2500.00 ;
+C 57; N flags-u3; B -250.02 -15325.03 6169.62 250.02 ;
+C 58; N flags-u4; B -250.02 -17825.03 6169.62 250.02 ;
+C 59; N flags-u5; B -250.02 -21575.03 6169.62 250.02 ;
+C 60; N flags-u6; B -250.02 -26575.03 6169.62 250.02 ;
+C 61; N flags-d3; B -250.02 -250.02 6827.44 14575.06 ;
+C 62; N flags-d4; B -250.02 -250.02 6827.44 15325.03 ;
+C 63; N flags-d5; B -250.02 -250.02 6827.44 19575.06 ;
+C 64; N flags-d6; B -250.02 -250.02 6827.44 22075.06 ;
+C 65; N clefs-alto; B -5000.00 -10000.00 18611.10 10000.00 ;
+C 66; N clefs-alto_change; B -4000.02 -8000.03 14888.92 8000.03 ;
+C 67; N clefs-bass; B -2500.00 -12500.00 18000.03 5000.00 ;
+C 68; N clefs-bass_change; B -2000.05 -10000.05 14400.04 4000.02 ;
+C 69; N clefs-violin; B -4357.15 -15000.00 18685.68 25000.00 ;
+C 70; N clefs-violin_change; B -3785.74 -12000.05 14648.60 20000.08 ;
+C 71; N timesig-C4/4; B -9000.02 -5000.00 8499.98 5000.00 ;
+C 72; N timesig-C2/2; B -9000.02 -6999.97 8499.98 6999.97 ;
+C 73; N timesig-old4/4; B -8750.00 -3750.00 8750.00 3750.00 ;
+C 74; N timesig-old2/2; B -8750.00 -5000.00 8750.00 5000.00 ;
+C 75; N timesig-old3/2; B -8750.00 -3750.00 8750.00 3750.00 ;
+C 76; N timesig-old6/4; B -8750.00 -6250.00 8750.00 6250.00 ;
+C 77; N timesig-old9/4; B -8750.00 -6250.00 8750.00 6250.00 ;
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta23.afm b/mf/out/feta23.afm
index 0b1d600910a5cb0b3cc0d7081fa1eb0c510bac31..f5b55de4edd180ad0a87197b2f89cc7dfb2caf36 100644 (file)
--- a/mf/out/feta23.afm
+++ b/mf/out/feta23.afm
@@ -18,69 +18,66 @@ C 13; N accidentals-0; B 0.00 -8437.50 3750.00 8437.50 ;
 C 14; N accidentals--1; B -675.03 -2812.50 4500.02 11250.00 ;
 C 15; N accidentals--2; B -675.03 -2812.50 8156.23 11250.00 ;
 C 16; N accidentals-2; B 0.00 -2812.50 5625.00 2812.50 ;
-C 17; N accidentals-); B 0.00 -5625.00 3375.03 5625.00 ;
-C 18; N accidentals-(; B -3375.03 -5625.00 0.00 5625.00 ;
-C 19; N dots-dot; B 0.00 -1265.63 2531.23 1265.63 ;
-C 20; N dots-repeatcolon; B 0.00 -2812.50 2531.23 2812.50 ;
-C 21; N balls--1; B 0.00 -3093.77 11250.00 3093.77 ;
-C 22; N balls--1l; B -2812.50 -562.53 14062.50 562.53 ;
-C 23; N balls--2; B 0.00 -3093.77 11250.00 3093.77 ;
-C 24; N balls--2l; B -2812.50 -562.53 14062.50 562.53 ;
-C 25; N balls-0; B 0.00 -3093.77 11137.57 3093.77 ;
-C 26; N balls-0l; B -2784.40 -562.53 13921.97 562.53 ;
-C 27; N balls-1; B 0.00 -3093.77 7748.26 3093.77 ;
-C 28; N balls-1l; B -1937.07 -562.53 9685.33 562.53 ;
-C 29; N balls-2; B 0.00 -3093.77 7430.80 3093.77 ;
-C 30; N balls-2l; B -1857.70 -562.53 9288.50 562.53 ;
-C 31; N scripts-ufermata; B -7453.16 -421.90 7453.16 8156.31 ;
-C 32; N scripts-dfermata; B -7453.16 -8156.31 7453.16 421.90 ;
-C 33; N scripts-thumb; B -2250.00 -2812.50 2250.00 2812.50 ;
-C 34; N scripts-sforzato; B -5062.47 -2812.50 5062.47 2812.50 ;
-C 35; N scripts-staccato; B -843.80 -843.80 843.80 843.80 ;
-C 36; N scripts-ustaccatissimo; B -1125.06 -200.00 1125.06 5625.08 ;
-C 37; N scripts-dstaccatissimo; B -1125.06 -5625.08 1125.06 200.00 ;
-C 38; N scripts-tenuto; B -3375.03 -393.77 3375.03 393.77 ;
-C 39; N scripts-umarcato; B -2812.50 0.00 2812.50 6187.53 ;
-C 40; N scripts-dmarcato; B -2812.50 -6187.53 2812.50 0.00 ;
-C 41; N scripts-open; B -2250.00 -2812.50 2250.00 2812.50 ;
-C 42; N scripts-stopped; B -3093.77 -3093.77 3093.77 3093.77 ;
-C 43; N scripts-upbow; B -3656.27 0.00 3656.27 11700.07 ;
-C 44; N scripts-downbow; B -4218.75 0.00 4218.75 7499.97 ;
-C 45; N scripts-reverseturn; B -6152.34 -2977.94 6152.34 2977.94 ;
-C 46; N scripts-turn; B -6152.34 -2977.94 6152.34 2977.94 ;
-C 47; N scripts-trill; B -5625.00 0.00 5625.00 12656.25 ;
-C 48; N scripts-upedalheel; B -2812.50 -2812.50 2812.50 3750.00 ;
-C 49; N scripts-dpedalheel; B -2812.50 -3750.00 2812.50 2812.50 ;
-C 50; N scripts-upedaltoe; B -2812.50 0.00 2812.50 8437.50 ;
-C 51; N scripts-dpedaltoe; B -2812.50 -8437.50 2812.50 0.00 ;
-C 52; N scripts-flageolet; B -3000.00 -3000.00 3000.00 3000.00 ;
-C 53; N scripts-trilelement; B -3750.00 -2812.50 1469.97 2812.50 ;
-C 54; N scripts-prall; B -6359.99 -2812.50 6359.99 2812.50 ;
-C 55; N scripts-mordent; B -6359.99 -2812.50 6359.99 2812.50 ;
-C 56; N scripts-prallprall; B -8969.97 -2812.50 8969.97 2812.50 ;
-C 57; N scripts-prallmordent; B -8969.97 -2812.50 8969.97 2812.50 ;
-C 58; N scripts-upprall; B -8969.97 -2812.50 8969.97 2812.50 ;
-C 59; N scripts-downprall; B -8969.97 -2812.50 8969.97 2812.50 ;
-C 60; N flags-u3; B -281.27 -17240.65 6940.84 281.27 ;
-C 61; N flags-u4; B -281.27 -20053.15 6940.84 281.27 ;
-C 62; N flags-u5; B -281.27 -24271.90 6940.84 281.27 ;
-C 63; N flags-u6; B -281.27 -29896.90 6940.84 281.27 ;
-C 64; N flags-d3; B -281.27 -281.27 7680.88 16396.93 ;
-C 65; N flags-d4; B -281.27 -281.27 7680.88 17240.65 ;
-C 66; N flags-d5; B -281.27 -281.27 7680.88 22021.93 ;
-C 67; N flags-d6; B -281.27 -281.27 7680.88 24834.43 ;
-C 68; N clefs-alto; B -5625.00 -11250.00 20937.50 11250.00 ;
-C 69; N clefs-alto_change; B -4500.02 -9000.03 16750.08 9000.03 ;
-C 70; N clefs-bass; B -2812.50 -14062.50 20250.03 5625.00 ;
-C 71; N clefs-bass_change; B -2250.05 -11250.05 16200.04 4500.02 ;
-C 72; N clefs-violin; B -4901.80 -16875.00 21021.40 28125.00 ;
-C 73; N clefs-violin_change; B -4258.94 -13500.05 16479.68 22500.08 ;
-C 74; N timesig-C4/4; B -10125.02 -5625.00 9562.48 5625.00 ;
-C 75; N timesig-C2/2; B -10125.02 -7874.97 9562.48 7874.97 ;
-C 76; N timesig-old4/4; B -9843.75 -4218.75 9843.75 4218.75 ;
-C 77; N timesig-old2/2; B -9843.75 -5625.00 9843.75 5625.00 ;
-C 78; N timesig-old3/2; B -9843.75 -4218.75 9843.75 4218.75 ;
-C 79; N timesig-old6/4; B -9843.75 -7031.25 9843.75 7031.25 ;
-C 80; N timesig-old9/4; B -9843.75 -7031.25 9843.75 7031.25 ;
+C 17; N dots-dot; B 0.00 -1265.63 2531.23 1265.63 ;
+C 18; N dots-repeatcolon; B 0.00 -2812.50 2531.23 2812.50 ;
+C 19; N balls--1; B 0.00 -3093.77 11250.00 3093.77 ;
+C 20; N balls--1l; B -2812.50 -562.53 14062.50 562.53 ;
+C 21; N balls--2; B 0.00 -3093.77 11250.00 3093.77 ;
+C 22; N balls--2l; B -2812.50 -562.53 14062.50 562.53 ;
+C 23; N balls-0; B 0.00 -3093.77 11137.57 3093.77 ;
+C 24; N balls-0l; B -2784.40 -562.53 13921.97 562.53 ;
+C 25; N balls-1; B 0.00 -3093.77 7748.26 3093.77 ;
+C 26; N balls-1l; B -1937.07 -562.53 9685.33 562.53 ;
+C 27; N balls-2; B 0.00 -3093.77 7430.80 3093.77 ;
+C 28; N balls-2l; B -1857.70 -562.53 9288.50 562.53 ;
+C 29; N scripts-ufermata; B -7453.16 -421.90 7453.16 8156.31 ;
+C 30; N scripts-dfermata; B -7453.16 -8156.31 7453.16 421.90 ;
+C 31; N scripts-sforzato; B -5062.47 -2812.50 5062.47 2812.50 ;
+C 32; N scripts-staccato; B -843.80 -843.80 843.80 843.80 ;
+C 33; N scripts-ustaccatissimo; B -1125.06 -200.00 1125.06 5625.08 ;
+C 34; N scripts-dstaccatissimo; B -1125.06 -5625.08 1125.06 200.00 ;
+C 35; N scripts-tenuto; B -3375.03 -393.77 3375.03 393.77 ;
+C 36; N scripts-umarcato; B -2812.50 0.00 2812.50 6187.53 ;
+C 37; N scripts-dmarcato; B -2812.50 -6187.53 2812.50 0.00 ;
+C 38; N scripts-open; B -2250.00 -2812.50 2250.00 2812.50 ;
+C 39; N scripts-stopped; B -3093.77 -3093.77 3093.77 3093.77 ;
+C 40; N scripts-upbow; B -3656.27 0.00 3656.27 11700.07 ;
+C 41; N scripts-downbow; B -4218.75 0.00 4218.75 7499.97 ;
+C 42; N scripts-reverseturn; B -6152.34 -2977.94 6152.34 2977.94 ;
+C 43; N scripts-turn; B -6152.34 -2977.94 6152.34 2977.94 ;
+C 44; N scripts-trill; B -5625.00 0.00 5625.00 12656.25 ;
+C 45; N scripts-upedalheel; B -2812.50 -2812.50 2812.50 3750.00 ;
+C 46; N scripts-dpedalheel; B -2812.50 -3750.00 2812.50 2812.50 ;
+C 47; N scripts-upedaltoe; B -2812.50 0.00 2812.50 8437.50 ;
+C 48; N scripts-dpedaltoe; B -2812.50 -8437.50 2812.50 0.00 ;
+C 49; N scripts-flageolet; B -3000.00 -3000.00 3000.00 3000.00 ;
+C 50; N scripts-trilelement; B -3750.00 -2812.50 1469.97 2812.50 ;
+C 51; N scripts-prall; B -6359.99 -2812.50 6359.99 2812.50 ;
+C 52; N scripts-mordent; B -6359.99 -2812.50 6359.99 2812.50 ;
+C 53; N scripts-prallprall; B -8969.97 -2812.50 8969.97 2812.50 ;
+C 54; N scripts-prallmordent; B -8969.97 -2812.50 8969.97 2812.50 ;
+C 55; N scripts-upprall; B -8969.97 -2812.50 8969.97 2812.50 ;
+C 56; N scripts-downprall; B -8969.97 -2812.50 8969.97 2812.50 ;
+C 57; N flags-u3; B -281.27 -17240.65 6940.84 281.27 ;
+C 58; N flags-u4; B -281.27 -20053.15 6940.84 281.27 ;
+C 59; N flags-u5; B -281.27 -24271.90 6940.84 281.27 ;
+C 60; N flags-u6; B -281.27 -29896.90 6940.84 281.27 ;
+C 61; N flags-d3; B -281.27 -281.27 7680.88 16396.93 ;
+C 62; N flags-d4; B -281.27 -281.27 7680.88 17240.65 ;
+C 63; N flags-d5; B -281.27 -281.27 7680.88 22021.93 ;
+C 64; N flags-d6; B -281.27 -281.27 7680.88 24834.43 ;
+C 65; N clefs-alto; B -5625.00 -11250.00 20937.50 11250.00 ;
+C 66; N clefs-alto_change; B -4500.02 -9000.03 16750.08 9000.03 ;
+C 67; N clefs-bass; B -2812.50 -14062.50 20250.03 5625.00 ;
+C 68; N clefs-bass_change; B -2250.05 -11250.05 16200.04 4500.02 ;
+C 69; N clefs-violin; B -4901.80 -16875.00 21021.40 28125.00 ;
+C 70; N clefs-violin_change; B -4258.94 -13500.05 16479.68 22500.08 ;
+C 71; N timesig-C4/4; B -10125.02 -5625.00 9562.48 5625.00 ;
+C 72; N timesig-C2/2; B -10125.02 -7874.97 9562.48 7874.97 ;
+C 73; N timesig-old4/4; B -9843.75 -4218.75 9843.75 4218.75 ;
+C 74; N timesig-old2/2; B -9843.75 -5625.00 9843.75 5625.00 ;
+C 75; N timesig-old3/2; B -9843.75 -4218.75 9843.75 4218.75 ;
+C 76; N timesig-old6/4; B -9843.75 -7031.25 9843.75 7031.25 ;
+C 77; N timesig-old9/4; B -9843.75 -7031.25 9843.75 7031.25 ;
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta26.afm b/mf/out/feta26.afm
index 3ef7426b935f54977cebd46c4adfbb24ac28be88..bd5369910d3ae0006e9aa90e75f76f980079efbb 100644 (file)
--- a/mf/out/feta26.afm
+++ b/mf/out/feta26.afm
@@ -18,69 +18,66 @@ C 13; N accidentals-0; B 0.00 -9750.00 4333.33 9750.00 ;
 C 14; N accidentals--1; B -780.04 -3250.00 5200.03 13000.00 ;
 C 15; N accidentals--2; B -780.04 -3250.00 9424.99 13000.00 ;
 C 16; N accidentals-2; B 0.00 -3250.00 6500.00 3250.00 ;
-C 17; N accidentals-); B 0.00 -6500.00 3900.04 6500.00 ;
-C 18; N accidentals-(; B -3900.04 -6500.00 0.00 6500.00 ;
-C 19; N dots-dot; B 0.00 -1462.50 2924.99 1462.50 ;
-C 20; N dots-repeatcolon; B 0.00 -3250.00 2924.99 3250.00 ;
-C 21; N balls--1; B 0.00 -3575.03 13000.00 3575.03 ;
-C 22; N balls--1l; B -3250.00 -650.04 16250.00 650.04 ;
-C 23; N balls--2; B 0.00 -3575.03 13000.00 3575.03 ;
-C 24; N balls--2l; B -3250.00 -650.04 16250.00 650.04 ;
-C 25; N balls-0; B 0.00 -3575.03 12870.12 3575.03 ;
-C 26; N balls-0l; B -3217.53 -650.04 16087.65 650.04 ;
-C 27; N balls-1; B 0.00 -3575.03 8953.54 3575.03 ;
-C 28; N balls-1l; B -2238.39 -650.04 11191.93 650.04 ;
-C 29; N balls-2; B 0.00 -3575.03 8586.67 3575.03 ;
-C 30; N balls-2l; B -2146.67 -650.04 10733.34 650.04 ;
-C 31; N scripts-ufermata; B -8612.53 -487.53 8612.53 9425.08 ;
-C 32; N scripts-dfermata; B -8612.53 -9425.08 8612.53 487.53 ;
-C 33; N scripts-thumb; B -2600.00 -3250.00 2600.00 3250.00 ;
-C 34; N scripts-sforzato; B -5849.96 -3250.00 5849.96 3250.00 ;
-C 35; N scripts-staccato; B -975.07 -975.07 975.07 975.07 ;
-C 36; N scripts-ustaccatissimo; B -1300.08 -200.00 1300.08 6500.10 ;
-C 37; N scripts-dstaccatissimo; B -1300.08 -6500.10 1300.08 200.00 ;
-C 38; N scripts-tenuto; B -3900.04 -455.03 3900.04 455.03 ;
-C 39; N scripts-umarcato; B -3250.00 0.00 3250.00 7150.04 ;
-C 40; N scripts-dmarcato; B -3250.00 -7150.04 3250.00 0.00 ;
-C 41; N scripts-open; B -2600.00 -3250.00 2600.00 3250.00 ;
-C 42; N scripts-stopped; B -3575.03 -3575.03 3575.03 3575.03 ;
-C 43; N scripts-upbow; B -4225.02 0.00 4225.02 13520.10 ;
-C 44; N scripts-downbow; B -4875.00 0.00 4875.00 8666.64 ;
-C 45; N scripts-reverseturn; B -7109.38 -3441.18 7109.38 3441.18 ;
-C 46; N scripts-turn; B -7109.38 -3441.18 7109.38 3441.18 ;
-C 47; N scripts-trill; B -6500.00 0.00 6500.00 14625.00 ;
-C 48; N scripts-upedalheel; B -3250.00 -3250.00 3250.00 4333.33 ;
-C 49; N scripts-dpedalheel; B -3250.00 -4333.33 3250.00 3250.00 ;
-C 50; N scripts-upedaltoe; B -3250.00 0.00 3250.00 9750.00 ;
-C 51; N scripts-dpedaltoe; B -3250.00 -9750.00 3250.00 0.00 ;
-C 52; N scripts-flageolet; B -3466.67 -3466.67 3466.67 3466.67 ;
-C 53; N scripts-trilelement; B -4333.33 -3250.00 1698.62 3250.00 ;
-C 54; N scripts-prall; B -7349.30 -3250.00 7349.30 3250.00 ;
-C 55; N scripts-mordent; B -7349.30 -3250.00 7349.30 3250.00 ;
-C 56; N scripts-prallprall; B -10365.28 -3250.00 10365.28 3250.00 ;
-C 57; N scripts-prallmordent; B -10365.28 -3250.00 10365.28 3250.00 ;
-C 58; N scripts-upprall; B -10365.28 -3250.00 10365.28 3250.00 ;
-C 59; N scripts-downprall; B -10365.28 -3250.00 10365.28 3250.00 ;
-C 60; N flags-u3; B -325.03 -19922.53 8020.51 325.03 ;
-C 61; N flags-u4; B -325.03 -23172.53 8020.51 325.03 ;
-C 62; N flags-u5; B -325.03 -28047.53 8020.51 325.03 ;
-C 63; N flags-u6; B -325.03 -34547.53 8020.51 325.03 ;
-C 64; N flags-d3; B -325.03 -325.03 8875.67 18947.57 ;
-C 65; N flags-d4; B -325.03 -325.03 8875.67 19922.53 ;
-C 66; N flags-d5; B -325.03 -325.03 8875.67 25447.57 ;
-C 67; N flags-d6; B -325.03 -325.03 8875.67 28697.57 ;
-C 68; N clefs-alto; B -6500.00 -13000.00 24194.44 13000.00 ;
-C 69; N clefs-alto_change; B -5200.03 -10400.05 19355.70 10400.05 ;
-C 70; N clefs-bass; B -3250.00 -16250.00 23400.04 6500.00 ;
-C 71; N clefs-bass_change; B -2600.07 -13000.08 18720.08 5200.03 ;
-C 72; N clefs-violin; B -5664.29 -19500.00 24291.40 32500.00 ;
-C 73; N clefs-violin_change; B -4921.46 -15600.08 19043.21 26000.14 ;
-C 74; N timesig-C4/4; B -11700.03 -6500.00 11049.99 6500.00 ;
-C 75; N timesig-C2/2; B -11700.03 -9099.96 11049.99 9099.96 ;
-C 76; N timesig-old4/4; B -11375.00 -4875.00 11375.00 4875.00 ;
-C 77; N timesig-old2/2; B -11375.00 -6500.00 11375.00 6500.00 ;
-C 78; N timesig-old3/2; B -11375.00 -4875.00 11375.00 4875.00 ;
-C 79; N timesig-old6/4; B -11375.00 -8125.00 11375.00 8125.00 ;
-C 80; N timesig-old9/4; B -11375.00 -8125.00 11375.00 8125.00 ;
+C 17; N dots-dot; B 0.00 -1462.50 2924.99 1462.50 ;
+C 18; N dots-repeatcolon; B 0.00 -3250.00 2924.99 3250.00 ;
+C 19; N balls--1; B 0.00 -3575.03 13000.00 3575.03 ;
+C 20; N balls--1l; B -3250.00 -650.04 16250.00 650.04 ;
+C 21; N balls--2; B 0.00 -3575.03 13000.00 3575.03 ;
+C 22; N balls--2l; B -3250.00 -650.04 16250.00 650.04 ;
+C 23; N balls-0; B 0.00 -3575.03 12870.12 3575.03 ;
+C 24; N balls-0l; B -3217.53 -650.04 16087.65 650.04 ;
+C 25; N balls-1; B 0.00 -3575.03 8953.54 3575.03 ;
+C 26; N balls-1l; B -2238.39 -650.04 11191.93 650.04 ;
+C 27; N balls-2; B 0.00 -3575.03 8586.67 3575.03 ;
+C 28; N balls-2l; B -2146.67 -650.04 10733.34 650.04 ;
+C 29; N scripts-ufermata; B -8612.53 -487.53 8612.53 9425.08 ;
+C 30; N scripts-dfermata; B -8612.53 -9425.08 8612.53 487.53 ;
+C 31; N scripts-sforzato; B -5849.96 -3250.00 5849.96 3250.00 ;
+C 32; N scripts-staccato; B -975.07 -975.07 975.07 975.07 ;
+C 33; N scripts-ustaccatissimo; B -1300.08 -200.00 1300.08 6500.10 ;
+C 34; N scripts-dstaccatissimo; B -1300.08 -6500.10 1300.08 200.00 ;
+C 35; N scripts-tenuto; B -3900.04 -455.03 3900.04 455.03 ;
+C 36; N scripts-umarcato; B -3250.00 0.00 3250.00 7150.04 ;
+C 37; N scripts-dmarcato; B -3250.00 -7150.04 3250.00 0.00 ;
+C 38; N scripts-open; B -2600.00 -3250.00 2600.00 3250.00 ;
+C 39; N scripts-stopped; B -3575.03 -3575.03 3575.03 3575.03 ;
+C 40; N scripts-upbow; B -4225.02 0.00 4225.02 13520.10 ;
+C 41; N scripts-downbow; B -4875.00 0.00 4875.00 8666.64 ;
+C 42; N scripts-reverseturn; B -7109.38 -3441.18 7109.38 3441.18 ;
+C 43; N scripts-turn; B -7109.38 -3441.18 7109.38 3441.18 ;
+C 44; N scripts-trill; B -6500.00 0.00 6500.00 14625.00 ;
+C 45; N scripts-upedalheel; B -3250.00 -3250.00 3250.00 4333.33 ;
+C 46; N scripts-dpedalheel; B -3250.00 -4333.33 3250.00 3250.00 ;
+C 47; N scripts-upedaltoe; B -3250.00 0.00 3250.00 9750.00 ;
+C 48; N scripts-dpedaltoe; B -3250.00 -9750.00 3250.00 0.00 ;
+C 49; N scripts-flageolet; B -3466.67 -3466.67 3466.67 3466.67 ;
+C 50; N scripts-trilelement; B -4333.33 -3250.00 1698.62 3250.00 ;
+C 51; N scripts-prall; B -7349.30 -3250.00 7349.30 3250.00 ;
+C 52; N scripts-mordent; B -7349.30 -3250.00 7349.30 3250.00 ;
+C 53; N scripts-prallprall; B -10365.28 -3250.00 10365.28 3250.00 ;
+C 54; N scripts-prallmordent; B -10365.28 -3250.00 10365.28 3250.00 ;
+C 55; N scripts-upprall; B -10365.28 -3250.00 10365.28 3250.00 ;
+C 56; N scripts-downprall; B -10365.28 -3250.00 10365.28 3250.00 ;
+C 57; N flags-u3; B -325.03 -19922.53 8020.51 325.03 ;
+C 58; N flags-u4; B -325.03 -23172.53 8020.51 325.03 ;
+C 59; N flags-u5; B -325.03 -28047.53 8020.51 325.03 ;
+C 60; N flags-u6; B -325.03 -34547.53 8020.51 325.03 ;
+C 61; N flags-d3; B -325.03 -325.03 8875.67 18947.57 ;
+C 62; N flags-d4; B -325.03 -325.03 8875.67 19922.53 ;
+C 63; N flags-d5; B -325.03 -325.03 8875.67 25447.57 ;
+C 64; N flags-d6; B -325.03 -325.03 8875.67 28697.57 ;
+C 65; N clefs-alto; B -6500.00 -13000.00 24194.44 13000.00 ;
+C 66; N clefs-alto_change; B -5200.03 -10400.05 19355.70 10400.05 ;
+C 67; N clefs-bass; B -3250.00 -16250.00 23400.04 6500.00 ;
+C 68; N clefs-bass_change; B -2600.07 -13000.08 18720.08 5200.03 ;
+C 69; N clefs-violin; B -5664.29 -19500.00 24291.40 32500.00 ;
+C 70; N clefs-violin_change; B -4921.46 -15600.08 19043.21 26000.14 ;
+C 71; N timesig-C4/4; B -11700.03 -6500.00 11049.99 6500.00 ;
+C 72; N timesig-C2/2; B -11700.03 -9099.96 11049.99 9099.96 ;
+C 73; N timesig-old4/4; B -11375.00 -4875.00 11375.00 4875.00 ;
+C 74; N timesig-old2/2; B -11375.00 -6500.00 11375.00 6500.00 ;
+C 75; N timesig-old3/2; B -11375.00 -4875.00 11375.00 4875.00 ;
+C 76; N timesig-old6/4; B -11375.00 -8125.00 11375.00 8125.00 ;
+C 77; N timesig-old9/4; B -11375.00 -8125.00 11375.00 8125.00 ;
 EndCharMetrics
 EndFontMetrics