summaryrefslogtreecommitdiff
path: root/mf
diff options
context:
space:
mode:
authorJanek Warchoł <lemniskata.bernoullego@gmail.com>2013-12-13 18:58:00 +0100
committerBenkő Pál <benko.pal@gmail.com>2013-12-19 17:34:13 +0100
commit777a404670230b89d98210cdb3d18447c27ccc42 (patch)
treea6895855ddc4934cb75176eb8f34b4e9b9e42bfb /mf
parentbb9bee5f7d675167cba262cbfb27a7f4e1e5bcfb (diff)
factor out common inclusions and initializations
Diffstat (limited to 'mf')
-rw-r--r--mf/common-modules-and-initialization.mf7
-rw-r--r--mf/feta-alphabet-generic.mf7
-rw-r--r--mf/feta-braces-generic.mf8
-rw-r--r--mf/feta-braces.mf3
-rw-r--r--mf/feta-flags-generic.mf8
-rw-r--r--mf/feta-flags11.mf2
-rw-r--r--mf/feta-flags13.mf2
-rw-r--r--mf/feta-flags14.mf2
-rw-r--r--mf/feta-flags16.mf2
-rw-r--r--mf/feta-flags18.mf2
-rw-r--r--mf/feta-flags20.mf2
-rw-r--r--mf/feta-flags23.mf2
-rw-r--r--mf/feta-flags26.mf2
-rw-r--r--mf/feta-macros.mf1
-rw-r--r--mf/feta-noteheads-generic.mf8
-rw-r--r--mf/feta-noteheads11.mf2
-rw-r--r--mf/feta-noteheads13.mf2
-rw-r--r--mf/feta-noteheads14.mf2
-rw-r--r--mf/feta-noteheads16.mf2
-rw-r--r--mf/feta-noteheads18.mf2
-rw-r--r--mf/feta-noteheads20.mf2
-rw-r--r--mf/feta-noteheads23.mf2
-rw-r--r--mf/feta-noteheads26.mf2
-rw-r--r--mf/feta-other-generic.mf8
-rw-r--r--mf/feta11.mf2
-rw-r--r--mf/feta13.mf2
-rw-r--r--mf/feta14.mf2
-rw-r--r--mf/feta16.mf2
-rw-r--r--mf/feta18.mf2
-rw-r--r--mf/feta20.mf3
-rw-r--r--mf/feta23.mf2
-rw-r--r--mf/feta26.mf2
-rw-r--r--mf/parmesan-noteheads-generic.mf9
-rw-r--r--mf/parmesan-noteheads11.mf2
-rw-r--r--mf/parmesan-noteheads13.mf2
-rw-r--r--mf/parmesan-noteheads14.mf2
-rw-r--r--mf/parmesan-noteheads16.mf2
-rw-r--r--mf/parmesan-noteheads18.mf2
-rw-r--r--mf/parmesan-noteheads20.mf2
-rw-r--r--mf/parmesan-noteheads23.mf2
-rw-r--r--mf/parmesan-noteheads26.mf2
-rw-r--r--mf/parmesan-other-generic.mf7
-rw-r--r--mf/parmesan11.mf2
-rw-r--r--mf/parmesan13.mf2
-rw-r--r--mf/parmesan14.mf2
-rw-r--r--mf/parmesan16.mf2
-rw-r--r--mf/parmesan18.mf2
-rw-r--r--mf/parmesan20.mf2
-rw-r--r--mf/parmesan23.mf2
-rw-r--r--mf/parmesan26.mf2
50 files changed, 15 insertions, 132 deletions
diff --git a/mf/common-modules-and-initialization.mf b/mf/common-modules-and-initialization.mf
new file mode 100644
index 0000000000..764dbd6470
--- /dev/null
+++ b/mf/common-modules-and-initialization.mf
@@ -0,0 +1,7 @@
+
+staffsize# := design_size * pt#;
+input debugging-settings;
+input feta-autometric;
+input feta-macros;
+mode_setup;
+input feta-params;
diff --git a/mf/feta-alphabet-generic.mf b/mf/feta-alphabet-generic.mf
index e8e549ac78..81bcb2be44 100644
--- a/mf/feta-alphabet-generic.mf
+++ b/mf/feta-alphabet-generic.mf
@@ -1,14 +1,9 @@
-staffsize# := design_size * pt#;
-input feta-autometric;
-input feta-macros;
-input feta-params;
+input common-modules-and-initialization;
fet_beginfont ("feta-alphabet", design_size, "fetaNumber");
-mode_setup;
-
number_design_size := design_size / 2;
dynamic_design_size := 14 design_size / 20;
diff --git a/mf/feta-braces-generic.mf b/mf/feta-braces-generic.mf
index 749eb89c85..fea872acce 100644
--- a/mf/feta-braces-generic.mf
+++ b/mf/feta-braces-generic.mf
@@ -32,13 +32,9 @@ if known miterlimit:
vppp := pt;
fi;
+design_size := 20; %% arbitrary
-input feta-autometric;
-input feta-macros;
-
-staffsize# := 20 pt#; %% arbitrary
-
-input feta-params;
+input common-modules-and-initialization;
%
% We must let the design increase for each font to make sure that mftrace
diff --git a/mf/feta-braces.mf b/mf/feta-braces.mf
index 9a3d62ca7f..cf592e72b0 100644
--- a/mf/feta-braces.mf
+++ b/mf/feta-braces.mf
@@ -22,9 +22,6 @@
% doesn't jack up the resolution too highly for the longer braces.
%
-mode_setup;
-
-
save code, braces_per_font;
code := 64;
braces_per_font := 64;
diff --git a/mf/feta-flags-generic.mf b/mf/feta-flags-generic.mf
index 7b41062bd6..aa5c1a30c0 100644
--- a/mf/feta-flags-generic.mf
+++ b/mf/feta-flags-generic.mf
@@ -17,13 +17,7 @@
% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-staffsize# := design_size * pt#;
-
-mode_setup;
-
-input feta-macros;
-
-input feta-params;
+input common-modules-and-initialization;
font_x_height staff_space#;
diff --git a/mf/feta-flags11.mf b/mf/feta-flags11.mf
index bf199c6e69..bef74cbeac 100644
--- a/mf/feta-flags11.mf
+++ b/mf/feta-flags11.mf
@@ -1,8 +1,6 @@
% feta-flags11.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 11.22;
input feta-flags-generic;
diff --git a/mf/feta-flags13.mf b/mf/feta-flags13.mf
index 4982c0aec2..c597414aac 100644
--- a/mf/feta-flags13.mf
+++ b/mf/feta-flags13.mf
@@ -1,8 +1,6 @@
% feta-flags13.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 12.60;
input feta-flags-generic;
diff --git a/mf/feta-flags14.mf b/mf/feta-flags14.mf
index 6ef0d6fe5e..001f7c59a6 100644
--- a/mf/feta-flags14.mf
+++ b/mf/feta-flags14.mf
@@ -1,8 +1,6 @@
% feta-flags14.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 14.14;
input feta-flags-generic;
diff --git a/mf/feta-flags16.mf b/mf/feta-flags16.mf
index 8e23c9c297..9a865476b2 100644
--- a/mf/feta-flags16.mf
+++ b/mf/feta-flags16.mf
@@ -1,8 +1,6 @@
% feta-flags16.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 15.87;
input feta-flags-generic;
diff --git a/mf/feta-flags18.mf b/mf/feta-flags18.mf
index b69f9e7bca..488b3f1fd8 100644
--- a/mf/feta-flags18.mf
+++ b/mf/feta-flags18.mf
@@ -1,8 +1,6 @@
% feta-flags18.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 17.82;
input feta-flags-generic;
diff --git a/mf/feta-flags20.mf b/mf/feta-flags20.mf
index f56676845b..542fda37b8 100644
--- a/mf/feta-flags20.mf
+++ b/mf/feta-flags20.mf
@@ -1,8 +1,6 @@
% feta-flags20.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 20;
input feta-flags-generic;
diff --git a/mf/feta-flags23.mf b/mf/feta-flags23.mf
index e51988d2e0..d9ccec997e 100644
--- a/mf/feta-flags23.mf
+++ b/mf/feta-flags23.mf
@@ -1,8 +1,6 @@
% feta-flags23.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 22.45;
input feta-flags-generic;
diff --git a/mf/feta-flags26.mf b/mf/feta-flags26.mf
index a3276c1ad0..f2da7c10bd 100644
--- a/mf/feta-flags26.mf
+++ b/mf/feta-flags26.mf
@@ -1,8 +1,6 @@
% feta-flags26.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 25.20;
input feta-flags-generic;
diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf
index 9a695225fb..37544a7b64 100644
--- a/mf/feta-macros.mf
+++ b/mf/feta-macros.mf
@@ -21,7 +21,6 @@
% debugging
%
-input debugging-settings.mf
def print_penpos (suffix $) =
message
diff --git a/mf/feta-noteheads-generic.mf b/mf/feta-noteheads-generic.mf
index c7da14daa6..8a7b6e1914 100644
--- a/mf/feta-noteheads-generic.mf
+++ b/mf/feta-noteheads-generic.mf
@@ -17,13 +17,7 @@
% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-staffsize# := design_size * pt#;
-
-mode_setup;
-
-input feta-macros;
-
-input feta-params;
+input common-modules-and-initialization;
font_x_height staff_space#;
diff --git a/mf/feta-noteheads11.mf b/mf/feta-noteheads11.mf
index bfbd735129..f3e181cf87 100644
--- a/mf/feta-noteheads11.mf
+++ b/mf/feta-noteheads11.mf
@@ -1,8 +1,6 @@
% feta-noteheads11.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 11.22;
input feta-noteheads-generic;
diff --git a/mf/feta-noteheads13.mf b/mf/feta-noteheads13.mf
index a78ab0e959..9fbe617826 100644
--- a/mf/feta-noteheads13.mf
+++ b/mf/feta-noteheads13.mf
@@ -1,8 +1,6 @@
% feta-noteheads13.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 12.60;
input feta-noteheads-generic;
diff --git a/mf/feta-noteheads14.mf b/mf/feta-noteheads14.mf
index 75fccc1a2d..f47a083c74 100644
--- a/mf/feta-noteheads14.mf
+++ b/mf/feta-noteheads14.mf
@@ -1,8 +1,6 @@
% feta-noteheads14.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 14.14;
input feta-noteheads-generic;
diff --git a/mf/feta-noteheads16.mf b/mf/feta-noteheads16.mf
index 49c48f1e2c..30f6080607 100644
--- a/mf/feta-noteheads16.mf
+++ b/mf/feta-noteheads16.mf
@@ -1,8 +1,6 @@
% feta-noteheads16.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 15.87;
input feta-noteheads-generic;
diff --git a/mf/feta-noteheads18.mf b/mf/feta-noteheads18.mf
index 6cfcb6d630..362d41cacb 100644
--- a/mf/feta-noteheads18.mf
+++ b/mf/feta-noteheads18.mf
@@ -1,8 +1,6 @@
% feta-noteheads18.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 17.82;
input feta-noteheads-generic;
diff --git a/mf/feta-noteheads20.mf b/mf/feta-noteheads20.mf
index 4a5843cfd9..7b9cbb10da 100644
--- a/mf/feta-noteheads20.mf
+++ b/mf/feta-noteheads20.mf
@@ -1,8 +1,6 @@
% feta-noteheads20.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 20;
input feta-noteheads-generic;
diff --git a/mf/feta-noteheads23.mf b/mf/feta-noteheads23.mf
index c197af7d0c..25a97db73e 100644
--- a/mf/feta-noteheads23.mf
+++ b/mf/feta-noteheads23.mf
@@ -1,8 +1,6 @@
% feta-noteheads23.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 22.45;
input feta-noteheads-generic;
diff --git a/mf/feta-noteheads26.mf b/mf/feta-noteheads26.mf
index 333c4e3dd0..df55e6236c 100644
--- a/mf/feta-noteheads26.mf
+++ b/mf/feta-noteheads26.mf
@@ -1,8 +1,6 @@
% feta-noteheads26.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 25.20;
input feta-noteheads-generic;
diff --git a/mf/feta-other-generic.mf b/mf/feta-other-generic.mf
index 4058b91a79..a3f38a7413 100644
--- a/mf/feta-other-generic.mf
+++ b/mf/feta-other-generic.mf
@@ -17,13 +17,7 @@
% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-staffsize# := design_size * pt#;
-
-mode_setup;
-
-input feta-macros;
-
-input feta-params;
+input common-modules-and-initialization;
font_x_height staff_space#;
diff --git a/mf/feta11.mf b/mf/feta11.mf
index c9238948e7..209b607354 100644
--- a/mf/feta11.mf
+++ b/mf/feta11.mf
@@ -1,8 +1,6 @@
% feta11.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 11.22;
input feta-other-generic;
diff --git a/mf/feta13.mf b/mf/feta13.mf
index 4efb04b496..1c67814b25 100644
--- a/mf/feta13.mf
+++ b/mf/feta13.mf
@@ -1,8 +1,6 @@
% feta13.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 12.60;
input feta-other-generic;
diff --git a/mf/feta14.mf b/mf/feta14.mf
index 1f9bc5c679..21aae5f3a4 100644
--- a/mf/feta14.mf
+++ b/mf/feta14.mf
@@ -1,8 +1,6 @@
% feta14.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 14.14;
input feta-other-generic;
diff --git a/mf/feta16.mf b/mf/feta16.mf
index e882ad6015..e33c1ff973 100644
--- a/mf/feta16.mf
+++ b/mf/feta16.mf
@@ -1,8 +1,6 @@
% feta16.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 15.87;
input feta-other-generic;
diff --git a/mf/feta18.mf b/mf/feta18.mf
index 247994adc6..3b036f8fd8 100644
--- a/mf/feta18.mf
+++ b/mf/feta18.mf
@@ -1,8 +1,6 @@
% feta18.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
% todo change file name
design_size := 17.82;
diff --git a/mf/feta20.mf b/mf/feta20.mf
index 2eec430ddb..55d1440a82 100644
--- a/mf/feta20.mf
+++ b/mf/feta20.mf
@@ -3,9 +3,6 @@
design_size := 20;
-input feta-autometric;
-
-
% use feta-test for debugging.
input feta-other-generic;
diff --git a/mf/feta23.mf b/mf/feta23.mf
index 5322176067..344b9a7ce4 100644
--- a/mf/feta23.mf
+++ b/mf/feta23.mf
@@ -1,8 +1,6 @@
% feta23.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
% todo change file name
design_size := 22.45;
diff --git a/mf/feta26.mf b/mf/feta26.mf
index f3379b2b58..7d17b412ca 100644
--- a/mf/feta26.mf
+++ b/mf/feta26.mf
@@ -1,8 +1,6 @@
% feta26.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 25.20;
input feta-other-generic;
diff --git a/mf/parmesan-noteheads-generic.mf b/mf/parmesan-noteheads-generic.mf
index c2c141b40a..a104e4ac6b 100644
--- a/mf/parmesan-noteheads-generic.mf
+++ b/mf/parmesan-noteheads-generic.mf
@@ -17,14 +17,7 @@
% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-staffsize# := design_size * pt#;
-
-mode_setup;
-
-input feta-macros;
-
-input feta-params;
-
+input common-modules-and-initialization;
input parmesan-macros;
font_x_height staff_space#;
diff --git a/mf/parmesan-noteheads11.mf b/mf/parmesan-noteheads11.mf
index a3006cdcb7..eb9f689cf1 100644
--- a/mf/parmesan-noteheads11.mf
+++ b/mf/parmesan-noteheads11.mf
@@ -1,8 +1,6 @@
% feta-noteheads11.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 11.22;
input parmesan-noteheads-generic;
diff --git a/mf/parmesan-noteheads13.mf b/mf/parmesan-noteheads13.mf
index 3b4961a249..89d58c6164 100644
--- a/mf/parmesan-noteheads13.mf
+++ b/mf/parmesan-noteheads13.mf
@@ -1,8 +1,6 @@
% feta-noteheads13.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 12.60;
input parmesan-noteheads-generic;
diff --git a/mf/parmesan-noteheads14.mf b/mf/parmesan-noteheads14.mf
index 4699588408..0f8acef281 100644
--- a/mf/parmesan-noteheads14.mf
+++ b/mf/parmesan-noteheads14.mf
@@ -1,8 +1,6 @@
% feta-noteheads14.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 14.14;
input parmesan-noteheads-generic;
diff --git a/mf/parmesan-noteheads16.mf b/mf/parmesan-noteheads16.mf
index a398167939..54ac153861 100644
--- a/mf/parmesan-noteheads16.mf
+++ b/mf/parmesan-noteheads16.mf
@@ -1,8 +1,6 @@
% feta-noteheads16.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 15.87;
input parmesan-noteheads-generic;
diff --git a/mf/parmesan-noteheads18.mf b/mf/parmesan-noteheads18.mf
index 3e59cd4f8d..fdd5f11535 100644
--- a/mf/parmesan-noteheads18.mf
+++ b/mf/parmesan-noteheads18.mf
@@ -1,8 +1,6 @@
% feta-noteheads18.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 17.82;
input parmesan-noteheads-generic;
diff --git a/mf/parmesan-noteheads20.mf b/mf/parmesan-noteheads20.mf
index 6dbe9650e9..90a8bbf118 100644
--- a/mf/parmesan-noteheads20.mf
+++ b/mf/parmesan-noteheads20.mf
@@ -1,8 +1,6 @@
% feta-noteheads20.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 20;
input parmesan-noteheads-generic;
diff --git a/mf/parmesan-noteheads23.mf b/mf/parmesan-noteheads23.mf
index 46c58073c7..9aabc74de9 100644
--- a/mf/parmesan-noteheads23.mf
+++ b/mf/parmesan-noteheads23.mf
@@ -1,8 +1,6 @@
% feta-noteheads23.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 22.45;
input parmesan-noteheads-generic;
diff --git a/mf/parmesan-noteheads26.mf b/mf/parmesan-noteheads26.mf
index 01618bfc99..c52e853f78 100644
--- a/mf/parmesan-noteheads26.mf
+++ b/mf/parmesan-noteheads26.mf
@@ -1,8 +1,6 @@
% feta-noteheads26.mf
% part of LilyPond's pretty-but-neat music font
-input feta-autometric;
-
design_size := 25.20;
input parmesan-noteheads-generic;
diff --git a/mf/parmesan-other-generic.mf b/mf/parmesan-other-generic.mf
index c3e6f85911..8352b07ae1 100644
--- a/mf/parmesan-other-generic.mf
+++ b/mf/parmesan-other-generic.mf
@@ -17,13 +17,8 @@
% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-mode_setup;
-
-staffsize# := design_size * pt#;
-
-input feta-macros;
-input feta-params;
+input common-modules-and-initialization;
input parmesan-macros;
diff --git a/mf/parmesan11.mf b/mf/parmesan11.mf
index f6c15781be..e5581d64af 100644
--- a/mf/parmesan11.mf
+++ b/mf/parmesan11.mf
@@ -3,8 +3,6 @@
design_size := 11.22;
-input feta-autometric;
-
input parmesan-other-generic;
end.
diff --git a/mf/parmesan13.mf b/mf/parmesan13.mf
index 288330694e..ab1ed777c4 100644
--- a/mf/parmesan13.mf
+++ b/mf/parmesan13.mf
@@ -3,8 +3,6 @@
design_size := 12.60;
-input feta-autometric;
-
input parmesan-other-generic;
diff --git a/mf/parmesan14.mf b/mf/parmesan14.mf
index 2586d7962e..2484de6f18 100644
--- a/mf/parmesan14.mf
+++ b/mf/parmesan14.mf
@@ -3,8 +3,6 @@
design_size := 14.14;
-input feta-autometric;
-
input parmesan-other-generic;
end.
diff --git a/mf/parmesan16.mf b/mf/parmesan16.mf
index 354657643f..d45c844be6 100644
--- a/mf/parmesan16.mf
+++ b/mf/parmesan16.mf
@@ -3,8 +3,6 @@
design_size := 15.87;
-input feta-autometric;
-
input parmesan-other-generic;
diff --git a/mf/parmesan18.mf b/mf/parmesan18.mf
index 0360c88104..039767db14 100644
--- a/mf/parmesan18.mf
+++ b/mf/parmesan18.mf
@@ -3,8 +3,6 @@
design_size := 17.82;
-input feta-autometric;
-
input parmesan-other-generic;
diff --git a/mf/parmesan20.mf b/mf/parmesan20.mf
index 6d6b8c5cf7..5da29bd9a4 100644
--- a/mf/parmesan20.mf
+++ b/mf/parmesan20.mf
@@ -3,8 +3,6 @@
design_size := 20;
-input feta-autometric;
-
input parmesan-other-generic;
diff --git a/mf/parmesan23.mf b/mf/parmesan23.mf
index b56d593819..c76bb0a7ed 100644
--- a/mf/parmesan23.mf
+++ b/mf/parmesan23.mf
@@ -3,8 +3,6 @@
design_size := 22.45;
-input feta-autometric;
-
input parmesan-other-generic;
diff --git a/mf/parmesan26.mf b/mf/parmesan26.mf
index 0e1fce27e4..3a4726c035 100644
--- a/mf/parmesan26.mf
+++ b/mf/parmesan26.mf
@@ -3,8 +3,6 @@
design_size := 25.20;
-input feta-autometric;
-
input parmesan-other-generic;