From d81a4f9307fd2e80a943f3799f015f555768e787 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 24 Sep 1997 11:34:21 +0200
Subject: [PATCH] patch::: 0.1.16.jcn2: rust

- 8-128 rests

pl 16.jcn1
---
 NEWS                  |   3 +
 VERSION               |   2 +-
 init/dyn10.ly         |   2 +-
 init/font-en-tja16.ly |  13 +++-
 init/font-en-tja20.ly |  13 +++-
 input/font.ly         |   4 +-
 mf/Makefile           |   4 +-
 mf/eindelijk.mf       | 175 ++++++++++++++++++++++++++++++++++++++++++
 mf/font-en-tja16.mf   |   1 +
 mf/font-en-tja20.mf   |   1 +
 tex/taupindefs.tex    |   8 +-
 11 files changed, 210 insertions(+), 16 deletions(-)
 create mode 100644 mf/eindelijk.mf

diff --git a/NEWS b/NEWS
index 4525d720a2..a7d1e77cd4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
 pl 16.jcn2
+	- 8-128 rests
+
+pl 16.jcn1
 	- mf-to-table.in: generate mozarella metric info tables
 	- autometric.mf: write metric info to mf logfile
 	- ital-r.mf, smaller ital-m.mf
diff --git a/VERSION b/VERSION
index 93127672d7..be1ba52802 100644
--- a/VERSION
+++ b/VERSION
@@ -3,4 +3,4 @@ TOPLEVEL_MINOR_VERSION = 1
 TOPLEVEL_PATCH_LEVEL = 16
 
 # use to send patches, always empty for released version:
-TOPLEVEL_MY_PATCH_LEVEL = .jcn1
+TOPLEVEL_MY_PATCH_LEVEL = .jcn2
diff --git a/init/dyn10.ly b/init/dyn10.ly
index 6819259da4..78f4e3b7e9 100644
--- a/init/dyn10.ly
+++ b/init/dyn10.ly
@@ -1,4 +1,4 @@
-% generated at Mon Sep 22 21:28:05 1997 from out/dyn10.log
+% generated at Wed Sep 24 02:26:26 1997 from out/dyn10.log
 % changes will be lost
 % dyn=\symboltables {
 	%  } % dyn
diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly
index 906985ce02..48655cbee9 100644
--- a/init/font-en-tja16.ly
+++ b/init/font-en-tja16.ly
@@ -1,11 +1,18 @@
-% generated at Mon Sep 22 22:26:51 1997 from out/font-en-tja16.log
+% generated at Wed Sep 24 02:26:34 1997 from out/font-en-tja16.log
 % changes will be lost
 % font-en-tja=\symboltables {
 	"balls" = \table {
 		"0"	"\wholeball"	0.00\pt	8.64\pt	4.80\pt	0.00\pt
-		"1"	"\halfball"	0.00\pt	5.97\pt	4.80\pt	0.00\pt
-		"2"	"\quartball"	0.00\pt	5.88\pt	4.80\pt	0.00\pt
+		"1"	"\halfball"	0.00\pt	6.01\pt	4.80\pt	0.00\pt
+		"2"	"\quartball"	0.00\pt	5.76\pt	4.80\pt	0.00\pt
 		"-1"	"\breveball"	0.00\pt	9.60\pt	4.80\pt	0.00\pt
 		"-2"	"\longaball"	0.00\pt	9.60\pt	4.80\pt	0.00\pt
 		}
+	"almostrests" = \table {
+		"-2"	"\eighthrest"	0.00\pt	4.40\pt	6.60\pt	0.00\pt
+		"-2"	"\sixteenthrest"	0.00\pt	4.40\pt	10.27\pt	0.00\pt
+		"-2"	"\thirtysecondrest"	0.00\pt	4.40\pt	13.93\pt	0.00\pt
+		"-2"	"\sixtyfourthrest"	0.00\pt	4.40\pt	17.60\pt	0.00\pt
+		"-2"	"\hundredtwentyeighthrest"	0.00\pt	4.40\pt	21.27\pt	0.00\pt
+		}
 	%  } % font-en-tja
diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly
index c5e308b694..4b55a59965 100644
--- a/init/font-en-tja20.ly
+++ b/init/font-en-tja20.ly
@@ -1,11 +1,18 @@
-% generated at Mon Sep 22 22:28:11 1997 from out/font-en-tja20.log
+% generated at Wed Sep 24 02:26:42 1997 from out/font-en-tja20.log
 % changes will be lost
 % font-en-tja=\symboltables {
 	"balls" = \table {
 		"0"	"\wholeball"	0.00\pt	10.44\pt	5.80\pt	0.00\pt
-		"1"	"\halfball"	0.00\pt	7.21\pt	5.80\pt	0.00\pt
-		"2"	"\quartball"	0.00\pt	7.10\pt	5.80\pt	0.00\pt
+		"1"	"\halfball"	0.00\pt	7.26\pt	5.80\pt	0.00\pt
+		"2"	"\quartball"	0.00\pt	6.97\pt	5.80\pt	0.00\pt
 		"-1"	"\breveball"	0.00\pt	11.60\pt	5.80\pt	0.00\pt
 		"-2"	"\longaball"	0.00\pt	11.60\pt	5.80\pt	0.00\pt
 		}
+	"almostrests" = \table {
+		"-2"	"\eighthrest"	0.00\pt	5.40\pt	8.10\pt	0.00\pt
+		"-2"	"\sixteenthrest"	0.00\pt	5.40\pt	12.60\pt	0.00\pt
+		"-2"	"\thirtysecondrest"	0.00\pt	5.40\pt	17.10\pt	0.00\pt
+		"-2"	"\sixtyfourthrest"	0.00\pt	5.40\pt	21.60\pt	0.00\pt
+		"-2"	"\hundredtwentyeighthrest"	0.00\pt	5.40\pt	26.10\pt	0.00\pt
+		}
 	%  } % font-en-tja
