11 files changed, 60 insertions, 46 deletions
diff --git a/mf/feta-braces-a.mf b/mf/feta-braces-a.mf
index 1210262421..9d96722731 100644
--- a/mf/feta-braces-a.mf
+++ b/mf/feta-braces-a.mf
@@ -18,5 +18,5 @@
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 font_count := 0;
-input feta-braces;
+input feta-braces-generic;
 end.
diff --git a/mf/feta-braces-b.mf b/mf/feta-braces-b.mf
index df91510af7..9e67037924 100644
--- a/mf/feta-braces-b.mf
+++ b/mf/feta-braces-b.mf
@@ -18,5 +18,5 @@
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 font_count := 1;
-input feta-braces;
+input feta-braces-generic;
 end.
diff --git a/mf/feta-braces-c.mf b/mf/feta-braces-c.mf
index 87fc66047d..60063778fc 100644
--- a/mf/feta-braces-c.mf
+++ b/mf/feta-braces-c.mf
@@ -18,5 +18,5 @@
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 font_count := 2;
-input feta-braces;
+input feta-braces-generic;
 end.
diff --git a/mf/feta-braces-d.mf b/mf/feta-braces-d.mf
index ffad571c0c..822f46cdc5 100644
--- a/mf/feta-braces-d.mf
+++ b/mf/feta-braces-d.mf
@@ -18,5 +18,5 @@
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 font_count := 3;
-input feta-braces;
+input feta-braces-generic;
 end.
diff --git a/mf/feta-braces-e.mf b/mf/feta-braces-e.mf
index a0b130bdad..16502fd237 100644
--- a/mf/feta-braces-e.mf
+++ b/mf/feta-braces-e.mf
@@ -18,5 +18,5 @@
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 font_count := 4;
-input feta-braces;
+input feta-braces-generic;
 end.
diff --git a/mf/feta-braces-f.mf b/mf/feta-braces-f.mf
index ad31d2bcc8..b8151f9252 100644
--- a/mf/feta-braces-f.mf
+++ b/mf/feta-braces-f.mf
@@ -18,5 +18,5 @@
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 font_count := 5;
-input feta-braces;
+input feta-braces-generic;
 end.
diff --git a/mf/feta-braces-g.mf b/mf/feta-braces-g.mf
index 545ca5a855..8fd1800b8d 100644
--- a/mf/feta-braces-g.mf
+++ b/mf/feta-braces-g.mf
@@ -18,5 +18,5 @@
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 font_count := 6;
-input feta-braces;
+input feta-braces-generic;
 end.
diff --git a/mf/feta-braces-generic.mf b/mf/feta-braces-generic.mf
new file mode 100644
index 0000000000..749eb89c85
--- /dev/null
+++ b/mf/feta-braces-generic.mf
@@ -0,0 +1,51 @@
+% This file is part of LilyPond, the GNU music typesetter.
+%
+% Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%                Jan Nieuwenhuizen <janneke@gnu.org>
+%
+% The LilyPond font is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version, or under the SIL Open Font License.
+
+
+% We have to reduce the pixel-per-point value to
+% support large brace glyphs in case we are using MetaPost
+% (which by default sets `hppp' to 49.80244, regardless of
+% the used `mag' value)
+
+if known miterlimit:
+	bpppix_ := 0.2;		% ten times larger than original
+
+	numeric mm, pt, dd, bp, cm, pc, cc, in;
+
+	mm * bpppix_ = 2.83464;
+	pt * bpppix_ = 0.99626;
+	dd * bpppix_ = 1.06601;
+	bp * bpppix_ = 1;
+	cm * bpppix_ = 28.34645;
+	pc * bpppix_ = 11.95517;
+	cc * bpppix_ = 12.79213;
+	in * bpppix_ = 72;
+
+	hppp := pt;
+	vppp := pt;
+fi;
+
+
+input feta-autometric;
+input feta-macros;
+
+staffsize# := 20 pt#;   %% arbitrary
+
+input feta-params;
+
+%
+% We must let the design increase for each font to make sure that mftrace
+% doesn't jack up the resolution too highly for the longer braces.
+%
+
+fet_beginfont ("feta-braces-" & char (97 + font_count),
+	       (font_count + 1) * 20, "fetaBraces");
+	input feta-braces;
+fet_endfont ("feta-braces");
diff --git a/mf/feta-braces-h.mf b/mf/feta-braces-h.mf
index 646e153106..cfcdb2b25d 100644
--- a/mf/feta-braces-h.mf
+++ b/mf/feta-braces-h.mf
@@ -18,5 +18,5 @@
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 font_count := 7;
-input feta-braces;
+input feta-braces-generic;
 end.
diff --git a/mf/feta-braces-i.mf b/mf/feta-braces-i.mf
index 0f3fcd3567..247d38d179 100644
--- a/mf/feta-braces-i.mf
+++ b/mf/feta-braces-i.mf
@@ -18,5 +18,5 @@
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 font_count := 8;
-input feta-braces;
+input feta-braces-generic;
 end.
diff --git a/mf/feta-braces.mf b/mf/feta-braces.mf
index c948f345fd..9a3d62ca7f 100644
--- a/mf/feta-braces.mf
+++ b/mf/feta-braces.mf
@@ -17,46 +17,11 @@
 % You should have received a copy of the GNU General Public License
 % along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-
-% We have to reduce the pixel-per-point value to
-% support large brace glyphs in case we are using MetaPost
-% (which by default sets `hppp' to 49.80244, regardless of
-% the used `mag' value)
-
-if known miterlimit:
-	bpppix_ := 0.2;		% ten times larger than original
-
-	numeric mm, pt, dd, bp, cm, pc, cc, in;
-
-	mm * bpppix_ = 2.83464;
-	pt * bpppix_ = 0.99626;
-	dd * bpppix_ = 1.06601;
-	bp * bpppix_ = 1;
-	cm * bpppix_ = 28.34645;
-	pc * bpppix_ = 11.95517;
-	cc * bpppix_ = 12.79213;
-	in * bpppix_ = 72;
-
-	hppp := pt;
-	vppp := pt;
-fi;
-
-
-input feta-autometric;
-input feta-macros;
-
-staffsize# := 20 pt#;   %% arbitrary
-
-input feta-params;
-
 %
 % We must let the design increase for each font to make sure that mftrace
 % doesn't jack up the resolution too highly for the longer braces.
 %
 
-fet_beginfont ("feta-braces-" & char (97 + font_count),
-	       (font_count + 1) * 20, "fetaBraces");
-
 mode_setup;
 
 
@@ -160,5 +125,3 @@ for i := 0 step 1 until font_count:
 		number := number + 1;
 	endfor;
 endfor;
-
-fet_endfont ("feta-braces");