From 5fb43cd2eeaacc81d55966ae4c9bf8cb5b0f67dd Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:58:55 +0000
Subject: [PATCH] lilypond-0.1.18

---
 input/font.ly        | 11 ++++++++---
 mf/generic-params.mf |  9 +++++++++
 mf/generic-tja.mf    | 25 +++++++++++++++++++++++++
 mf/vette-beams20.mf  | 18 ++++++++++++++++++
 mf/wat-zie-ik.mf     | 32 ++++++++++++++++++++++++++++++++
 tex/lilyponddefs.tex |  6 ++++--
 6 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 mf/generic-params.mf
 create mode 100644 mf/generic-tja.mf
 create mode 100644 mf/vette-beams20.mf
 create mode 100644 mf/wat-zie-ik.mf

diff --git a/input/font.ly b/input/font.ly
index 4e3a499da1..4f659db61e 100644
--- a/input/font.ly
+++ b/input/font.ly
@@ -10,13 +10,18 @@ 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'
 		a\ppp a\pp a\p a\mp a\mf a\f a\ff a\fff
-		a\fp a\sf a\sfz % a\fz a\rf
+		a\fp a\sf a\sfz a % a\fz a\rf
+		[c8 c] [a' a']
+%		[c a'] [a' c]
+		[c d e f] [a' g' f' e']
+		[cis' dis' c' d'] [cisis' disis' ceses' deses']
+		  r1 r2 r4 r8 r16 r32 r64 r128
 	}
 	\paper{ 
 	    \paper_twenty
diff --git a/mf/generic-params.mf b/mf/generic-params.mf
new file mode 100644
index 0000000000..1e8053dc14
--- /dev/null
+++ b/mf/generic-params.mf
@@ -0,0 +1,9 @@
+
+interline#:=staffsize#/(stafflines-1);
+  
+        %  [D.K.Roush & J.S.Gourlay] say this should be 0.072
+        % We know better
+stafflinethickness#:=0.1 interline#;
+
+define_pixels(interline);
+define_pixels(stafflinethickness);
diff --git a/mf/generic-tja.mf b/mf/generic-tja.mf
new file mode 100644
index 0000000000..9d0dc58794
--- /dev/null
+++ b/mf/generic-tja.mf
@@ -0,0 +1,25 @@
+
+
+% better versions of Taupin/Egler savepic cmds
+%
+%
+picture save_picture_stack[];
+numeric stack_idx;
+stack_idx := 0;
+
+def push_picture(expr p) = save_picture_stack[incr stack_idx] := p enddef;
+def push_current = push_picture (currentpicture) enddef;
+def pop_picture =  save_picture_stack[ decr stack_idx] enddef;
+def top_picture = save_picture_stack[stack_idx] enddef;
+
+
+def scaledabout(expr point, scale) =
+	shifted -point scaled scale shifted point
+enddef;
+
+
+input generic-params;
+input bolletjes;
+input eindelijk;
+input toevallig;
+
diff --git a/mf/vette-beams20.mf b/mf/vette-beams20.mf
new file mode 100644
index 0000000000..49f4ffd547
--- /dev/null
+++ b/mf/vette-beams20.mf
@@ -0,0 +1,18 @@
+% font-en-tja16.mf
+% part of LilyPond's pretty-but-neat music font
+
+% font_identifier:="font-en-tja16";
+% font_size 16pt#;
+
+font_identifier:="vette-beams16";
+font_size 20;
+mode_setup;
+
+test:=0;
+
+staffsize#:=20pt#;
+stafflines:=5;
+stafflinethickness#:=0.4pt#;
+input generic-params;
+input wat-zie-ik;
+end.
diff --git a/mf/wat-zie-ik.mf b/mf/wat-zie-ik.mf
new file mode 100644
index 0000000000..507d377496
--- /dev/null
+++ b/mf/wat-zie-ik.mf
@@ -0,0 +1,32 @@
+% wat-zie-ik.mf
+% part of LilyPond's pretty-but-neat music font
+% beams: plat en steil
+
+%\tracingequations:= tracingonline := 1;
+
+
+beamheight#:=0.48interline#;
+define_pixels(beamheight);
+
+pen beam_pen;
+beam_pen:=penrazor scaled beamheight rotated 90;
+
+% mimic taupin-SLOPES for now -- because lily knows them
+ELEM_TAN:=0.05;
+SLOPES:=20;
+LENGTHS:=6;
+ELEM_FACTOR := 2;
+ELEM_INITIAL_LEN:=2;
+
+
+% Beamslopes up
+for i := -SLOPES upto SLOPES:
+	width:= ELEM_INITIAL_LEN;
+	for j:=1 upto LENGTHS:
+		beginchar(128 + i * LENGTHS + j -1 ,width,0,0);
+			pickup beam_pen;
+			draw origin--(lft w,w*i*ELEM_TAN);
+			endchar;
+		width:=ELEM_FACTOR *width;
+		endfor;
+	endfor;
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 20986c443f..319d45f2f7 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -66,7 +66,6 @@
         \balkheight=20pt
         \notewidth=7.15pt
         \noteheight=5pt
-        \staffrulethickness=0.4pt
         \musixtwentyfonts
         \font\textmusic=cmmi12
         \musixcalc
@@ -74,7 +73,6 @@
 
 \def\musixsixteendefs{
         \balkheight=16pt
-        \staffrulethickness=0.4pt
         \notewidth=5.93pt
         \noteheight=4pt
         \musixsixteenfonts
@@ -97,6 +95,10 @@
         \smallspace=.3\interlinedist
         \interstaffrule=\balkheight
         \divide\interstaffrule by 4
+
+        %  [D.K.Roush & J.S.Gourlay] say this should be 0.072
+        % We know better
+        \staffrulethickness=0.1\interlinedist
 }
 
 
-- 
2.39.5