lilypond-0.1.21

diff --git a/mf/autometric.mf b/mf/autometric.mf
index 9912d70d59e1af77295c828d7c07042c13560653..cd924a3aab9412d644e4869020c1c067df0f84d9 100644 (file)
--- a/mf/autometric.mf
+++ b/mf/autometric.mf
@@ -74,6 +74,8 @@ def no_dimen_beginchar(expr c) =
        scantokens extra_beginchar;
 enddef;
 
+code:=-1;
+
 % starts just as plain mf's beginchar:
 %     charcode, 
 % and then adds:

diff --git a/mf/feta-params.mf b/mf/feta-params.mf
index ea95ec352339fc56be6c34da166b136f0ececbc6..51ec99126a05757b12d1c37c54577986e10a25f4 100644 (file)
--- a/mf/feta-params.mf
+++ b/mf/feta-params.mf
@@ -1,4 +1,6 @@
 
+stafflines = 5;
+
 interline#:=staffsize#/(stafflines-1);
 
 %

diff --git a/mf/font-en-tja16.mf b/mf/font-en-tja16.mf
index 80ccfadeec197b758159fa9afaccac70b13e795d..2749d8d55771f4055859cb1cb21ef02959de7bc9 100644 (file)
--- a/mf/font-en-tja16.mf
+++ b/mf/font-en-tja16.mf
@@ -10,8 +10,6 @@ fet_beginfont("font-en-tja", 16);
 mode_setup;
 
 staffsize#:=16pt#;
-stafflines:=5;
-code:=-1;
 
 input feta-generic;
 

diff --git a/mf/font-en-tja20.mf b/mf/font-en-tja20.mf
index c7e35a13ed98dc51e3d38937e29f43a7d0f3c73b..7255d9f87287145eac8a5d22789c099e26c83ef0 100644 (file)
--- a/mf/font-en-tja20.mf
+++ b/mf/font-en-tja20.mf
@@ -7,9 +7,6 @@ input autometric;
 fet_beginfont("font-en-tja", 20);
 
 staffsize#:=20pt#;
-stafflines:=5;
-stafflinethickness#:=0.4pt#;
-code:=-1;
 
 input feta-generic;
 

diff --git a/mf/vette-beams16.mf b/mf/vette-beams16.mf
index 48921a25c233af915d469edc8043be9ee8c32efe..5162c158531963f3a078935309f954d25812d4cb 100644 (file)
--- a/mf/vette-beams16.mf
+++ b/mf/vette-beams16.mf
@@ -7,12 +7,7 @@ font_identifier:="vette-beams16";
 font_size 16;
 mode_setup;
 
-test:=0;
-
 staffsize#:=16pt#;
-stafflines:=5;
-stafflinethickness#:=0.4pt#;
-input generic-params;
 input wat-zie-ik;
 end.
 

diff --git a/mf/vette-beams20.mf b/mf/vette-beams20.mf
index 49f4ffd54733571e91828254c840846fde487fb8..af183f260c10370336b0f8a7b08049faeb46e880 100644 (file)
--- a/mf/vette-beams20.mf
+++ b/mf/vette-beams20.mf
@@ -8,11 +8,7 @@ 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
index 507d377496f80eb5e8cc806aa893931c149fd6e3..8bcdf19bc8ee190ee918a5cc509f4f2b313297b5 100644 (file)
--- a/mf/wat-zie-ik.mf
+++ b/mf/wat-zie-ik.mf
@@ -2,24 +2,21 @@
 % part of LilyPond's pretty-but-neat music font
 % beams: plat en steil
 
-%\tracingequations:= tracingonline := 1;
-
+input feta-params;
 
 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: