From ba2f5cb025009ecc30e9a38dee32edd6006e472b Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 3 Dec 1997 10:31:29 +0100
Subject: [PATCH] patch::: 0.1.33.jcn1: om je wat op te vrolijken

pl 33.jcn1
	- bf: mf: numbers and alto clef
---
 NEWS                |   3 ++
 VERSION             |   2 +-
 init/feta16.ly      |   6 +--
 init/feta20.ly      |   6 +--
 mf/dimen.tex        |  18 ++++----
 mf/feta-klef.mf     |  16 +++----
 mf/feta-nummer.mf   | 102 +++++++++++++++++++++++++-------------------
 mf/feta-nummer10.mf |   5 +--
 mf/feta-nummer8.mf  |   5 +--
 mf/feta-test20.mf   |  24 +++++++++++
 tex/feta16.tex      |   2 +-
 tex/feta20.tex      |   2 +-
 tex/fetdefs.tex     |   5 ++-
 13 files changed, 117 insertions(+), 79 deletions(-)
 create mode 100644 mf/feta-test20.mf

diff --git a/NEWS b/NEWS
index 11344c4360..28855746fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+pl 33.jcn1
+	- bf: mf: numbers and alto clef
+
 pl 33
 	- added abbrev.ly to font.ly; rm'd abbrev.ly
 	- don't process scores on parse errors.
diff --git a/VERSION b/VERSION
index 3bf599260b..01c31fc5cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
 TOPLEVEL_PATCH_LEVEL = 33
-TOPLEVEL_MY_PATCH_LEVEL = jcn1
+TOPLEVEL_MY_PATCH_LEVEL = jcn2
 
 # use the above to send patches, always empty for released version:
 # please don't move these comments up; the patch should fail if 
