rename feta-alphabet to feta-alphabet-generic

[lilypond.git] / mf / feta-sharps.mf

diff --git a/mf/feta-sharps.mf b/mf/feta-sharps.mf
index 7ea3dcdddb4489a152c1bb44c7625b2644f5e740..46937f9e4d47c44461791a3e34bdd38913fc4bfc 100644 (file)
--- a/mf/feta-sharps.mf
+++ b/mf/feta-sharps.mf
@@ -114,9 +114,7 @@ def draw_sharp(expr arrowup, arrowdown) =
                            stafflinethickness / 2 + stemwidth / 2, true);
        fi;
 
-       remember_pic := currentpicture;
-
-       draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2);
 enddef;
 
 
@@ -125,33 +123,21 @@ fet_beginchar ("Sharp", "sharp");
 fet_endchar;
 
 
-draw_shifted_too;
-
-
 fet_beginchar ("Arrowed Sharp (arrow up)", "sharp.arrowup");
        draw_sharp (true, false);
 fet_endchar;
 
 
-draw_shifted_too;
-
-
 fet_beginchar ("Arrowed Sharp (arrow down)", "sharp.arrowdown");
        draw_sharp (false, true);
 fet_endchar;
 
 
-draw_shifted_too;
-
-
 fet_beginchar ("Arrowed Sharp (arrows up and down)", "sharp.arrowboth");
        draw_sharp (true, true);
 fet_endchar;
 
 
-draw_shifted_too;
-
-
 fet_beginchar ("1/2 Sharp", "sharp.slashslash.stem");
        save stem, stemwidth;
        save outer_space, interbeam;
@@ -183,15 +169,10 @@ fet_beginchar ("1/2 Sharp", "sharp.slashslash.stem");
 
        draw_gridline (z5, z6, stemwidth);
 
-       remember_pic := currentpicture;
-
-       draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2);
 fet_endchar;
 
 
-draw_shifted_too;
-
-
 fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem");
        save stem, stemx, stemwidth;
        save outer_space, interbeam;
@@ -233,15 +214,10 @@ fet_beginchar ("Sharp (3 beams)", "sharp.slashslashslash.stemstem");
        draw_gridline (z5, z6, stemwidth);
        draw_gridline (z7, z8, stemwidth);
 
-       remember_pic := currentpicture;
-
-       draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2);
 fet_endchar;
 
 
-draw_shifted_too;
-
-
 fet_beginchar ("1/2 Sharp (3 beams)", "sharp.slashslashslash.stem");
        save stem, stemx, stemwidth;
        save outer_space, interbeam;
@@ -277,15 +253,10 @@ fet_beginchar ("1/2 Sharp (3 beams)", "sharp.slashslashslash.stem");
 
        draw_gridline (z5, z6, stemwidth);
 
-       remember_pic := currentpicture;
-
-       draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2);
 fet_endchar;
 
 
-draw_shifted_too;
-
-
 fet_beginchar ("3/4 Sharp", "sharp.slashslash.stemstemstem");
        save stem, stemx, stemwidth;
        save outer_space, interbeam;
@@ -326,15 +297,10 @@ fet_beginchar ("3/4 Sharp", "sharp.slashslash.stemstemstem");
        draw_gridline (z7, z8, stemwidth);
        draw_gridline (z9, z10, stemwidth);
 
-       remember_pic := currentpicture;
-
-       draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2);
 fet_endchar;
 
 
-draw_shifted_too;
-
-
 fet_beginchar ("Double Sharp", "doublesharp");
        save klaverblad, klaversteel;
        save pat;
@@ -383,10 +349,5 @@ fet_beginchar ("Double Sharp", "doublesharp");
        % ugh
        currentpicture := currentpicture shifted (hround (w / 2), 0);
 
-       remember_pic := currentpicture;
-
-       draw_staff (-2, 2, 0);
+        draw_staff_if_debugging (-2, 2);
 fet_endchar;
-
-
-draw_shifted_too;