From: Han-Wen Nienhuys Date: Sun, 4 Apr 2004 13:48:22 +0000 (+0000) Subject: * mf/feta-beugel.mf: set design to 10 (constant). X-Git-Tag: release/2.3.0~102 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8396e5ee9ce1ac31c11088624480afe6ffca274b;p=lilypond.git * mf/feta-beugel.mf: set design to 10 (constant). * mf/feta-braces-a.mf: rename to stress that it's not design size. --- diff --git a/ChangeLog b/ChangeLog index 6840cd22db..27453a68d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-04-04 Han-Wen Nienhuys + + * mf/feta-beugel.mf: set design to 10 (constant). + + * mf/feta-braces-a.mf: rename to stress that it's not design size. + 2004-04-04 Werner Lemberg * Documentation/user/tutorial.itely: Revised (continued). diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 4df0a88138..67f3b951c1 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -10,7 +10,7 @@ EXTRA_DIST_FILES += README feta.tex # We don't use $(MF_FILES), because there's more .mf cruft here FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\ - $(wildcard feta-braces*[0-9].mf)\ + $(wildcard feta-braces-[a-z].mf)\ $(wildcard feta-din*[0-9].mf)\ $(wildcard feta-nummer*[0-9].mf)\ $(wildcard parmesan[0-9]*.mf) diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf index 8ab96f18c6..0f32d9d40e 100644 --- a/mf/feta-beugel.mf +++ b/mf/feta-beugel.mf @@ -3,17 +3,27 @@ input feta-autometric; input feta-macros; -staffsize# := 20 pt#; %% arbitrary. +staffsize# := 20 pt#; %% arbitrary. input feta-params; font_coding_scheme "feta braces"; + +def abc_encode_int (expr i) = + if i > 0: + abc_encode_int(i div 26)&char(65 + i mod 26) + else: + "A" + fi +enddef ; + % we set the designsize arbitrarily at 10 -% if the * 10 is left out, pktrace gets confused over the proper magnification, -% and makes it too large. -fet_beginfont("feta-braces", font_count * 10); + +design_size := 10; + +fet_beginfont("feta-braces-" &char(97 + font_count), design_size); mode_setup; @@ -23,14 +33,6 @@ save code; code := -1; -def abc_encode_int (expr i) = - if i > 0: - abc_encode_int(i div 26)&char(65 + i mod 26) - else: - "A" - fi -enddef ; - def draw_brace (expr height_sharp, width_sharp, slt_sharp) = save pendir, height, width, thin, thick, slt; diff --git a/mf/feta-braces-a.mf b/mf/feta-braces-a.mf new file mode 100644 index 0000000000..7044ac5a89 --- /dev/null +++ b/mf/feta-braces-a.mf @@ -0,0 +1,11 @@ +% +% feta-braces0.mf -- 256 smallest braces +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2004 Han-Wen Nienhuys +% + +font_count := 0; +input feta-beugel; +end. diff --git a/mf/feta-braces-b.mf b/mf/feta-braces-b.mf new file mode 100644 index 0000000000..740f28d53d --- /dev/null +++ b/mf/feta-braces-b.mf @@ -0,0 +1,11 @@ +% +% feta-braces1.mf -- next 256 braces +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2004 Han-Wen Nienhuys +% + +font_count := 1; +input feta-beugel; +end. diff --git a/mf/feta-braces-c.mf b/mf/feta-braces-c.mf new file mode 100644 index 0000000000..e8ce7f28c8 --- /dev/null +++ b/mf/feta-braces-c.mf @@ -0,0 +1,11 @@ +% +% feta-braces2.mf -- next 256 braces +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2004 Han-Wen Nienhuys +% + +font_count := 2; +input feta-beugel; +end. diff --git a/mf/feta-braces-d.mf b/mf/feta-braces-d.mf new file mode 100644 index 0000000000..66d9a0bc39 --- /dev/null +++ b/mf/feta-braces-d.mf @@ -0,0 +1,11 @@ +% +% feta-braces3.mf -- next 256 braces +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2004 Han-Wen Nienhuys +% + +font_count := 3; +input feta-beugel; +end. diff --git a/mf/feta-braces-e.mf b/mf/feta-braces-e.mf new file mode 100644 index 0000000000..39c44f062f --- /dev/null +++ b/mf/feta-braces-e.mf @@ -0,0 +1,13 @@ +% +% feta-braces4.mf -- next 256 braces +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2004 Han-Wen Nienhuys +% + +font_count := 4; +input feta-beugel; +end. + + diff --git a/mf/feta-braces-f.mf b/mf/feta-braces-f.mf new file mode 100644 index 0000000000..d7ea284806 --- /dev/null +++ b/mf/feta-braces-f.mf @@ -0,0 +1,11 @@ +% +% feta-braces5.mf -- next 256 braces +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2004 Han-Wen Nienhuys +% + +font_count := 5; +input feta-beugel; +end. diff --git a/mf/feta-braces-g.mf b/mf/feta-braces-g.mf new file mode 100644 index 0000000000..3b0ab2a7db --- /dev/null +++ b/mf/feta-braces-g.mf @@ -0,0 +1,11 @@ +% +% feta-braces6.mf -- next 256 braces +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2004 Han-Wen Nienhuys +% + +font_count := 6; +input feta-beugel; +end. diff --git a/mf/feta-braces-h.mf b/mf/feta-braces-h.mf new file mode 100644 index 0000000000..61635b92bd --- /dev/null +++ b/mf/feta-braces-h.mf @@ -0,0 +1,11 @@ +% +% feta-braces6.mf -- next 256 braces +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2004 Han-Wen Nienhuys +% + +font_count := 7; +input feta-beugel; +end. diff --git a/mf/feta-braces-i.mf b/mf/feta-braces-i.mf new file mode 100644 index 0000000000..fb603a9b10 --- /dev/null +++ b/mf/feta-braces-i.mf @@ -0,0 +1,11 @@ +% +% feta-braces6.mf -- next 256 braces +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2004 Han-Wen Nienhuys +% + +font_count := 8; +input feta-beugel; +end. diff --git a/mf/feta-braces00.mf b/mf/feta-braces00.mf deleted file mode 100644 index 7044ac5a89..0000000000 --- a/mf/feta-braces00.mf +++ /dev/null @@ -1,11 +0,0 @@ -% -% feta-braces0.mf -- 256 smallest braces -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997--2004 Han-Wen Nienhuys -% - -font_count := 0; -input feta-beugel; -end. diff --git a/mf/feta-braces10.mf b/mf/feta-braces10.mf deleted file mode 100644 index 740f28d53d..0000000000 --- a/mf/feta-braces10.mf +++ /dev/null @@ -1,11 +0,0 @@ -% -% feta-braces1.mf -- next 256 braces -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997--2004 Han-Wen Nienhuys -% - -font_count := 1; -input feta-beugel; -end. diff --git a/mf/feta-braces20.mf b/mf/feta-braces20.mf deleted file mode 100644 index e8ce7f28c8..0000000000 --- a/mf/feta-braces20.mf +++ /dev/null @@ -1,11 +0,0 @@ -% -% feta-braces2.mf -- next 256 braces -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997--2004 Han-Wen Nienhuys -% - -font_count := 2; -input feta-beugel; -end. diff --git a/mf/feta-braces30.mf b/mf/feta-braces30.mf deleted file mode 100644 index 66d9a0bc39..0000000000 --- a/mf/feta-braces30.mf +++ /dev/null @@ -1,11 +0,0 @@ -% -% feta-braces3.mf -- next 256 braces -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997--2004 Han-Wen Nienhuys -% - -font_count := 3; -input feta-beugel; -end. diff --git a/mf/feta-braces40.mf b/mf/feta-braces40.mf deleted file mode 100644 index 39c44f062f..0000000000 --- a/mf/feta-braces40.mf +++ /dev/null @@ -1,13 +0,0 @@ -% -% feta-braces4.mf -- next 256 braces -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997--2004 Han-Wen Nienhuys -% - -font_count := 4; -input feta-beugel; -end. - - diff --git a/mf/feta-braces50.mf b/mf/feta-braces50.mf deleted file mode 100644 index d7ea284806..0000000000 --- a/mf/feta-braces50.mf +++ /dev/null @@ -1,11 +0,0 @@ -% -% feta-braces5.mf -- next 256 braces -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997--2004 Han-Wen Nienhuys -% - -font_count := 5; -input feta-beugel; -end. diff --git a/mf/feta-braces60.mf b/mf/feta-braces60.mf deleted file mode 100644 index 3b0ab2a7db..0000000000 --- a/mf/feta-braces60.mf +++ /dev/null @@ -1,11 +0,0 @@ -% -% feta-braces6.mf -- next 256 braces -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997--2004 Han-Wen Nienhuys -% - -font_count := 6; -input feta-beugel; -end. diff --git a/mf/feta-braces70.mf b/mf/feta-braces70.mf deleted file mode 100644 index 61635b92bd..0000000000 --- a/mf/feta-braces70.mf +++ /dev/null @@ -1,11 +0,0 @@ -% -% feta-braces6.mf -- next 256 braces -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997--2004 Han-Wen Nienhuys -% - -font_count := 7; -input feta-beugel; -end. diff --git a/mf/feta-braces80.mf b/mf/feta-braces80.mf deleted file mode 100644 index fb603a9b10..0000000000 --- a/mf/feta-braces80.mf +++ /dev/null @@ -1,11 +0,0 @@ -% -% feta-braces6.mf -- next 256 braces -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997--2004 Han-Wen Nienhuys -% - -font_count := 8; -input feta-beugel; -end.