From 4f27e3239758438b394f89c8d268fedf66dd3999 Mon Sep 17 00:00:00 2001
From: Marc Hohl <marc@hohlart.de>
Date: Sat, 19 Dec 2009 21:03:57 +0100
Subject: [PATCH] Issue #830: renaming mf files

---
 mf/README                                     |  2 +-
 mf/{feta-toevallig.mf => feta-accidentals.mf} |  6 ++---
 mf/feta-alphabet.mf                           |  6 ++---
 mf/{feta-arrow.mf => feta-arrowheads.mf}      |  0
 mf/feta-braces-a.mf                           |  2 +-
 mf/feta-braces-b.mf                           |  2 +-
 mf/feta-braces-c.mf                           |  2 +-
 mf/feta-braces-d.mf                           |  2 +-
 mf/feta-braces-e.mf                           |  2 +-
 mf/feta-braces-f.mf                           |  2 +-
 mf/feta-braces-g.mf                           |  2 +-
 mf/feta-braces-h.mf                           |  2 +-
 mf/feta-braces-i.mf                           |  2 +-
 mf/{feta-beugel.mf => feta-braces.mf}         |  4 +--
 mf/{feta-haak.mf => feta-brackettips.mf}      |  2 +-
 mf/{feta-klef.mf => feta-clefs.mf}            |  8 +++---
 mf/{feta-puntje.mf => feta-dots.mf}           |  0
 mf/{feta-din-code.mf => feta-dynamics.mf}     |  2 +-
 mf/{feta-banier.mf => feta-flags.mf}          |  0
 mf/feta-generic.mf                            | 24 ++++++++---------
 mf/{feta-bolletjes.mf => feta-noteheads.mf}   |  6 ++---
 mf/{feta-nummer-code.mf => feta-numbers.mf}   |  6 ++---
 mf/{feta-pendaal.mf => feta-pedals.mf}        |  2 +-
 mf/{feta-eindelijk.mf => feta-rests.mf}       |  8 +++---
 mf/{feta-schrift.mf => feta-scripts.mf}       |  4 +--
 mf/feta-test-generic.mf                       | 26 +++++++++----------
 ...feta-timesig.mf => feta-timesignatures.mf} |  0
 mf/{feta-slag.mf => feta-trills.mf}           |  0
 mf/parmesan-generic.mf                        |  4 +--
 ...armesan-heads.mf => parmesan-noteheads.mf} | 26 +++++++++----------
 ...-timesig.mf => parmesan-timesignatures.mf} |  6 ++---
 31 files changed, 79 insertions(+), 81 deletions(-)
 rename mf/{feta-toevallig.mf => feta-accidentals.mf} (99%)
 rename mf/{feta-arrow.mf => feta-arrowheads.mf} (100%)
 rename mf/{feta-beugel.mf => feta-braces.mf} (99%)
 rename mf/{feta-haak.mf => feta-brackettips.mf} (99%)
 rename mf/{feta-klef.mf => feta-clefs.mf} (99%)
 rename mf/{feta-puntje.mf => feta-dots.mf} (100%)
 rename mf/{feta-din-code.mf => feta-dynamics.mf} (99%)
 rename mf/{feta-banier.mf => feta-flags.mf} (100%)
 rename mf/{feta-bolletjes.mf => feta-noteheads.mf} (99%)
 rename mf/{feta-nummer-code.mf => feta-numbers.mf} (99%)
 rename mf/{feta-pendaal.mf => feta-pedals.mf} (99%)
 rename mf/{feta-eindelijk.mf => feta-rests.mf} (98%)
 rename mf/{feta-schrift.mf => feta-scripts.mf} (99%)
 rename mf/{feta-timesig.mf => feta-timesignatures.mf} (100%)
 rename mf/{feta-slag.mf => feta-trills.mf} (100%)
 rename mf/{parmesan-heads.mf => parmesan-noteheads.mf} (99%)
 rename mf/{parmesan-timesig.mf => parmesan-timesignatures.mf} (99%)

