font: rename draw_staff to draw_staff_if_debugging

Previous name was confusing: the stafflines are actually
not drawn unless 'test' is set to non-zero value.

12 files changed, 98 insertions, 98 deletions

diff --git a/mf/feta-accidentals.mf b/mf/feta-accidentals.mf
index ed7bde2d47..ca728f1949 100644
--- a/mf/feta-accidentals.mf
+++ b/mf/feta-accidentals.mf
@@ -27,7 +27,7 @@ if test > 0:
 		set_char_box (0, 0, 0, 0);
 		currentpicture := remember_pic;
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 enddef;
diff --git a/mf/feta-clefs.mf b/mf/feta-clefs.mf
index d76b341453..fcf4a08c43 100644
--- a/mf/feta-clefs.mf
+++ b/mf/feta-clefs.mf
@@ -105,7 +105,7 @@ def draw_c_clef (expr reduction) =
 
 	% ugh, should be bulb, not flare?
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 enddef;
 
 
@@ -270,7 +270,7 @@ def draw_bass_clef (expr exact_center, reduction) =
 
 	penlabels (1, 2, 3, 4, 5, 6);
 
-	draw_staff (-3, 1, 0);
+	draw_staff_if_debugging (-3, 1, 0);
 enddef;
 
 
@@ -482,7 +482,7 @@ def draw_gclef (expr reduction) =
 	penlabels (range 101 thru 121);
 	penlabels (110', 111');
 
-	draw_staff (-1, 3, 0);
+	draw_staff_if_debugging (-1, 3, 0);
 enddef;
 
 
@@ -522,7 +522,7 @@ def draw_percussion_clef (expr reduction) =
 	draw_block ((-b, -d), (-b + razt, h));
 	draw_block ((w - razt, -d), (w, h));
 
-	draw_staff (-3, 1, 1);
+	draw_staff_if_debugging (-3, 1, 1);
 enddef;
 
 
@@ -729,7 +729,7 @@ def draw_tab_clef (expr reduction) =
 	draw_tab_B ((-b + .025 reduced_ss, -d),
 		    (2.1 reduced_ss, letterheight), 0.25);
 
-	draw_staff (-3, 2, 0.5);
+	draw_staff_if_debugging (-3, 2, 0.5);
 enddef;
 
 
diff --git a/mf/feta-flats.mf b/mf/feta-flats.mf
index 75e1580115..e7b3402df2 100644
--- a/mf/feta-flats.mf
+++ b/mf/feta-flats.mf
@@ -189,7 +189,7 @@ fet_beginchar ("Flat", "flat");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -203,7 +203,7 @@ fet_beginchar ("Arrowed Flat (arrow up)", "flat.arrowup");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -217,7 +217,7 @@ fet_beginchar ("Arrowed Flat (arrow down)", "flat.arrowdown");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -231,7 +231,7 @@ fet_beginchar ("Arrowed Flat (arrow up and down)", "flat.arrowboth");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -273,7 +273,7 @@ fet_beginchar ("Flat (slashed)", "flat.slash");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -333,7 +333,7 @@ fet_beginchar ("Flat (slashed twice)", "flat.slashslash");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -449,7 +449,7 @@ fet_beginchar ("Flatflat (mirrored)", "mirroredflat.flat");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -562,7 +562,7 @@ fet_beginchar ("3/4 Flat", "flatflat.slash");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf
index c464c3f7f8..9d8d697108 100644
--- a/mf/feta-macros.mf
+++ b/mf/feta-macros.mf
@@ -50,7 +50,7 @@ def treq =
 enddef;
 
 
-def draw_staff (expr first, last, offset) =
+def draw_staff_if_debugging (expr first, last, offset) =
 	if test <> 0:
 		pickup pencircle scaled stafflinethickness;
 
diff --git a/mf/feta-naturals.mf b/mf/feta-naturals.mf
index 73cde21c97..aca7d3b5cf 100644
--- a/mf/feta-naturals.mf
+++ b/mf/feta-naturals.mf
@@ -128,7 +128,7 @@ def draw_natural (expr arrowup, arrowdown) =
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2, 0);
 enddef;
 
 