diff --git a/init/feta16.ly b/init/feta16.ly
index b7a80d9986..9087e6f5da 100644
--- a/init/feta16.ly
+++ b/init/feta16.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Nov 24 00:16:56 1997
+% on Wed Dec  3 01:03:55 1997
 % Do not edit
 % input from out/feta16.log
 % name=\symboltables {
@@ -68,8 +68,8 @@
         "d6"	"\\dsixtyfourthflag"	-0.20\pt	4.54\pt	-0.20\pt	17.66\pt	
         }
     "clefs"	 = \table {
-        "alto"	"\\altoclef"	-0.00\pt	10.00\pt	-8.00\pt	8.00\pt	
-        "alto_change"	"\\caltoclef"	-0.00\pt	8.00\pt	-6.40\pt	6.40\pt	
+        "alto"	"\\altoclef"	-0.00\pt	10.89\pt	-8.00\pt	8.00\pt	
+        "alto_change"	"\\caltoclef"	-0.00\pt	8.71\pt	-6.40\pt	6.40\pt	
         "bass"	"\\bassclef"	1.20\pt	12.80\pt	-10.00\pt	4.00\pt	
         "bass_change"	"\\cbassclef"	0.96\pt	10.24\pt	-8.00\pt	3.20\pt	
         "violin"	"\\violinclef"	-0.11\pt	10.95\pt	-12.00\pt	20.00\pt	
diff --git a/init/feta20.ly b/init/feta20.ly
index 8cc5c5b7cd..08f7628853 100644
--- a/init/feta20.ly
+++ b/init/feta20.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Nov 24 00:16:57 1997
+% on Wed Dec  3 01:04:18 1997
 % Do not edit
 % input from out/feta20.log
 % name=\symboltables {
@@ -68,8 +68,8 @@
         "d6"	"\\dsixtyfourthflag"	-0.25\pt	5.68\pt	-0.25\pt	22.08\pt	
         }
     "clefs"	 = \table {
-        "alto"	"\\altoclef"	-0.00\pt	12.50\pt	-10.00\pt	10.00\pt	
-        "alto_change"	"\\caltoclef"	-0.00\pt	10.00\pt	-8.00\pt	8.00\pt	
+        "alto"	"\\altoclef"	-0.00\pt	13.61\pt	-10.00\pt	10.00\pt	
+        "alto_change"	"\\caltoclef"	-0.00\pt	10.89\pt	-8.00\pt	8.00\pt	
         "bass"	"\\bassclef"	1.50\pt	16.00\pt	-12.50\pt	5.00\pt	
         "bass_change"	"\\cbassclef"	1.20\pt	12.80\pt	-10.00\pt	4.00\pt	
         "violin"	"\\violinclef"	-0.14\pt	13.69\pt	-15.00\pt	25.00\pt	
diff --git a/mf/dimen.tex b/mf/dimen.tex
index a596396e7a..b900b40e55 100644
--- a/mf/dimen.tex
+++ b/mf/dimen.tex
@@ -3,12 +3,12 @@
 %
 
 \font\black=black
-\font\taupin=musix16
-\font\fet=font-en-tja16
-\font\vet=vette-beams16
-\font\slurs=xslhd16
-\font\specfont=musixspx
-\font\egler=opus16
+%\font\taupin=musix16
+%\font\fet=font-en-tja16
+%\font\vet=vette-beams16
+%\font\slurs=xslhd16
+%\font\specfont=musixspx
+%\font\egler=opus16
 \font\nummertjes=feta-nummer10
 %\def\thefont{\egler}
 %\def\thefont{\specfont}
@@ -53,9 +53,11 @@
         \setbox0=\hbox{\mb{#1}} width \the\wd0\ depth \the\dp0 \ height \the\ht0}
 
 \newcount\n
-\def\charn{\n=-1
+%\def\charn{\n=-1
+\def\charn{\n=47
 %        \loop\ifnum\n<255\advance\n by1
-        \loop\ifnum\n<10\advance\n by1
+%        \loop\ifnum\n<10\advance\n by1
+        \loop\ifnum\n<58\advance\n by1
         \doitem{\number\n}\endgraf\repeat}
 
 
diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 3ac2ba1b77..2175bc1b3a 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -23,13 +23,14 @@ def draw_c_clef (expr reduction) =
 	norm#:=2/3reduced_il#;
 	hair#:=1/6norm#;
 	define_pixels (hair,norm,reduced_il);
-	set_char_box (0, 5/2reduced_il#, 2 reduced_il#, 2 reduced_il#);
-	draw_block ((0,-d), (1/2reduced_il,h));
-	draw_block ((1/2reduced_il+stafflinethickness,-d), 
-	  (1/2reduced_il+2stafflinethickness,h));
+	set_char_box (0, 15/4norm#+2hair#, 
+		2 reduced_il#, 2 reduced_il#);
+	draw_block ((0,-d), (3/4norm+1/2hair,h));
+	draw_block ((3/4norm+2hair,-d), 
+		(3/4norm+7/2hair,h));
 	
 	save xoff;
-	xoff=1/2reduced_il+2hair;
+	xoff=3/4norm+7/2hair;
 	penpos1(hair,-90);
 	z1l=(xoff+norm+hair,h);
 	penpos2(norm-hair,180);
@@ -51,11 +52,8 @@ def draw_c_clef (expr reduction) =
 
 	save t; t=0.833;
 	save p; path p;
-%	p = z5l..z4l{up}..z4r{down}..z3r{right}..tension t..z2r{up}
-%		..z1r{left}..z1l{right}..z2l{down}
-%		..z3l{left}..z5r{down};
 	p = z5l..z4l{up}..z4r{down}..z3r{right}..tension t..z2r{up}
-		..z1r{left}..z1l{right}..z2l{down}
+		..tension t..z1r{left}..z1l{right}..tension t..z2l{down}
 		..z3l{left}..z6r..z5r{down};
 	pickup pencircle scaled 1pt#;
 	filldraw p..(reverse p yscaled -1)..cycle;
diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf
index 496015828e..3d0f5e718b 100644
--- a/mf/feta-nummer.mf
+++ b/mf/feta-nummer.mf
@@ -4,7 +4,7 @@
 fet_begingroup("nummer")
 code := 47;
 
-define_pixels(height,thick,norm,thin,hair);
+define_pixels(height,thick,thick,thin,hair);
 foot_top#:=2thin#;
 foot_width#:=2thick#+thin#;
 define_pixels(foot_top,foot_width);
@@ -44,39 +44,44 @@ def draw_foot(expr xpos) =
 	enddef;
 
 def draw_six =
-	set_char_box(0, 2thick#+2thin#, 0, height#);
+	set_char_box(0, 2/3height#, 0, height#);
 	message "w:"&decimal w;
 	message "h:"&decimal h;
 
 	penpos1(thin,90);
-	z1=(norm,h/2+thin);
+	z1=(thick,h/2+thin);
 	penpos2(hair,90);
 	z2=(w/2,y1);
-	penpos3(norm-hair,0);
+	penpos3(thick-hair,0);
 	% yup, should use the path [] "everywhere"
 	z3r=(w,1/2[0,y1]);
 	penpos4(hair,-90);
 	z4r=(x2,0);
-	penpos5(norm-hair,180);
+	penpos5(thick-hair,180);
 	z5r=(0,y1);
 	penpos6(hair,90);
-	z6r=(w-norm-hair,h);
-	penpos7(norm-hair,180);
+	z6r=(w-thick-hair,h);
+	penpos7(thick-hair,180);
 	z7r=(0,h/2);
-	penpos10(norm-hair,180);
+	penpos10(thick-hair,180);
 	z10r=(0,y3);
 	penlabels(1,2,3,4,5,6,7,8,9,10,11);
 	save t; t=0.833;
-	fill z5{right}..z2r{right}..z3r{down}..z4r{left}
+%	fill z5{right}..z2r{right}..z3r{down}..z4r{left}
+%		..tension t..z7r{up}..tension t..z6r{right}
+%		..z6l{left}..tension t..z7l{down}..z10l{up}..cycle;
+	fill z5{right}..z2r{right}..tension t..z3r{down}
+		..tension t..z4r{left}
 		..tension t..z7r{up}..tension t..z6r{right}
 		..z6l{left}..tension t..z7l{down}..z10l{up}..cycle;
-	draw_flare(z6r,0,-90,hair,norm);
+	draw_flare(z6r,0,-90,hair,thick);
 	unfill z2l{right}..tension t..z3l{down}..tension t
 		..z4l{left}..tension t..z10l{up}..tension t..cycle;
 	enddef;
 
 fet_beginchar("Numeral 0", "0", "zero")
-	set_char_box(0, 3thick#, 0, height#);
+%	set_char_box(0, 4/5height#, 0, height#);
+	set_char_box(0, 11/15height#, 0, height#);
 	message "w:"&decimal w;
 	message "h:"&decimal h;
 	penpos1(thin,90);
@@ -93,7 +98,8 @@ fet_beginchar("Numeral 0", "0", "zero")
 fet_endchar;
 	
 fet_beginchar("Numeral 1", "1", "one")
-	set_char_box(0, 5/2thick#+thin#, 0, height#);
+%	set_char_box(0, 11/15height#, 0, height#);
+	set_char_box(0, 19/30height#, 0, height#);
 	message "w:"&decimal w;
 	message "h:"&decimal h;
 
@@ -122,7 +128,7 @@ fet_beginchar("Numeral 1", "1", "one")
 fet_endchar;
 
 fet_beginchar("Numeral 2", "2", "two")
-	set_char_box(0, 3thick#-thin#, 0, height#);
+	set_char_box(0, 11/15height#, 0, height#);
 	message "w:"&decimal w;
 	message "h:"&decimal h;
 	clearxy;
@@ -132,8 +138,8 @@ fet_beginchar("Numeral 2", "2", "two")
 	z1=(0,0)+(1/2sqrt(2)*thin)*dir(45);
 	penpos3(hair,90+beta);
 	z3=(w,thick)+(1/2sqrt(2)*hair)*dir(-135);
-	penpos2(norm,90+alpha);
-	x2-x1=x3-x2; y2=thick/2+hair/2;
+	penpos2(thick-hair,90+alpha);
+	x2-x1=x3-x2; y2=thick/2+hair;
 	penlabels(1,2,3);
 	fill z1r{dir(beta)}..{dir(alpha)}z2r..{dir(beta)}z3r
 		..z3l{dir(180+beta)}..{dir(180+alpha)}z2l
@@ -141,7 +147,7 @@ fet_beginchar("Numeral 2", "2", "two")
 
 	penpos4(thin,90);
 	z4r=(thick,2/5h);
-	penpos5(norm,0);
+	penpos5(thick,0);
 	z5r=(w-thin,.72h);
 	penpos6(thin,90);
 	z6r=(w/2-thin-hair,h);
@@ -155,38 +161,44 @@ fet_beginchar("Numeral 2", "2", "two")
 fet_endchar;
 
 fet_beginchar("Numeral 3", "3", "three")
-	set_char_box(0, 2thick#+2thin#, 0, height#);
+	set_char_box(0, 2/3height#, 0, height#);
 	message "w:"&decimal w;
 	message "h:"&decimal h;
 	penpos1(hair,-90);
-	z1l=(norm+hair/2,h);
-	penpos2(norm-hair,180);
+	z1l=(thick+hair/2,h);
+	penpos2(thick-hair,180);
 	z2l=(w-hair,3/4h+hair/2);
 	penpos3(hair,90);
 	z3=(w/2,h/2+hair);
 	penpos4(hair,90);
-	z4=(1/2norm+hair,y3);
-	penpos5(norm,0);
+	z4=(1/2thick+hair,y3);
+	penpos5(thick,0);
 	z5r=(w,1/4h+hair/2);
 	penpos6(hair,-90);
-	z6r=(norm+hair,0);
+	z6r=(thick+hair,0);
 	penpos7(thin+hair,90);
 	z7=(x2,y3);
 	penlabels(1,2,3,4,5,6,7);
 	save alpha; alpha=25;
 	save t; t=0.833;
-	fill z1l{right}..z2l{down}..z7r{dir(180+alpha)}
-		..z7l{dir(-alpha)}..z5r{down}..z6r{left}
+%	fill z1l{right}..z2l{down}..z7r{dir(180+alpha)}
+%		..z7l{dir(-alpha)}..z5r{down}..z6r{left}
+%		..z6l{right}..tension t..z5l{up}
+%		..tension t..z3l{left}..z4l{left}
+%		..z4r{right}..z3r{right}..tension t..z2r{up}
+%		..tension t..z1r{left}..cycle;
+	fill z1l{right}..tension t..z2l{down}..z7r{dir(180+alpha)}
+		..z7l{dir(-alpha)}..z5r{down}..tension t..z6r{left}
 		..z6l{right}..tension t..z5l{up}
 		..tension t..z3l{left}..z4l{left}
 		..z4r{right}..z3r{right}..tension t..z2r{up}
 		..tension t..z1r{left}..cycle;
-	draw_flare(z1l,180,90,hair,norm);
-	draw_flare(z6r,180,-90,hair,norm+hair);
+	draw_flare(z1l,180,90,hair,thick);
+	draw_flare(z6r,180,-90,hair,thick+hair);
 fet_endchar;
 
 fet_beginchar("Numeral 4", "4", "four")
-	set_char_box(0, 3/2thick#+6thin#, 0, height#);
+	set_char_box(0, 4/5height#, 0, height#);
 	message "w:"&decimal w;
 	message "h:"&decimal h;
 
@@ -223,14 +235,14 @@ fet_beginchar("Numeral 4", "4", "four")
 fet_endchar;
 
 fet_beginchar("Numeral 5", "5", "five")
-	set_char_box(0, 2thick#+thin#+hair#, 0, height#);
+	set_char_box(0, 7/10height#, 0, height#);
 	message "w:"&decimal w;
 	message "h:"&decimal h;
 	calc_kuulleke(w-thin,0);
 	z1=(w/2+thin/2,h);
 	save alpha; alpha=0;
 	penpos5(thin,0);
-	z5l=(x1l,h-norm);
+	z5l=(x1l,h-thick);
 	penpos6(hair,90-45);
 	z6=z5r+1/2hair*dir(-45);
 	penpos7(thin,0);
@@ -240,21 +252,25 @@ fet_beginchar("Numeral 5", "5", "five")
 	fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l
 		..z3r{dir(-135)}..{left}z6r..z6l{down}..z7r{down}
 		..z7l{up}..{up}z2l..cycle;
-	penpos8(hair,90);
-	z8=z7r;
-        penpos9(hair,90);
-	z9l=(x11,y7+thin);
-	penpos10(norm,0);
+	penpos8(thin,90);
+	z8l=z7r;
+	penpos9(hair,90);
+	z9l=(x11,y7+thin+hair);
+	penpos10(thick,0);
 	z10r=(w,1/2[y9r,y11r]);
 	penpos11(hair,-90);
-        z11r=(norm+hair,0);
+        z11r=(thick+hair,0);
 	penlabels(8,9,10,11);
 	save beta; beta=45;
 	save t; t=0.833;
-	fill z8r{dir(beta)}..z9r{right}..z10r{down}..z11r{left}
+%	fill z8r{dir(beta)}..z9r{right}..z10r{down}..z11r{left}
+%		..z11l{right}..tension t..z10l{up}..tension t
+%		..z9l{left}..z8l{dir(180+beta)}..cycle;
+	fill z8r{dir(beta)}..z9r{right}..tension t..z10r{down}
+		..tension t..z11r{left}
 		..z11l{right}..tension t..z10l{up}..tension t
 		..z9l{left}..z8l{dir(180+beta)}..cycle;
-	draw_flare(z11r,180,-90,hair,norm+hair);
+	draw_flare(z11r,180,-90,hair,thick+hair);
 fet_endchar;
 
 fet_beginchar("Numeral 6", "6", "six")
@@ -262,7 +278,7 @@ fet_beginchar("Numeral 6", "6", "six")
 fet_endchar;
 
 fet_beginchar("Numeral 7", "7", "seven")
-	set_char_box(0, 5/2thick#+thin#, 0, height#);
+	set_char_box(0, 11/15height#, 0, height#);
 	message "w:"&decimal w;
 	message "h:"&decimal h;
 
@@ -298,8 +314,8 @@ fi
 	z1=(3/2thin,h-(thick+thin)/2);
 	penpos3(thin,90+beta);
 	z3=(w,h)+(1/2sqrt(2)*thin)*dir(-135);
-	penpos2(norm,90+alpha);
-	x2-x1=x3-x2; y2=h-thick/2;
+	penpos2(thick-hair,90+alpha);
+	x2-x1=x3-x2; y2=h-thick/2-hair;
 
 	penpos4(thin,0);
 	z4l=(0,h-thin/2);
@@ -317,7 +333,7 @@ fi
 fet_endchar;
 
 fet_beginchar("Numeral 8", "8", "eight")
-	set_char_box(0, 2thick#+3thin#, 0, height#);
+	set_char_box(0, 11/15height#, 0, height#);
 	message "w:"&decimal w;
 	message "h:"&decimal h;
 	save alpha; alpha=60;
@@ -329,9 +345,9 @@ fet_beginchar("Numeral 8", "8", "eight")
 	z3l=(0,h/4+thin/2);
 	penpos4(hair,90);
 	z4l=(x1,0);
-	penpos5(norm,90+90+alpha);
+	penpos5(thick,90+90+alpha);
 	z5=z1+w/4*dir(alpha-90);
-	penpos6(norm,90+90+alpha);
+	penpos6(thick,90+90+alpha);
 	z6=z1+w/4*dir(90+alpha);
 	penpos7(hair,90);
 	z7r=(x1,h);
diff --git a/mf/feta-nummer10.mf b/mf/feta-nummer10.mf
index ce26044b60..73d46c94ee 100644
--- a/mf/feta-nummer10.mf
+++ b/mf/feta-nummer10.mf
@@ -11,10 +11,7 @@ test:=0;
 input feta-macros;
 
 height#:=designsize;
-%thick#:=height#/4;
-thick#:=8/30height#;
-%norm#:=3/4thick#;
-norm#:=7/8thick#;
+thick#:=7/30height#;
 thin#:=thick#/4;
 hair#:=thin#/2;
 kuulleke#:=hair#;
diff --git a/mf/feta-nummer8.mf b/mf/feta-nummer8.mf
index 13526a5be1..d1f2caa70b 100644
--- a/mf/feta-nummer8.mf
+++ b/mf/feta-nummer8.mf
@@ -12,10 +12,7 @@ input feta-macros;
 
 % copied from 10; will it work?
 height#:=designsize;
-%thick#:=height#/4;
-thick#:=8/30height#;
-%norm#:=3/4thick#;
-norm#:=7/8thick#;
+thick#:=7/30height#;
 thin#:=thick#/4;
 hair#:=thin#/2;
 kuulleke#:=hair#;
diff --git a/mf/feta-test20.mf b/mf/feta-test20.mf
new file mode 100644
index 0000000000..4c1a4f80b7
--- /dev/null
+++ b/mf/feta-test20.mf
@@ -0,0 +1,24 @@
+% feta-test20
+% part of LilyPond's pretty-but-neat music font
+
+% font_identifier:="font-en-tja20";
+% font_size 20pt#;
+
+input autometric;
+fet_beginfont("feta-test", 20);
+staffsize#:=20pt#;
+test:=1;
+
+% smoked cheese
+% test := -1;
+
+
+% dem piksels.
+%test := 1;
+
+input feta-generic;
+
+fet_endfont("font-en-tja");
+
+end.
+
diff --git a/tex/feta16.tex b/tex/feta16.tex
index 05127640c1..d92e58bc63 100644
--- a/tex/feta16.tex
+++ b/tex/feta16.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Nov 24 00:16:56 1997
+% on Wed Dec  3 01:03:55 1997
 % Do not edit
 % input from out/feta16.log
 % name
diff --git a/tex/feta20.tex b/tex/feta20.tex
index f6da6f4cfa..4b079aaa1c 100644
--- a/tex/feta20.tex
+++ b/tex/feta20.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Nov 24 00:16:57 1997
+% on Wed Dec  3 01:04:18 1997
 % Do not edit
 % input from out/feta20.log
 % name
diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index f3d5ccba99..3c6a616b02 100644
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -28,12 +28,13 @@
         {\vetfont\char\count0}}}
 
 % stacked numbers; overrules def in lilyponddefs
+% widest num should be .4 balkheight
 % oeps: \meter 12/8;
 \def\generalmeter#1#2{%
         \vbox to 0pt{\vss%
-        \hbox to0.42\balkheight{\hss\fetanummer #1\hss}%
+        \hbox to0.45\balkheight{\hfill\fetanummer #1\hfill}%
         \nointerlineskip%
-        \hbox to0.42\balkheight{\hss\fetanummer #2\hss}%
+        \hbox to0.45\balkheight{\hfill\fetanummer #2\hfill}%
         \vss}}
 
 \newcount\embedcount\embedcount=0
-- 
2.39.5