diff --git a/mf/README b/mf/README
index 9d52194bc8..adf0225145 100644
--- a/mf/README
+++ b/mf/README
@@ -103,7 +103,7 @@ Hints for stem attachment:
   abovementioned horizontal reflection taken into account), then the prefix
   `s' (for `symmetric') should be used.  See the existing files for
   examples.  The numbers in the glyph names refer to the duration of the
-  note; e.g., `s0cross' in feta-bolletjes.mf defines the notehead for a
+  note; e.g., `s0cross' in feta-noteheads.mf defines the notehead for a
   whole cross-shaped note (similarly, `s1cross' and `s2cross' are for half
   and quarter notes, respectively).
 
diff --git a/mf/feta-toevallig.mf b/mf/feta-accidentals.mf
similarity index 99%
rename from mf/feta-toevallig.mf
rename to mf/feta-accidentals.mf
index f8ed7c60a3..0c2efea486 100644
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-accidentals.mf
@@ -46,7 +46,7 @@ enddef;
 %
 %   SHARPBASE[.SLASHES.STEMS]
 %   FLATBASE[.MODIFIER]
-%  
+%
 % Examples:
 %
 %   sharp.slashslash.stem
@@ -371,7 +371,7 @@ fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem");
 	bot y7 = -top y6 + feta_space_shift;
 	top y8 = h;
 
-	labels (5, 6, 7, 8);	
+	labels (5, 6, 7, 8);
 
 	draw_gridline (z5, z6, stemwidth);
 	draw_gridline (z7, z8, stemwidth);
@@ -982,7 +982,7 @@ fet_endchar;
 
 
 fet_beginchar ("Flatflat (mirrored)", "mirroredflat.flat");