diff --git a/mf/feta-noteheads.mf b/mf/feta-noteheads.mf
index 82abf14e54..3d61ce49c3 100644
--- a/mf/feta-noteheads.mf
+++ b/mf/feta-noteheads.mf
@@ -159,14 +159,14 @@ enddef;
 fet_beginchar ("Longa notehead", "uM2");
 	draw_longa (true);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
 fet_beginchar ("Longa notehead", "dM2");
 	draw_longa (false);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -174,14 +174,14 @@ if test > 0:
 	fet_beginchar ("Longa notehead", "uM2");
 		draw_longa (true);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 
 
 	fet_beginchar ("Longa notehead", "dM2");
 		draw_longa (false);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -253,7 +253,7 @@ enddef;
 fet_beginchar ("Brevis notehead", "sM1");
 	draw_brevis (1, 1);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -261,7 +261,7 @@ if test > 0:
 	fet_beginchar ("Brevis notehead", "sM1");
 		draw_brevis(1, 1);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -269,7 +269,7 @@ fi;
 fet_beginchar ("Double-lined brevis notehead", "sM1double");
 	draw_brevis (2, 0.8);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -277,7 +277,7 @@ if test > 0:
 	fet_beginchar ("Double-lined brevis notehead", "sM1double");
 		draw_brevis (2, 0.8);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -289,7 +289,7 @@ fet_beginchar ("Whole notehead", "s0");
 
 	whole_notehead_width# := charwd;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -300,7 +300,7 @@ if test > 0:
 		undraw_inside_ellipse (1.30, 125 - puff_up_factor * 10,
 				       0.68, 2 stafflinethickness#);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -311,7 +311,7 @@ fet_beginchar ("Half notehead", "s1");
 
 	half_notehead_width# := charwd;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -322,14 +322,14 @@ if test > 0:
 		undraw_inside_ellipse (3.25, 33, 0.81,
 				       2.5 stafflinethickness#);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
 
 fet_beginchar ("Quarter notehead", "s2");
 	draw_quarter_path;
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -338,7 +338,7 @@ if test > 0:
 		draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31,
 				      0.707, 0);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -351,7 +351,7 @@ fet_beginchar ("Whole diamondhead", "s0diamond");
 	undraw_inside_ellipse (1.30, 125, 0.6,
 			       .4 staff_space# + stafflinethickness#);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -361,7 +361,7 @@ if test > 0:
 		undraw_inside_ellipse (1.30, 125, 0.6,
 				       .4 staff_space# + stafflinethickness#);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -371,7 +371,7 @@ fet_beginchar ("Half diamondhead", "s1diamond");
 	undraw_inside_ellipse (3.5, 33, 0.80,
 			       .3 staff_space# + 1.5 stafflinethickness#);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -382,7 +382,7 @@ if test > 0:
 				       .3 staff_space#
 				       + 1.5 stafflinethickness#);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -390,7 +390,7 @@ fi;
 fet_beginchar ("Quarter diamondhead", "s2diamond");
 	draw_outside_ellipse (1.80, 35, 0.495, -0.25);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -398,7 +398,7 @@ if test > 0:
 	fet_beginchar ("Quarter diamondhead", "s2diamond");
 		draw_outside_ellipse (1.80, 35, 0.495, -0.25);
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -561,7 +561,7 @@ enddef;
 fet_beginchar ("Whole trianglehead", "s0triangle");
 	draw_whole_triangle_head;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -569,7 +569,7 @@ if test > 0:
 	fet_beginchar ("Whole trianglehead", "s0triangle");
 		draw_whole_triangle_head;
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -595,14 +595,14 @@ enddef;
 fet_beginchar ("Half trianglehead (downstem)", "d1triangle");
 	draw_small_triangle_head (-1);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
 fet_beginchar ("Half trianglehead (upstem)", "u1triangle");
 	draw_small_triangle_head (1);
 
-	draw_staff (-2, 2, 0.5);
+	draw_staff_if_debugging (-2, 2, 0.5);
 fet_endchar;
 
 
@@ -623,14 +623,14 @@ enddef;
 fet_beginchar ("Quarter trianglehead (upstem)", "u2triangle");
 	draw_closed_triangle_head (1);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
 fet_beginchar ("Quarter trianglehead (downstem)", "d2triangle");
 	draw_closed_triangle_head (-1);
 
-	draw_staff (-2, 2, 0.5);
+	draw_staff_if_debugging (-2, 2, 0.5);
 fet_endchar;
 
 
@@ -707,21 +707,21 @@ enddef;
 fet_beginchar ("Whole slashhead", "s0slash");
 	draw_slash (4 slash_thick# + 0.5 staff_space#);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
 fet_beginchar ("Half slashhead", "s1slash");
 	draw_slash (3.0 slash_thick# + 0.15 staff_space#);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
 fet_beginchar ("Quarter slashhead", "s2slash");
 	draw_slash (1.5 slash_thick#);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -837,7 +837,7 @@ fet_beginchar ("Whole Crossed notehead", "s0cross");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -852,7 +852,7 @@ if test > 0:
 
 		currentpicture := remember_pic;
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -869,7 +869,7 @@ fet_beginchar ("Half Crossed notehead", "s1cross");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -884,7 +884,7 @@ if test > 0:
 
 		currentpicture := remember_pic;
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -898,7 +898,7 @@ fet_beginchar ("Crossed notehead", "s2cross");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -910,7 +910,7 @@ if test > 0:
 
 		currentpicture := remember_pic;
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -962,7 +962,7 @@ fet_beginchar ("X-Circled notehead", "s2xcircle");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -978,7 +978,7 @@ if test > 0:
 
 		currentpicture := remember_pic;
 
-		draw_staff (-2, 2, 0.5);
+		draw_staff_if_debugging (-2, 2, 0.5);
 	fet_endchar;
 fi;
 
@@ -1634,7 +1634,7 @@ def draw_sol_head (expr filled) =
 	if not filled:
 	  undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#);
 	fi
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 enddef;
 
 fet_beginchar ("Whole solhead", "s0sol");
@@ -2253,7 +2253,7 @@ begingroup
 	if not filled:
 	  undraw_inside_ellipse (1.9, 33, 0.74, 5.5 stafflinethickness#);
 	fi
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 endgroup
 enddef;
 
diff --git a/mf/feta-parenthesis.mf b/mf/feta-parenthesis.mf
index 8f019d553f..a780ee9c30 100644
--- a/mf/feta-parenthesis.mf
+++ b/mf/feta-parenthesis.mf
@@ -33,7 +33,7 @@ fet_beginchar ("Right Parenthesis", "rightparen");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
diff --git a/mf/feta-rests.mf b/mf/feta-rests.mf
index 09439853a0..1ba2807bef 100644
--- a/mf/feta-rests.mf
+++ b/mf/feta-rests.mf
@@ -43,7 +43,7 @@ fet_beginchar ("whole rest", "0");
 	currentpicture := currentpicture
 			    shifted (0, -block_rest_y + feta_space_shift);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -52,7 +52,7 @@ fet_beginchar ("half rest", "1");
 
 	block_rest;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -73,7 +73,7 @@ fet_beginchar ("whole rest (outside staff)", "0o");
 	rt x6 = w + block_rest_y;
 	draw_gridline (z5, z6, ledgerlinethickness_rounded);
 
-	draw_staff (-2, 2, -3);
+	draw_staff_if_debugging (-2, 2, -3);
 fet_endchar;
 
 
@@ -91,7 +91,7 @@ fet_beginchar ("half rest (outside staff)", "1o");
 
 	draw_gridline (z5, z6, ledgerlinethickness_rounded);
 
-	draw_staff (-2, 2, 3);
+	draw_staff_if_debugging (-2, 2, 3);
 fet_endchar;
 
 
@@ -103,7 +103,7 @@ fet_beginchar ("maxima rest", "M3");
 
 	addto currentpicture also currentpicture shifted (2 breve_rest_x, 0);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -113,7 +113,7 @@ fet_beginchar ("longa rest", "M2");
 	draw_block ((0, -breve_rest_y + feta_shift),
 		    (breve_rest_x, breve_rest_y));
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -122,7 +122,7 @@ fet_beginchar ("breve rest", "M1");
 
 	draw_block ((0, 0), (breve_rest_x, breve_rest_y));
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 fet_beginchar ("breve rest (outside staff)", "M1o");
@@ -140,7 +140,7 @@ fet_beginchar ("breve rest (outside staff)", "M1o");
 	draw_gridline (z5, z6, ledgerlinethickness_rounded);
 	draw_gridline ((x5, 0), (x6, 0), ledgerlinethickness_rounded);
 
-	draw_staff (-2, 2, 3);
+	draw_staff_if_debugging (-2, 2, 3);
 fet_endchar;
 
 
@@ -226,7 +226,7 @@ fet_beginchar ("Quarter rest", "2");
 	penlabels (1, 2, 3, 4, 5, 6, 7);
 	penlabels (10, 11, 12, 13);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -374,7 +374,7 @@ def draw_eighth_rest (expr show_labels) =
 	     -- z1l
 	     .. cycle;
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 enddef;
 
 
@@ -440,7 +440,7 @@ fet_beginchar ("16th rest", "4");
 	penlabels (1, 2);
 	labels (9);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -494,7 +494,7 @@ fet_beginchar ("32th rest", "5");
 	penlabels (1, 2);
 	labels (9);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -552,7 +552,7 @@ fet_beginchar ("64th rest", "6");
 	penlabels (1, 2);
 	labels (9);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -614,7 +614,7 @@ fet_beginchar ("128th rest", "7");
 	penlabels (1, 2);
 	labels (9);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
diff --git a/mf/feta-scripts.mf b/mf/feta-scripts.mf
index 91c3ae1fe4..52a07209f1 100644
--- a/mf/feta-scripts.mf
+++ b/mf/feta-scripts.mf
@@ -1277,7 +1277,7 @@ fet_beginchar ("Varied Segno", "varsegno");
 	addto currentpicture also currentpicture scaled -1;
 
 	penlabels (1, 1', 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
-	% draw_staff (-2, 2, 0);
+	% draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -1495,7 +1495,7 @@ fet_beginchar ("Arpeggio", "arpeggio");
 	draw_arpeggio;
 	penlabels (range 1 thru 9);
 
-	draw_staff (-2, 2, 0.0);
+	draw_staff_if_debugging (-2, 2, 0.0);
 	endgroup;
 fet_endchar;
 
diff --git a/mf/feta-sharps.mf b/mf/feta-sharps.mf
index 7ea3dcdddb..d2ecd2d277 100644
--- a/mf/feta-sharps.mf
+++ b/mf/feta-sharps.mf
@@ -116,7 +116,7 @@ def draw_sharp(expr arrowup, arrowdown) =
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2, 0);
 enddef;
 
 
@@ -185,7 +185,7 @@ fet_beginchar ("1/2 Sharp", "sharp.slashslash.stem");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -235,7 +235,7 @@ fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -279,7 +279,7 @@ fet_beginchar ("1/2 Sharp (3 beams)", "sharp.slashslashslash.stem");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -328,7 +328,7 @@ fet_beginchar ("3/4 Sharp", "sharp.slashslash.stemstemstem");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
@@ -385,7 +385,7 @@ fet_beginchar ("Double Sharp", "doublesharp");
 
 	remember_pic := currentpicture;
 
-	draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2, 0);
 fet_endchar;
 
 
diff --git a/mf/feta-timesignatures.mf b/mf/feta-timesignatures.mf
index 0098f0ad42..81daa8f428 100644
--- a/mf/feta-timesignatures.mf
+++ b/mf/feta-timesignatures.mf
@@ -90,7 +90,7 @@ def draw_C =
 
 	penlabels (1, 2, 3, 4, 5);
 
-	draw_staff (-2, 2, 0);
+	draw_staff_if_debugging (-2, 2, 0);
 enddef;
 
 
diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf
index ec6561dc8e..fd2f4d7cbd 100644
--- a/mf/parmesan-clefs.mf
+++ b/mf/parmesan-clefs.mf
@@ -126,7 +126,7 @@ enddef;
 
 fet_beginchar ("Ed. Vat. do clef", "vaticana.do");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_vaticana_do_clef ((0, 0), 1.0);
 fet_endchar;
@@ -195,7 +195,7 @@ enddef;
 
 fet_beginchar ("Ed. Vat. fa clef", "vaticana.fa");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_vaticana_fa_clef ((0, 0), 1.0);
 fet_endchar;
@@ -283,7 +283,7 @@ enddef;
 
 fet_beginchar ("Ed. Med. do clef", "medicaea.do");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_medicaea_do_clef ((0, 0), 1.0);
 fet_endchar;
@@ -353,7 +353,7 @@ enddef;
 
 fet_beginchar ("Ed. Med. fa clef", "medicaea.fa");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_medicaea_fa_clef ((0, 0), 1.0);
 fet_endchar;
@@ -590,7 +590,7 @@ enddef;
 
 fet_beginchar ("neo-mensural c clef", "neomensural.c");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_neomensural_c_clef ((0, 0), 1.0);
 fet_endchar;
@@ -697,7 +697,7 @@ enddef;
 
 fet_beginchar ("petrucci c1 clef", "petrucci.c1");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_petrucci_c_clef ((0, 0), +2, 1.0);
 fet_endchar;
@@ -710,7 +710,7 @@ fet_endchar;
 
 fet_beginchar ("petrucci c2 clef", "petrucci.c2");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_petrucci_c_clef ((0, 0), +1, 1.0);
 fet_endchar;
@@ -723,7 +723,7 @@ fet_endchar;
 
 fet_beginchar ("petrucci c3 clef", "petrucci.c3");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_petrucci_c_clef ((0, 0), 0, 1.0);
 fet_endchar;
@@ -736,7 +736,7 @@ fet_endchar;
 
 fet_beginchar ("petrucci c4 clef", "petrucci.c4");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_petrucci_c_clef ((0, 0), -1, 1.0);
 fet_endchar;
@@ -749,7 +749,7 @@ fet_endchar;
 
 fet_beginchar ("petrucci c5 clef", "petrucci.c5");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_petrucci_c_clef ((0, 0), -2, 1.0);
 fet_endchar;
@@ -841,7 +841,7 @@ enddef;
 
 fet_beginchar ("mensural c clef", "mensural.c");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_mensural_c_clef ((0, 0), 1.0, true);
 fet_endchar;
@@ -854,7 +854,7 @@ fet_endchar;
 
 fet_beginchar ("black mensural c clef", "blackmensural.c");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_mensural_c_clef ((0, 0), 1.0, false);
 fet_endchar;
@@ -1035,7 +1035,7 @@ enddef;
 
 fet_beginchar ("petrucci f clef", "petrucci.f");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_petrucci_f_clef ((0, 0), 1.0);
 fet_endchar;
@@ -1143,7 +1143,7 @@ enddef;
 
 fet_beginchar ("mensural f clef", "mensural.f");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_mensural_f_clef ((0, 0), 1.0);
 fet_endchar;
@@ -1375,7 +1375,7 @@ enddef;
 
 fet_beginchar ("petrucci g clef", "petrucci.g");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_petrucci_g_clef ((0, 0), 1.0);
 fet_endchar;
@@ -1409,7 +1409,7 @@ enddef;
 %
 fet_beginchar ("mensural g clef", "mensural.g");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_petrucci_g_clef ((0, 0), 1.0);
 fet_endchar;
@@ -1500,7 +1500,7 @@ enddef;
 
 fet_beginchar ("Hufnagel do clef", "hufnagel.do");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_hufnagel_do_clef ((0, 0), 1.0);
 fet_endchar;
@@ -1596,7 +1596,7 @@ enddef;
 
 fet_beginchar ("Hufnagel fa clef", "hufnagel.fa");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_hufnagel_fa_clef ((0, 0), 1.0);
 fet_endchar;
@@ -1620,7 +1620,7 @@ enddef;
 
 fet_beginchar ("Hufnagel do/fa clef", "hufnagel.do.fa");
 	if test = 1:
-		draw_staff (-1, 3, 0.0);
+		draw_staff_if_debugging (-1, 3, 0.0);
 	fi;
 	draw_hufnagel_do_fa_clef ((0, 0), 1.0);
 fet_endchar;