* 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 6840cd22dbf95d57324526c094aa17246e75c25e..27453a68d685c89ad1917b8cbb027fb72ea6726f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-04  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * 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  <wl@gnu.org>
 
        * Documentation/user/tutorial.itely: Revised (continued).

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 4df0a88138901e7c414acb10c4d10abc91714ac6..67f3b951c1701a8e61a21d9968822aaf2cce21f8 100644 (file)
--- 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 8ab96f18c61ce34fdaa2db0c8cc535b9fa3daf5d..0f32d9d40ec7adc560876f6ff1c7de8ebc9d523f 100644 (file)
--- 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 (file)
index 0000000..7044ac5
--- /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 <hanwen@cs.uu.nl>
+% 
+
+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 (file)
index 0000000..740f28d
--- /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 <hanwen@cs.uu.nl>
+% 
+
+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 (file)
index 0000000..e8ce7f2
--- /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 <hanwen@cs.uu.nl>
+% 
+
+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 (file)
index 0000000..66d9a0b
--- /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 <hanwen@cs.uu.nl>
+% 
+
+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 (file)
index 0000000..39c44f0
--- /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 <hanwen@cs.uu.nl>
+% 
+
+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 (file)
index 0000000..d7ea284
--- /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 <hanwen@cs.uu.nl>
+% 
+
+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 (file)
index 0000000..3b0ab2a
--- /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 <hanwen@cs.uu.nl>
+% 
+
+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 (file)
index 0000000..61635b9
--- /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 <hanwen@cs.uu.nl>
+% 
+
+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 (file)
index 0000000..fb603a9
--- /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 <hanwen@cs.uu.nl>
+% 
+
+font_count := 8;
+input feta-beugel;
+end.

diff --git a/mf/feta-braces00.mf b/mf/feta-braces00.mf
deleted file mode 100644 (file)
index 7044ac5..0000000
--- 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 <hanwen@cs.uu.nl>
-% 
-
-font_count := 0;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces10.mf b/mf/feta-braces10.mf
deleted file mode 100644 (file)
index 740f28d..0000000
--- 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 <hanwen@cs.uu.nl>
-% 
-
-font_count := 1;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces20.mf b/mf/feta-braces20.mf
deleted file mode 100644 (file)
index e8ce7f2..0000000
--- 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 <hanwen@cs.uu.nl>
-% 
-
-font_count := 2;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces30.mf b/mf/feta-braces30.mf
deleted file mode 100644 (file)
index 66d9a0b..0000000
--- 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 <hanwen@cs.uu.nl>
-% 
-
-font_count := 3;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces40.mf b/mf/feta-braces40.mf
deleted file mode 100644 (file)
index 39c44f0..0000000
--- 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 <hanwen@cs.uu.nl>
-% 
-
-font_count := 4;
-input feta-beugel;
-end.
-
-

diff --git a/mf/feta-braces50.mf b/mf/feta-braces50.mf
deleted file mode 100644 (file)
index d7ea284..0000000
--- 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 <hanwen@cs.uu.nl>
-% 
-
-font_count := 5;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces60.mf b/mf/feta-braces60.mf
deleted file mode 100644 (file)
index 3b0ab2a..0000000
--- 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 <hanwen@cs.uu.nl>
-% 
-
-font_count := 6;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces70.mf b/mf/feta-braces70.mf
deleted file mode 100644 (file)
index 61635b9..0000000
--- 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 <hanwen@cs.uu.nl>
-% 
-
-font_count := 7;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces80.mf b/mf/feta-braces80.mf
deleted file mode 100644 (file)
index fb603a9..0000000
--- 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 <hanwen@cs.uu.nl>
-% 
-
-font_count := 8;
-input feta-beugel;
-end.