From e404fc552f975ad85360b50186f9fb689bd120e9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Janek=20Warcho=C5=82?= Date: Fri, 6 Dec 2013 18:22:43 +0100 Subject: [PATCH] unify formatting and indentation --- mf/feta-accidentals.mf | 16 +++++----------- mf/feta-alphabet-generic.mf | 10 ++++------ mf/feta-flags-generic.mf | 3 +-- mf/feta-flags11.mf | 2 -- mf/feta-flags13.mf | 2 -- mf/feta-flags14.mf | 2 -- mf/feta-flags16.mf | 2 -- mf/feta-flags18.mf | 2 -- mf/feta-flags20.mf | 2 -- mf/feta-flags23.mf | 2 -- mf/feta-flags26.mf | 2 -- mf/feta-noteheads-generic.mf | 3 +-- mf/feta-noteheads11.mf | 2 -- mf/feta-noteheads13.mf | 2 -- mf/feta-noteheads14.mf | 2 -- mf/feta-noteheads16.mf | 2 -- mf/feta-noteheads18.mf | 2 -- mf/feta-noteheads20.mf | 2 -- mf/feta-noteheads23.mf | 2 -- mf/feta-noteheads26.mf | 2 -- mf/feta11.mf | 2 -- mf/feta13.mf | 2 -- mf/feta14.mf | 3 --- mf/feta16.mf | 2 -- mf/feta18.mf | 2 -- mf/feta20.mf | 2 -- mf/feta23.mf | 3 --- mf/feta26.mf | 4 ---- mf/parmesan-noteheads11.mf | 2 -- mf/parmesan-noteheads13.mf | 2 -- mf/parmesan-noteheads14.mf | 2 -- mf/parmesan-noteheads16.mf | 2 -- mf/parmesan-noteheads18.mf | 2 -- mf/parmesan-noteheads20.mf | 2 -- mf/parmesan-noteheads23.mf | 2 -- mf/parmesan-noteheads26.mf | 2 -- mf/parmesan-other-generic.mf | 18 ++++++++---------- mf/parmesan11.mf | 2 -- mf/parmesan13.mf | 3 --- mf/parmesan14.mf | 3 --- mf/parmesan16.mf | 3 --- mf/parmesan18.mf | 3 --- mf/parmesan20.mf | 3 --- mf/parmesan23.mf | 3 --- mf/parmesan26.mf | 3 --- 45 files changed, 19 insertions(+), 122 deletions(-) diff --git a/mf/feta-accidentals.mf b/mf/feta-accidentals.mf index ef689c9d68..d2585a1954 100644 --- a/mf/feta-accidentals.mf +++ b/mf/feta-accidentals.mf @@ -41,15 +41,9 @@ fet_begingroup ("accidentals"); - -input feta-arrow; - -input feta-sharps; - -input feta-naturals; - -input feta-flats; - -input feta-parenthesis; - + input feta-arrow; + input feta-sharps; + input feta-naturals; + input feta-flats; + input feta-parenthesis; fet_endgroup ("accidentals"); diff --git a/mf/feta-alphabet-generic.mf b/mf/feta-alphabet-generic.mf index bda534bcf8..047f08bc8a 100644 --- a/mf/feta-alphabet-generic.mf +++ b/mf/feta-alphabet-generic.mf @@ -11,11 +11,9 @@ input common-modules-and-initialization; fet_beginfont ("feta-alphabet", design_size, "fetaNumber"); + number_design_size := design_size / 2; + dynamic_design_size := 14 design_size / 20; -number_design_size := design_size / 2; -dynamic_design_size := 14 design_size / 20; - -input feta-numbers; -input feta-dynamics; - + input feta-numbers; + input feta-dynamics; fet_endfont ("feta-numbers"); diff --git a/mf/feta-flags-generic.mf b/mf/feta-flags-generic.mf index a9d17c33f8..8fc5aab9ee 100644 --- a/mf/feta-flags-generic.mf +++ b/mf/feta-flags-generic.mf @@ -13,8 +13,7 @@ input common-modules-and-initialization; font_x_height staff_space#; fet_beginfont ("feta", design_size, "fetaMusic"); - -input feta-flags; + input feta-flags; input declare-autometric-parameters; fet_endfont; diff --git a/mf/feta-flags11.mf b/mf/feta-flags11.mf index dffbc5bd33..8026bf499d 100644 --- a/mf/feta-flags11.mf +++ b/mf/feta-flags11.mf @@ -2,6 +2,4 @@ design_size := 11.22; input feta-flags-generic; - end. - diff --git a/mf/feta-flags13.mf b/mf/feta-flags13.mf index dd16dfb6a4..51e508fee3 100644 --- a/mf/feta-flags13.mf +++ b/mf/feta-flags13.mf @@ -2,6 +2,4 @@ design_size := 12.60; input feta-flags-generic; - end. - diff --git a/mf/feta-flags14.mf b/mf/feta-flags14.mf index add97f8382..22055a8cc2 100644 --- a/mf/feta-flags14.mf +++ b/mf/feta-flags14.mf @@ -2,6 +2,4 @@ design_size := 14.14; input feta-flags-generic; - end. - diff --git a/mf/feta-flags16.mf b/mf/feta-flags16.mf index cc2d72e12a..3e706e7d23 100644 --- a/mf/feta-flags16.mf +++ b/mf/feta-flags16.mf @@ -2,6 +2,4 @@ design_size := 15.87; input feta-flags-generic; - end. - diff --git a/mf/feta-flags18.mf b/mf/feta-flags18.mf index fb244dc4eb..a15fea7560 100644 --- a/mf/feta-flags18.mf +++ b/mf/feta-flags18.mf @@ -2,6 +2,4 @@ design_size := 17.82; input feta-flags-generic; - end. - diff --git a/mf/feta-flags20.mf b/mf/feta-flags20.mf index a23dc9fb3e..9eedbeb78d 100644 --- a/mf/feta-flags20.mf +++ b/mf/feta-flags20.mf @@ -2,6 +2,4 @@ design_size := 20; input feta-flags-generic; - end. - diff --git a/mf/feta-flags23.mf b/mf/feta-flags23.mf index f92dc053fe..1500a15110 100644 --- a/mf/feta-flags23.mf +++ b/mf/feta-flags23.mf @@ -2,6 +2,4 @@ design_size := 22.45; input feta-flags-generic; - end. - diff --git a/mf/feta-flags26.mf b/mf/feta-flags26.mf index 0ce58cbf21..322213b562 100644 --- a/mf/feta-flags26.mf +++ b/mf/feta-flags26.mf @@ -2,6 +2,4 @@ design_size := 25.20; input feta-flags-generic; - end. - diff --git a/mf/feta-noteheads-generic.mf b/mf/feta-noteheads-generic.mf index c2435c92d6..290deaf084 100644 --- a/mf/feta-noteheads-generic.mf +++ b/mf/feta-noteheads-generic.mf @@ -13,8 +13,7 @@ input common-modules-and-initialization; font_x_height staff_space#; fet_beginfont ("feta", design_size, "fetaMusic"); - -input feta-noteheads; + input feta-noteheads; input declare-autometric-parameters; fet_endfont; diff --git a/mf/feta-noteheads11.mf b/mf/feta-noteheads11.mf index 804217ae20..cba81dee23 100644 --- a/mf/feta-noteheads11.mf +++ b/mf/feta-noteheads11.mf @@ -2,6 +2,4 @@ design_size := 11.22; input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads13.mf b/mf/feta-noteheads13.mf index b1af19dec7..0516809917 100644 --- a/mf/feta-noteheads13.mf +++ b/mf/feta-noteheads13.mf @@ -2,6 +2,4 @@ design_size := 12.60; input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads14.mf b/mf/feta-noteheads14.mf index 45a19cc997..14d3b78b01 100644 --- a/mf/feta-noteheads14.mf +++ b/mf/feta-noteheads14.mf @@ -2,6 +2,4 @@ design_size := 14.14; input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads16.mf b/mf/feta-noteheads16.mf index 88b4db8512..8c8370dc59 100644 --- a/mf/feta-noteheads16.mf +++ b/mf/feta-noteheads16.mf @@ -2,6 +2,4 @@ design_size := 15.87; input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads18.mf b/mf/feta-noteheads18.mf index bf2538b359..a1e705c48c 100644 --- a/mf/feta-noteheads18.mf +++ b/mf/feta-noteheads18.mf @@ -2,6 +2,4 @@ design_size := 17.82; input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads20.mf b/mf/feta-noteheads20.mf index f6550d9a9f..9ac9379de2 100644 --- a/mf/feta-noteheads20.mf +++ b/mf/feta-noteheads20.mf @@ -2,6 +2,4 @@ design_size := 20; input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads23.mf b/mf/feta-noteheads23.mf index 1cd5ae6fd0..f6ddb0db44 100644 --- a/mf/feta-noteheads23.mf +++ b/mf/feta-noteheads23.mf @@ -2,6 +2,4 @@ design_size := 22.45; input feta-noteheads-generic; - end. - diff --git a/mf/feta-noteheads26.mf b/mf/feta-noteheads26.mf index e65188e84c..e72c7012d5 100644 --- a/mf/feta-noteheads26.mf +++ b/mf/feta-noteheads26.mf @@ -2,6 +2,4 @@ design_size := 25.20; input feta-noteheads-generic; - end. - diff --git a/mf/feta11.mf b/mf/feta11.mf index fcf7e32bf0..ddc0f0d292 100644 --- a/mf/feta11.mf +++ b/mf/feta11.mf @@ -3,6 +3,4 @@ design_size := 11.22; input feta-other-generic; - end. - diff --git a/mf/feta13.mf b/mf/feta13.mf index 2c3982960e..37871789ce 100644 --- a/mf/feta13.mf +++ b/mf/feta13.mf @@ -3,6 +3,4 @@ design_size := 12.60; input feta-other-generic; - end. - diff --git a/mf/feta14.mf b/mf/feta14.mf index 026272b856..a70db3e136 100644 --- a/mf/feta14.mf +++ b/mf/feta14.mf @@ -3,7 +3,4 @@ design_size := 14.14; input feta-other-generic; - - end. - diff --git a/mf/feta16.mf b/mf/feta16.mf index 6ca38c7502..d38c756bf7 100644 --- a/mf/feta16.mf +++ b/mf/feta16.mf @@ -3,6 +3,4 @@ design_size := 15.87; input feta-other-generic; - end. - diff --git a/mf/feta18.mf b/mf/feta18.mf index d062ec7e1f..d69ff7ccce 100644 --- a/mf/feta18.mf +++ b/mf/feta18.mf @@ -3,6 +3,4 @@ design_size := 17.82; input feta-other-generic; - - end. diff --git a/mf/feta20.mf b/mf/feta20.mf index e7ff398c5d..eafc6fa163 100644 --- a/mf/feta20.mf +++ b/mf/feta20.mf @@ -4,6 +4,4 @@ design_size := 20; % use feta-test for debugging. input feta-other-generic; - - end. diff --git a/mf/feta23.mf b/mf/feta23.mf index bf65daa223..0a0be5cae0 100644 --- a/mf/feta23.mf +++ b/mf/feta23.mf @@ -3,7 +3,4 @@ design_size := 22.45; input feta-other-generic; - - end. - diff --git a/mf/feta26.mf b/mf/feta26.mf index 63393839a4..62ed9540e4 100644 --- a/mf/feta26.mf +++ b/mf/feta26.mf @@ -3,8 +3,4 @@ design_size := 25.20; input feta-other-generic; - - end. - - diff --git a/mf/parmesan-noteheads11.mf b/mf/parmesan-noteheads11.mf index c299522657..4f35548ff1 100644 --- a/mf/parmesan-noteheads11.mf +++ b/mf/parmesan-noteheads11.mf @@ -2,6 +2,4 @@ design_size := 11.22; input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads13.mf b/mf/parmesan-noteheads13.mf index 2e7ab09690..13cedf0b14 100644 --- a/mf/parmesan-noteheads13.mf +++ b/mf/parmesan-noteheads13.mf @@ -2,6 +2,4 @@ design_size := 12.60; input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads14.mf b/mf/parmesan-noteheads14.mf index bd1c46f1e1..4c41de5149 100644 --- a/mf/parmesan-noteheads14.mf +++ b/mf/parmesan-noteheads14.mf @@ -2,6 +2,4 @@ design_size := 14.14; input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads16.mf b/mf/parmesan-noteheads16.mf index 6803329151..53f67ceb68 100644 --- a/mf/parmesan-noteheads16.mf +++ b/mf/parmesan-noteheads16.mf @@ -2,6 +2,4 @@ design_size := 15.87; input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads18.mf b/mf/parmesan-noteheads18.mf index 36b1254979..4fcc73d5c4 100644 --- a/mf/parmesan-noteheads18.mf +++ b/mf/parmesan-noteheads18.mf @@ -2,6 +2,4 @@ design_size := 17.82; input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads20.mf b/mf/parmesan-noteheads20.mf index 2ded377d40..3d2d91ff28 100644 --- a/mf/parmesan-noteheads20.mf +++ b/mf/parmesan-noteheads20.mf @@ -2,6 +2,4 @@ design_size := 20; input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads23.mf b/mf/parmesan-noteheads23.mf index f7e05b83ba..7a0d3bfd93 100644 --- a/mf/parmesan-noteheads23.mf +++ b/mf/parmesan-noteheads23.mf @@ -2,6 +2,4 @@ design_size := 22.45; input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-noteheads26.mf b/mf/parmesan-noteheads26.mf index 1400d3dc0b..f7cb63aa90 100644 --- a/mf/parmesan-noteheads26.mf +++ b/mf/parmesan-noteheads26.mf @@ -2,6 +2,4 @@ design_size := 25.20; input parmesan-noteheads-generic; - end. - diff --git a/mf/parmesan-other-generic.mf b/mf/parmesan-other-generic.mf index 80e82447dc..a0e9f38e9e 100644 --- a/mf/parmesan-other-generic.mf +++ b/mf/parmesan-other-generic.mf @@ -12,17 +12,15 @@ input common-modules-and-initialization; input parmesan-macros; - font_x_height staff_space#; - fet_beginfont ("parmesan", design_size, "parmesanMusic"); - input parmesan-rests; - input parmesan-clefs; - input parmesan-custodes - input parmesan-accidentals; - input parmesan-flags; - input parmesan-timesignatures; - input parmesan-scripts; - input parmesan-dots; + input parmesan-rests; + input parmesan-clefs; + input parmesan-custodes + input parmesan-accidentals; + input parmesan-flags; + input parmesan-timesignatures; + input parmesan-scripts; + input parmesan-dots; fet_endfont; diff --git a/mf/parmesan11.mf b/mf/parmesan11.mf index a68d21b790..050559744f 100644 --- a/mf/parmesan11.mf +++ b/mf/parmesan11.mf @@ -3,6 +3,4 @@ design_size := 11.22; input parmesan-other-generic; - end. - diff --git a/mf/parmesan13.mf b/mf/parmesan13.mf index 19b7406fb3..8e139d450d 100644 --- a/mf/parmesan13.mf +++ b/mf/parmesan13.mf @@ -3,7 +3,4 @@ design_size := 12.60; input parmesan-other-generic; - - end. - diff --git a/mf/parmesan14.mf b/mf/parmesan14.mf index 7c7de11c77..2eb056525f 100644 --- a/mf/parmesan14.mf +++ b/mf/parmesan14.mf @@ -1,8 +1,5 @@ % Produce font files at specified size. design_size := 14.14; - input parmesan-other-generic; - end. - diff --git a/mf/parmesan16.mf b/mf/parmesan16.mf index 0a7e6ae587..d8dd45d2ff 100644 --- a/mf/parmesan16.mf +++ b/mf/parmesan16.mf @@ -3,7 +3,4 @@ design_size := 15.87; input parmesan-other-generic; - - end. - diff --git a/mf/parmesan18.mf b/mf/parmesan18.mf index 72007c30d7..cd1052b3ae 100644 --- a/mf/parmesan18.mf +++ b/mf/parmesan18.mf @@ -3,7 +3,4 @@ design_size := 17.82; input parmesan-other-generic; - - end. - diff --git a/mf/parmesan20.mf b/mf/parmesan20.mf index 4714a79ea8..a7e8452c6f 100644 --- a/mf/parmesan20.mf +++ b/mf/parmesan20.mf @@ -3,7 +3,4 @@ design_size := 20; input parmesan-other-generic; - - end. - diff --git a/mf/parmesan23.mf b/mf/parmesan23.mf index dc12f77874..e47b714b5c 100644 --- a/mf/parmesan23.mf +++ b/mf/parmesan23.mf @@ -3,7 +3,4 @@ design_size := 22.45; input parmesan-other-generic; - - end. - diff --git a/mf/parmesan26.mf b/mf/parmesan26.mf index 39537ee5ba..925ceaa8ab 100644 --- a/mf/parmesan26.mf +++ b/mf/parmesan26.mf @@ -3,7 +3,4 @@ design_size := 25.20; input parmesan-other-generic; - - end. - -- 2.39.5