diff --git a/input/font.ly b/input/font.ly
index 4e3a499da1..afda043a58 100644
--- a/input/font.ly
+++ b/input/font.ly
@@ -10,8 +10,8 @@ TestedFeatures	font-en-tja
 	\melodic{ 
 		\octave c';
 		\meter 4/4;
-		% \longa
-		% \breve % \brevis
+		a\longa
+		a\breve
 		c1 g c' a'
 		c2 g c' a'
 		c4 g c' a'
diff --git a/mf/Makefile b/mf/Makefile
index 556d777dd7..2a318c4c73 100644
--- a/mf/Makefile
+++ b/mf/Makefile
@@ -44,8 +44,8 @@ localuninstall:
 # dependencies:
 #
 $(tableout)/dyn10.ly: autometric.mf ital-f.mf ital-m.mf ital-p.mf ital-r.mf ital-s.mf ital-z.mf dyn10.mf
-$(tableout)/font-en-tja16.ly: autometric.mf bolletjes.mf font-en-tja16.mf
-$(tableout)/font-en-tja20.ly: autometric.mf bolletjes.mf font-en-tja20.mf
+$(tableout)/font-en-tja16.ly: autometric.mf bolletjes.mf eindelijk.mf font-en-tja16.mf
+$(tableout)/font-en-tja20.ly: autometric.mf bolletjes.mf eindelijk.mf font-en-tja20.mf
 #
 
 
diff --git a/mf/eindelijk.mf b/mf/eindelijk.mf
new file mode 100644
index 0000000000..eb5cb06e58
--- /dev/null
+++ b/mf/eindelijk.mf
@@ -0,0 +1,175 @@
+% eindelijk.mf
+% LilyPond's own rest(s)
+
+
+interline#:=staffsize#/(stafflines-1)+stafflinethickness#;
+% ugh
+define_pixels(interline);
+nhh#:=interline#;
+nhw#:=6/5*interline#;
+define_pixels(nhh,nhw);
+
+
+if false:
+beginchar(62, 0, 4nhh#, 0); "quarter rest";
+%  rthin:= 1/8 nhh;           % .1
+%  rthick:= 2 thick+rthin;    %       .2
+  alpha:= -50;               %    .3
+  penpos1(rthin, 90+alpha);  % .4
+  penpos5(rthin, alpha);     %       .5,10
+  penpos2(rthick, alpha);    %   .6
+  penpos4(rthick, alpha);    %
+  penpos3(3/4rthick, alpha); %       .7
+  penpos6(4/3thick, alpha);
+  penpos7(rthin, 45);
+  y1l = 4nhh - 1/2nhh;
+  x1l = 1/2nhh;
+  z2r = z1 +(nhh* right) rotated alpha;
+  z3  = 1/2[z2,z4];
+  z4  = (nhw,4nhh) scaled .55;
+  z5  = z4l+(nhh* right) rotated alpha;
+  x6l = x4l; y6r = 1.45nhh;
+  x7  = .9nhw; y7= nhh-1/8nhh;
+  z10 = z5r shifted (sqrt(2)*rthin/4,sqrt(2)*rthin/4);
+
+  pickup penrazor scaled rthin rotated 45;
+  draw z1--z2r; draw z4l--z10;
+  penstroke z2e..z3e..z4e;
+  penstroke z5e..z6e..z7e;
+  penlabels(1,2,3,4,5,6,7,10);
+  shift_pic (-.2nhw, 0);
+endchar;
+
+fi
+
+
+rthin:=1/8interline;
+rthick:=2rthin;
+
+med#:=1/33designsize;
+thick#:=1/16designsize;
+define_blacker_pixels(med);
+pen med_pen;
+med_pen:= pencircle scaled med;
+
+def shift_pic (expr pone, ptwo) =
+  currentpicture:=currentpicture shifted (round(pone),round(ptwo))
+enddef;
+
+fet_begingroup("almostrests");
+
+stem#:=interline#/8;
+flare#:=interline#/2;
+define_pixels(stem,flare);
+
+def crook(expr a,w) =
+	begingroup;
+	save x,y;
+	penpos1(flare/2,-90);
+	penpos2(flare/2,0);
+	penpos3(flare/2,90);
+	penpos4(flare/2,180);
+	x4r=xpart a-w; y3r=ypart a+flare/4;
+	x1l=x2l=x3l=x4l;
+	y1l=y2l=y3l=y4l;
+	penpos5(stem,250);
+	x5=x4r+9/8flare; y5r=y1r;
+	penpos6(stem,260);
+	x6l=xpart a; y6l=ypart a;
+	penstroke z1e..z2e..z3e..z4e..z1e..z5e{right}..z6e;
+	penlabels(1,2,3,4,5,6);
+	endgroup;
+	enddef;
+
+def brush(expr a,w,b,v) =
+	begingroup;
+	save x,y;
+	z1=a; z2=b;
+	penpos3(w,angle(z2-z1)+90);
+	penpos4(w,angle(z2-z1));
+	penpos5(v,angle(z1-z2)+90);
+	penpos6(v,angle(z1-z2));
+	x3=x4=x1; y3=y4=y1;
+	x5=x6=x2; y5=y6=y2;
+	fill z3r{z1-z2}..z4l..{z2-z1}z3l..z5r{z2-z1}..z6l..{z1-z2}z5l..cycle;
+	penlabels(1,2,3,4,5,6);
+	endgroup;
+	enddef;
+
+fet_beginchar(incr code,interline#,1.5interline#,0,"Eighth rest","-2","eighthrest");
+	save x,y;
+	x1=w-stem/6; y1=h-flare/4;
+	crook (z1,w-stem/6);
+	z2-z1=whatever*dir70;
+	y2=stem/2;
+	brush (z1,stem/3,z2,stem);
+	endchar;
+
+fet_beginchar(incr code,interline#,1.5interline#+5/3flare#,0,"Sixteenth rest","-2","sixteenthrest");
+	save x,y;
+	x1=w-stem/6; y1=h-flare/4;
+	crook (z1,7/8w);
+	z3-z1=whatever*dir74;
+	y3=y1-5/3flare;
+	crook (z3,7/8w);
+	z2-z1=whatever*dir74;
+	y2=stem/2;
+	brush (z1,stem/3,z2,stem);
+	endchar;
+
+fet_beginchar(incr code,interline#,1.5interline#+10/3flare#,0,"Thirtysecond rest","-2","thirtysecondrest");
+	save x,y;
+	x1=w-stem/6; y1=h-flare/4;
+	z2-z1=whatever*dir76;
+	y2=stem/2;
+	brush (z1,stem/3,z2,stem);
+	crook (z1,7/8w);
+	z3-z1=whatever*dir76;
+	y3=y1-5/3flare;
+	crook (z3,7/8w);
+	z4-z1=whatever*dir76;
+	y4=y1-10/3flare;
+	crook (z4,7/8w);
+	endchar;
+
+fet_beginchar(incr code,interline#,1.5interline#+15/3flare#,0,"Sixtyfourth rest","-2","sixtyfourthrest");
+	save x,y;
+	x1=w-stem/6; y1=h-flare/4;
+	z2-z1=whatever*dir78;
+	y2=stem/2;
+	brush (z1,stem/3,z2,stem);
+	crook (z1,7/8w);
+	z3-z1=whatever*dir78;
+	y3=y1-5/3flare;
+	crook (z3,7/8w);
+	z4-z1=whatever*dir78;
+	y4=y1-10/3flare;
+	crook (z4,7/8w);
+	z5-z1=whatever*dir78;
+	y5=y1-15/3flare;
+	crook (z5,7/8w);
+	endchar;
+
+fet_beginchar(incr code,interline#,1.5interline#+20/3flare#,0,"Hundredtwentyeighth rest","-2","hundredtwentyeighthrest");
+	save x,y;
+	x1=w-stem/6; y1=h-flare/4;
+	z2-z1=whatever*dir80;
+	y2=stem/2;
+	brush (z1,stem/3,z2,stem);
+	crook (z1,7/8w);
+	z3-z1=whatever*dir80;
+	y3=y1-5/3flare;
+	crook (z3,7/8w);
+	z4-z1=whatever*dir80;
+	y4=y1-10/3flare;
+	crook (z4,7/8w);
+	z5-z1=whatever*dir80;
+	y5=y1-15/3flare;
+	crook (z5,7/8w);
+	z6-z1=whatever*dir80;
+	y6=y1-20/3flare;
+	crook (z6,7/8w);
+	endchar;
+
+fet_endgroup("rests");
+
diff --git a/mf/font-en-tja16.mf b/mf/font-en-tja16.mf
index aa75cc4d16..c4bec4c8b9 100644
--- a/mf/font-en-tja16.mf
+++ b/mf/font-en-tja16.mf
@@ -17,6 +17,7 @@ stafflinethickness#:=0.4pt#;
 code:=-1;
 
 input bolletjes;
+input eindelijk;
 
 fet_endfont("font-en-tja");
 
diff --git a/mf/font-en-tja20.mf b/mf/font-en-tja20.mf
index f7dcf17232..f58aedfb62 100644
--- a/mf/font-en-tja20.mf
+++ b/mf/font-en-tja20.mf
@@ -15,6 +15,7 @@ stafflinethickness#:=0.4pt#;
 code:=-1;
 
 input bolletjes;
+input eindelijk;
 
 fet_endfont("font-en-tja");
 
diff --git a/tex/taupindefs.tex b/tex/taupindefs.tex
index e7f24df6f9..bd08318c06 100644
--- a/tex/taupindefs.tex
+++ b/tex/taupindefs.tex
@@ -45,13 +45,13 @@
 % \musicdef\quartball{'007}
 % \musicdef\halfball{'010}
 % \musicdef\wholeball{'011}
-\musicdef\breveball{'040}
-\musicdef\longaball{'047}
+% \musicdef\breveball{'040}
+% \musicdef\longaball{'047}
 \fetdef\quartball{'002}
 \fetdef\halfball{'001}
 \fetdef\wholeball{'000}
-% \fetdef\breveball{'003}
-% \fetdef\longaball{'004}
+\fetdef\breveball{'003}
+\fetdef\longaball{'004}
 \musicdef\halfrest{'074}
 \musicdef\wholerest{'075}
 \musicdef\breverest{'072}
-- 
2.39.5