-	set_char_box (0, 1.6 staff_space#, 
+	set_char_box (0, 1.6 staff_space#,
 		      0.6 staff_space#, 1.9 staff_space#);
 
 	% This is a modified version of `draw_meta_flat'.
diff --git a/mf/feta-alphabet.mf b/mf/feta-alphabet.mf
index c3d1f09f97..5663a791b7 100644
--- a/mf/feta-alphabet.mf
+++ b/mf/feta-alphabet.mf
@@ -13,7 +13,7 @@ mode_setup;
 number_design_size := design_size / 2;
 dynamic_design_size := 14 design_size / 20;
 
-input feta-nummer-code;
-input feta-din-code;
+input feta-numbers;
+input feta-dynamics;
 
-fet_endfont ("feta-nummer");
+fet_endfont ("feta-numbers");
diff --git a/mf/feta-arrow.mf b/mf/feta-arrowheads.mf
similarity index 100%
rename from mf/feta-arrow.mf
rename to mf/feta-arrowheads.mf
diff --git a/mf/feta-braces-a.mf b/mf/feta-braces-a.mf
index e76dde677e..a0d751e4bd 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-beugel;
+input feta-braces;
 end.
diff --git a/mf/feta-braces-b.mf b/mf/feta-braces-b.mf
index f75cad1efd..592aa8d17a 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-beugel;
+input feta-braces;
 end.
diff --git a/mf/feta-braces-c.mf b/mf/feta-braces-c.mf
index b9fc2e6ef1..3593501b24 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-beugel;
+input feta-braces;
 end.
diff --git a/mf/feta-braces-d.mf b/mf/feta-braces-d.mf
index 91d09df0cd..ba6d6d2e4f 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-beugel;
+input feta-braces;
 end.
diff --git a/mf/feta-braces-e.mf b/mf/feta-braces-e.mf
index d8dc911460..ed7ec9ca5f 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-beugel;
+input feta-braces;
 end.
diff --git a/mf/feta-braces-f.mf b/mf/feta-braces-f.mf
index acfc706224..7921b0d956 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-beugel;
+input feta-braces;
 end.
diff --git a/mf/feta-braces-g.mf b/mf/feta-braces-g.mf
index ce5396e965..98858884d3 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-beugel;
+input feta-braces;
 end.
diff --git a/mf/feta-braces-h.mf b/mf/feta-braces-h.mf
index d7b49e5d70..eee219a0de 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-beugel;
+input feta-braces;
 end.
diff --git a/mf/feta-braces-i.mf b/mf/feta-braces-i.mf
index 6f3eba10c5..c362853ba9 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-beugel;
+input feta-braces;
 end.
diff --git a/mf/feta-beugel.mf b/mf/feta-braces.mf
similarity index 99%
rename from mf/feta-beugel.mf
rename to mf/feta-braces.mf
index 47b6d89e9e..c486081a3c 100644
--- a/mf/feta-beugel.mf
+++ b/mf/feta-braces.mf
@@ -81,7 +81,7 @@ def draw_brace (expr height_sharp, width_sharp, slt_sharp, brace_number) =
 		define_pixels (height, width, slt);
 		thin = 2 slt;
 		thick = .5 width;
-	
+
 		z2 = .5 [z1, z3];
 		y3l = y1 + height / 2;
 		x3 = x1 + width;
@@ -95,7 +95,7 @@ def draw_brace (expr height_sharp, width_sharp, slt_sharp, brace_number) =
 		penpos3 (thin, penangle);
 		penpos2 (thick, angle (z3 - z1) - 90);
 		penpos1 (2/3 thin, penangle);
-	
+
 		penlabels (1, 2, 3);
 		labels (0);
 
diff --git a/mf/feta-haak.mf b/mf/feta-brackettips.mf
similarity index 99%
rename from mf/feta-haak.mf
rename to mf/feta-brackettips.mf
index 3fbaf3fbed..458c1d00c4 100644
--- a/mf/feta-haak.mf
+++ b/mf/feta-brackettips.mf
@@ -21,7 +21,7 @@ fet_begingroup ("brackettips");
 def draw_bracket (expr thick_sharp, width_sharp, updown) =
 begingroup;
 	save p, thin, thick, flattening, width, hair, flare;
- 	path p;
+	path p;
 	pair tipdir;
 
 	flattening = 0.72;
diff --git a/mf/feta-klef.mf b/mf/feta-clefs.mf
similarity index 99%
rename from mf/feta-klef.mf
rename to mf/feta-clefs.mf
index 47a515ba20..de4e83c616 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-clefs.mf
@@ -51,7 +51,7 @@ def draw_c_clef (expr reduction) =
 	% stem
 	draw_block ((0, -d + feta_shift),
 		    (3/4 norm + 1/2 hair, h));
- 	draw_block ((3/4 norm + 1/2 hair + hround (3/2 hair), -d + feta_shift),
+	draw_block ((3/4 norm + 1/2 hair + hround (3/2 hair), -d + feta_shift),
 		    (3/4 norm + 1/2 hair + 2 hround (3/2 hair), h));
 
 	% assure symmetry
@@ -381,7 +381,7 @@ def draw_gclef (expr reduction) =
 	z11 = center + whatever * downstroke_dir + (-0.05 reduced_ss, 0);
 
 	penpos11 (thinnib, start_angle + 90);
- 	penpos12 (thinnib, bot_angle + 90);
+	penpos12 (thinnib, bot_angle + 90);
 	penpos13 (thinnib + 0.14 staff_space, 180);
 
 	% this auxiliary point ensures good contour overlapping
@@ -389,7 +389,7 @@ def draw_gclef (expr reduction) =
 
 	z20 = z9l - (0, .25 blot_diameter);
 	penpos20 (blot_diameter, 0);
-	
+
 	pat := z10{down}
 	       .. z6
 	       ..tension 1.1.. z11{dir (start_angle)};
@@ -548,7 +548,7 @@ begingroup;
 endgroup;
 enddef;
 
-	
+
 def draw_tab_A (expr pos, siz, slant) =
 begingroup;
 	save vx, vy, pat;
diff --git a/mf/feta-puntje.mf b/mf/feta-dots.mf
similarity index 100%
rename from mf/feta-puntje.mf
rename to mf/feta-dots.mf
diff --git a/mf/feta-din-code.mf b/mf/feta-dynamics.mf
similarity index 99%
rename from mf/feta-din-code.mf
rename to mf/feta-dynamics.mf
index d8d0c01d80..2fe9b3f1d3 100644
--- a/mf/feta-din-code.mf
+++ b/mf/feta-dynamics.mf
@@ -748,7 +748,7 @@ fet_beginchar ("dynamic r", "r");
 
 %	pickup pencircle scaled 1;
 
-%	draw 
+%	draw
 	fill z1r{down}
 	     .. z10r{left}
 	     -- z10l{left}
diff --git a/mf/feta-banier.mf b/mf/feta-flags.mf
similarity index 100%
rename from mf/feta-banier.mf
rename to mf/feta-flags.mf
diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 2f4471cc8e..8b7080a6fd 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -32,24 +32,24 @@ input feta-params;
 
 font_x_height staff_space#;
 
-%% this is a fallback so we can run the font without including feta-bolletjes.
+%% this is a fallback so we can run the font without including feta-noteheads.
 black_notehead_width# := 1.0 staff_space#;
 
 
 fet_beginfont ("feta", design_size, "fetaMusic");
 
 if test = 0: 
-	input feta-eindelijk;
-	input feta-toevallig;
-	input feta-arrow;
-	input feta-puntje;
-	input feta-bolletjes;
-	input feta-schrift;
-	input feta-banier;
-	input feta-klef;
-	input feta-timesig;
-	input feta-pendaal;
-	input feta-haak;
+	input feta-rests;
+	input feta-accidentals;
+	input feta-arrowheads;
+	input feta-dots;
+	input feta-noteheads;
+	input feta-scripts;
+	input feta-flags;
+	input feta-clefs;
+	input feta-timesignatures;
+	input feta-pedals;
+	input feta-brackettips;
 	input feta-accordion;
 else:
 	input feta-test-generic.mf;
diff --git a/mf/feta-bolletjes.mf b/mf/feta-noteheads.mf
similarity index 99%
rename from mf/feta-bolletjes.mf
rename to mf/feta-noteheads.mf
index cf0659a9bf..851d5e2e62 100644
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-noteheads.mf
@@ -423,7 +423,7 @@ fi;
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-vardef penposx@# (expr d) = 
+vardef penposx@# (expr d) =
 begingroup;
 	save pat;
 	path pat;
@@ -777,7 +777,7 @@ def draw_cross (expr thick) =
 	z4 - z3 = whatever * (ne) + (ne rotated -90) * thickness;
 
 
- 	x1 = charwd / 2 - .5 pen_thick#;
+	x1 = charwd / 2 - .5 pen_thick#;
 	z1 = whatever * ne
 	     + thick / 2 * stafflinethickness# * (ne rotated -90);
 
@@ -1054,7 +1054,7 @@ def draw_do_head (expr width_factor, dir) =
 		 -- (z1 + left_dist){z1 - z3}
 		 .. lft z1{down}
 		 .. {right}cycle;
-		 
+
 
 	labels (1, 2, 3);
 
diff --git a/mf/feta-nummer-code.mf b/mf/feta-numbers.mf
similarity index 99%
rename from mf/feta-nummer-code.mf
rename to mf/feta-numbers.mf
index 471e2955d4..d2c1ef6601 100644
--- a/mf/feta-nummer-code.mf
+++ b/mf/feta-numbers.mf
@@ -270,8 +270,8 @@ fet_beginchar ("Plus", "plus");
 	centerx := hround (w / 2);
 	centery := vround ((h - d) / 2);
 
-	z1 = (centerx - hthick / 2, -d); 
-	z2 = (centerx + hthick / 2, h); 
+	z1 = (centerx - hthick / 2, -d);
+	z2 = (centerx + hthick / 2, h);
 
 	labels (1, 2);
 
@@ -295,7 +295,7 @@ fet_beginchar ("Numeral comma", "comma");
 	       .. (dot_diam / 2, dot_diam)
 	       .. (0, dot_diam / 2)
 	       .. cycle;
-	
+
 	pos = ypart (((w / 3, 0) -- (w / 3, dot_diam / 2))
 		     intersectiontimes pat);
 	z0 = point pos of pat;
diff --git a/mf/feta-pendaal.mf b/mf/feta-pedals.mf
similarity index 99%
rename from mf/feta-pendaal.mf
rename to mf/feta-pedals.mf
index c35c0ce4ec..35c96aae87 100644
--- a/mf/feta-pendaal.mf
+++ b/mf/feta-pedals.mf
@@ -191,7 +191,7 @@ begingroup;
 	horz_corr = 1/5 [x12, x16] - x2l;
 	x2 := x2 + horz_corr;
 	x2l := x2l + horz_corr;
-	x2r := x2r + horz_corr; 
+	x2r := x2r + horz_corr;
 
 	penstroke z1'e
 		  ..tension 2.5.. z2e
diff --git a/mf/feta-eindelijk.mf b/mf/feta-rests.mf
similarity index 98%
rename from mf/feta-eindelijk.mf
rename to mf/feta-rests.mf
index b57f84cec9..84a525b746 100644
--- a/mf/feta-eindelijk.mf
+++ b/mf/feta-rests.mf
@@ -392,7 +392,7 @@ fet_beginchar ("16th rest", "4");
 	y2 = h - vround lower_brush;
 	x2r = w;
 	z2 = z1 + whatever * dir (74);
-       	z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
+	z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
 	y9 := vround y9;
 
 	x1l := hround x1l;
@@ -442,7 +442,7 @@ fet_beginchar ("32th rest", "5");
 	y2 = h - vround lower_brush;
 	x2r = w;
 	z2 = z1 + whatever * dir (76);
-       	z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
+	z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
 	y9 := vround y9;
 
 	x1l := hround x1l;
@@ -496,7 +496,7 @@ fet_beginchar ("64th rest", "6");
 	y2 = h - vround lower_brush;
 	x2r = w;
 	z2 = z1 + whatever * dir (78);
-       	z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
+	z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1) - 10);
 	y9 := vround y9;
 
 	x1l := hround x1l;
@@ -554,7 +554,7 @@ fet_beginchar ("128th rest", "7");
 	y2 = h - vround lower_brush;
 	x2r = w;
 	z2 = z1 + whatever * dir (80);
-       	z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1)- 10);
+	z9 = z2 + 0.5 linethickness * dir (angle (z2 - z1)- 10);
 	y9 := vround y9;
 
 	x1l := hround x1l;
diff --git a/mf/feta-schrift.mf b/mf/feta-scripts.mf
similarity index 99%
rename from mf/feta-schrift.mf
rename to mf/feta-scripts.mf
index 1afbcc21a7..7d76d0f6ea 100644
--- a/mf/feta-schrift.mf
+++ b/mf/feta-scripts.mf
@@ -1452,7 +1452,7 @@ fet_endchar;
 
 
 % Hmm
-input feta-slag;
+input feta-trills;
 
 
 %
@@ -1539,7 +1539,7 @@ fet_beginchar ("Straight caesura", "caesura.straight");
 	y3 = y4 = h;
 
 	ne = unitvector (z4 - z1);
-	
+
 	z1a = z1 + blot_diameter * ne;
 	z1b = z1 + blot_diameter * right;
 	z2a = z2 + blot_diameter * ne;
diff --git a/mf/feta-test-generic.mf b/mf/feta-test-generic.mf
index 1ade03f2c3..c18061b15a 100644
--- a/mf/feta-test-generic.mf
+++ b/mf/feta-test-generic.mf
@@ -3,18 +3,16 @@
 % in a separate file to avoid tainting non-test font files for testing.
 %
 
-%input feta-eindelijk;
-input feta-toevallig;
-%input feta-puntje;
-%input feta-bolletjes;	
-%input feta-arrow;	
-%input feta-schrift;	
-%input feta-schrift;
-%input feta-banier;
-%	input feta-slag;
-%input feta-klef;
-%input feta-haak;
-%	input feta-haak;
-%input feta-timesig;
-%input feta-pendaal;
+%input feta-rests;
+input feta-accidentals;
+%input feta-dots;
+%input feta-noteheads;
+%input feta-arrowheads;
+%input feta-scripts;
+%input feta-flags;
+%input feta-trills;
+%input feta-clefs;
+%input feta-brackettips;
+%input feta-timesignatures;
+%input feta-pedals;
 %input feta-accordion;
diff --git a/mf/feta-timesig.mf b/mf/feta-timesignatures.mf
similarity index 100%
rename from mf/feta-timesig.mf
rename to mf/feta-timesignatures.mf
diff --git a/mf/feta-slag.mf b/mf/feta-trills.mf
similarity index 100%
rename from mf/feta-slag.mf
rename to mf/feta-trills.mf
diff --git a/mf/parmesan-generic.mf b/mf/parmesan-generic.mf
index b886e6c496..36fe12e050 100644
--- a/mf/parmesan-generic.mf
+++ b/mf/parmesan-generic.mf
@@ -38,12 +38,12 @@ font_x_height staff_space#;
 fet_beginfont ("parmesan", design_size, "parmesanMusic");
 	if test = 0:
 		input parmesan-rests;
-		input parmesan-heads;
+		input parmesan-noteheads;
 		input parmesan-clefs;
 		input parmesan-custodes
 		input parmesan-accidentals;
 		input parmesan-flags;
-		input parmesan-timesig;
+		input parmesan-timesignatures;
 		input parmesan-scripts;
 		input parmesan-dots;
 	else:
diff --git a/mf/parmesan-heads.mf b/mf/parmesan-noteheads.mf
similarity index 99%
rename from mf/parmesan-heads.mf
rename to mf/parmesan-noteheads.mf
index 6b993a0904..ef762a2146 100644
--- a/mf/parmesan-heads.mf
+++ b/mf/parmesan-noteheads.mf
@@ -2,10 +2,10 @@
 % This file is part of LilyPond, the GNU music typesetter.
 %
 % Copyright (C) 2001--2009 Juergen Reuter <reuter@ipd.uka.de>
-% 
+%
 % Neo-mensural heads originally by
 % Christian Mondrup and Mats Bengtsson
-% 
+%
 %
 % LilyPond is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -73,7 +73,7 @@ def draw_neomensural_brevis (expr brevwid) =
 
 	set_char_box (0, head_width#,
 		      noteheight# / 2, noteheight# / 2);
-	
+
 	2 beamheight + holeheight = noteheight;
 	serif_size = (holeheight - stafflinethickness) / 2;
 	serif_protrude = 1.5 serif_size;
@@ -172,7 +172,7 @@ def draw_neomensural_longa (expr wid) =
 
 	penpos7 (stem_width, 0);
 	penpos6 (1.2 stem_width, theta);
-	
+
 	z7' = find_tangent (z6l, pat_out,
 			    (x7l + 0.5 stem_width, y7l),
 			    (x7l - 0.5 stem_width, y7l));
@@ -192,7 +192,7 @@ enddef;
 % En wij presenteren U: de opvolgster van Emily
 %
 % (ze is wel breed)
-% 
+%
 fet_beginchar ("Neo-mensural maxima notehead", "sM3neomensural");
 	draw_neomensural_longa (2.6 staff_space#);
 fet_endchar;
@@ -217,7 +217,7 @@ def draw_neomensural_black_head (expr wid, height) =
 
 	set_char_box (0, head_width#,
 		      height / 2, height / 2);
-	
+
 	charwx := head_width# / 2;
 	charwy := height / 2;
 
@@ -261,7 +261,7 @@ def draw_neomensural_open_head (expr wid, height)=
 
 	diamNW = length (z2 - z1) + blot_diameter;
 	diamSW = length (z4 - z1) + blot_diameter;
-	
+
 	save hole_widthNW, hole_widthSW;
 
 	hole_widthNW = 0.34 diamNW ;
@@ -1098,7 +1098,7 @@ vat_punctum_char ("Ed. Vat. pes var lower punctum", "vaticana.vlpes",
 
 
 % pes upper punctum
-vat_punctum_char ("Ed. Vat. pes upper punctum", "vaticana.upes", 
+vat_punctum_char ("Ed. Vat. pes upper punctum", "vaticana.upes",
 		  false, false, true, false,
 		  false, false, false, 1.0);
 
@@ -1115,18 +1115,18 @@ vat_punctum_char ("Ed. Vat. var pes upper punctum", "vaticana.vupes",
 
 
 % small punctum as used in epiphonus
-vat_punctum_char ("Ed. Vat. plica", "vaticana.plica", 
+vat_punctum_char ("Ed. Vat. plica", "vaticana.plica",
 		  false, false, false, false,
 		  false, false, false, 0.6);
 
 
 % small punctum as used in epiphonus
-plica_char ("Ed. Vat. var plica", "vaticana.vplica", 
+plica_char ("Ed. Vat. var plica", "vaticana.vplica",
 	    false, 0.6);
 
 
 % eccentric punctum as used in epiphonus
-epiphonus_char ("Ed. Vat. epiphonus", "vaticana.epiphonus", 
+epiphonus_char ("Ed. Vat. epiphonus", "vaticana.epiphonus",
 		false, true, false, 1.0);
 
 
@@ -1398,7 +1398,7 @@ enddef;
 
 
 % punctum
-med_punctum_char ("Ed. Med. punctum", "medicaea.punctum", 
+med_punctum_char ("Ed. Med. punctum", "medicaea.punctum",
 		  false, false);
 
 
@@ -1408,7 +1408,7 @@ med_punctum_char ("Ed. Med. reverse virga", "medicaea.rvirga",
 
 
 % virga (i.e. left down-stemmed punctum)
-med_punctum_char ("Ed. Med. virga", "medicaea.virga", 
+med_punctum_char ("Ed. Med. virga", "medicaea.virga",
 		  false, true);
 
 
diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesignatures.mf
similarity index 99%
rename from mf/parmesan-timesig.mf
rename to mf/parmesan-timesignatures.mf
index faafe0fd87..c4e7937a1e 100644
--- a/mf/parmesan-timesig.mf
+++ b/mf/parmesan-timesignatures.mf
@@ -4,7 +4,7 @@
 % Copyright (C) 1998--2009 Mats Bengtsson <matsb@s3.kth.se>,
 %		 Christian Mondrup <scancm@biobase.dk>
 % Copyright (C) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
-% 
+%
 %
 % LilyPond is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -217,7 +217,7 @@ mensural_timesig ("Mensural 6/8 meter", "mensural68",
 mensural_timesig ("Mensural 9/8 meter", "mensural98",
 		  true, false, true, true);
 
-	
+
 %% tempus imperfectum cum prolatione imperfecta diminutio simplex
 mensural_timesig ("Mensural 4/8 meter", "mensural48",
 		  false, true, false, false);
@@ -387,7 +387,7 @@ neomensural_timesig ("Mensural 6/8 meter", "neomensural68",
 neomensural_timesig ("Mensural 9/8 meter", "neomensural98",
 		     true, false, true, true);
 
-	
+
 %% tempus imperfectum cum prolatione imperfecta diminutio simplex
 neomensural_timesig ("Mensural 4/8 meter", "neomensural48",
 		     false, true, false, false);
-- 
2.39.2