From 91920dd101faa53c9ec6870b477bbe3c7ed1961a Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:59:57 +0000 Subject: [PATCH] lilypond-0.1.21 --- mf/autometric.mf | 2 ++ mf/feta-params.mf | 2 ++ mf/font-en-tja16.mf | 2 -- mf/font-en-tja20.mf | 3 --- mf/vette-beams16.mf | 5 ----- mf/vette-beams20.mf | 6 +----- mf/wat-zie-ik.mf | 7 ++----- 7 files changed, 7 insertions(+), 20 deletions(-) diff --git a/mf/autometric.mf b/mf/autometric.mf index 9912d70d59..cd924a3aab 100644 --- 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 ea95ec3523..51ec99126a 100644 --- 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 80ccfadeec..2749d8d557 100644 --- 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 c7e35a13ed..7255d9f872 100644 --- 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 48921a25c2..5162c15853 100644 --- 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 49f4ffd547..af183f260c 100644 --- 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 507d377496..8bcdf19bc8 100644 --- 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: -- 2.39.5