From d178ef82270a4fce341602a5469f1505b1720ec7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Janek=20Warcho=C5=82?= Date: Fri, 6 Dec 2013 17:45:59 +0100 Subject: [PATCH] font: clean up staffline-display in testing mode Previous testing code was a mix of hideous copy&paste with non-obvious passing glyph outlines around, which attempted to produce additional glyphs in testing mode, so that there would be both on-staffline and on-staffspace variations. That code was completely unreadable and unmaintainable. Instead i've introduced a global variable that determines how the stafflines will be printed relative to the glyphs. To see alternative configuration, just change that value. --- mf/debugging-settings.mf | 14 ++ mf/feta-accidentals.mf | 18 --- mf/feta-alphabet.mf | 1 - mf/feta-clefs.mf | 10 +- mf/feta-flags-generic.mf | 4 - mf/feta-flags11.mf | 3 - mf/feta-flags13.mf | 3 - mf/feta-flags14.mf | 3 - mf/feta-flags16.mf | 3 - mf/feta-flags18.mf | 3 - mf/feta-flags20.mf | 3 - mf/feta-flags23.mf | 3 - mf/feta-flags26.mf | 3 - mf/feta-flats.mf | 62 ++------- mf/feta-generic.mf | 4 - mf/feta-macros.mf | 8 +- mf/feta-naturals.mf | 17 +-- mf/feta-noteheads-generic.mf | 4 - mf/feta-noteheads.mf | 232 ++++--------------------------- mf/feta-noteheads11.mf | 3 - mf/feta-noteheads13.mf | 3 - mf/feta-noteheads14.mf | 3 - mf/feta-noteheads16.mf | 3 - mf/feta-noteheads18.mf | 3 - mf/feta-noteheads20.mf | 3 - mf/feta-noteheads23.mf | 3 - mf/feta-noteheads26.mf | 3 - mf/feta-parenthesis.mf | 7 +- mf/feta-rests.mf | 28 ++-- mf/feta-scripts.mf | 3 +- mf/feta-sharps.mf | 51 +------ mf/feta-timesignatures.mf | 2 +- mf/feta11.mf | 2 - mf/feta13.mf | 2 - mf/feta14.mf | 2 - mf/feta16.mf | 2 - mf/feta18.mf | 2 - mf/feta20.mf | 1 - mf/feta23.mf | 2 - mf/feta26.mf | 2 - mf/parmesan-clefs.mf | 76 +++------- mf/parmesan-generic.mf | 4 - mf/parmesan-noteheads-generic.mf | 4 - mf/parmesan-noteheads11.mf | 3 - mf/parmesan-noteheads13.mf | 3 - mf/parmesan-noteheads14.mf | 3 - mf/parmesan-noteheads16.mf | 3 - mf/parmesan-noteheads18.mf | 3 - mf/parmesan-noteheads20.mf | 3 - mf/parmesan-noteheads23.mf | 3 - mf/parmesan-noteheads26.mf | 3 - mf/parmesan11.mf | 2 - mf/parmesan13.mf | 2 - mf/parmesan14.mf | 2 - mf/parmesan16.mf | 2 - mf/parmesan18.mf | 2 - mf/parmesan20.mf | 2 - mf/parmesan23.mf | 2 - mf/parmesan26.mf | 2 - 59 files changed, 102 insertions(+), 550 deletions(-) create mode 100644 mf/debugging-settings.mf diff --git a/mf/debugging-settings.mf b/mf/debugging-settings.mf new file mode 100644 index 0000000000..e867713461 --- /dev/null +++ b/mf/debugging-settings.mf @@ -0,0 +1,14 @@ + +% Used for example to print glyphs with stafflines +test := 0; + +if test = -1: + % TODO: what's this? Seems to be broken... + mode := smoke; +fi; + +% change this to 0.5 to have glyphs positioned on +% staff spaces instead of stafflines in testing mode +% (useful e.g. to check how accidentals visually interact +% with stafflines in different configurations). +stafflines_y_offset := 0; diff --git a/mf/feta-accidentals.mf b/mf/feta-accidentals.mf index ca728f1949..ef689c9d68 100644 --- a/mf/feta-accidentals.mf +++ b/mf/feta-accidentals.mf @@ -18,21 +18,6 @@ % along with LilyPond. If not, see . -% -% also show in other configuration wrt staff lines. -% -def draw_shifted_too = -if test > 0: - fet_beginchar ("shifted too", ""); - set_char_box (0, 0, 0, 0); - currentpicture := remember_pic; - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; -enddef; - - % % Accidentals from various sources, notably % @@ -57,9 +42,6 @@ enddef; fet_begingroup ("accidentals"); -save remember_pic; -picture remember_pic; - input feta-arrow; input feta-sharps; diff --git a/mf/feta-alphabet.mf b/mf/feta-alphabet.mf index 5663a791b7..e8e549ac78 100644 --- a/mf/feta-alphabet.mf +++ b/mf/feta-alphabet.mf @@ -1,4 +1,3 @@ -test := 0; staffsize# := design_size * pt#; diff --git a/mf/feta-clefs.mf b/mf/feta-clefs.mf index fcf4a08c43..2b79030ae5 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_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; @@ -270,7 +270,7 @@ def draw_bass_clef (expr exact_center, reduction) = penlabels (1, 2, 3, 4, 5, 6); - draw_staff_if_debugging (-3, 1, 0); + draw_staff_if_debugging (-3, 1); enddef; @@ -482,7 +482,7 @@ def draw_gclef (expr reduction) = penlabels (range 101 thru 121); penlabels (110', 111'); - draw_staff_if_debugging (-1, 3, 0); + draw_staff_if_debugging (-1, 3); 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_if_debugging (-3, 1, 1); + draw_staff_if_debugging (-3, 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_if_debugging (-3, 2, 0.5); + draw_staff_if_debugging (-3, 2); enddef; diff --git a/mf/feta-flags-generic.mf b/mf/feta-flags-generic.mf index 947cc8a35a..64042220f4 100644 --- a/mf/feta-flags-generic.mf +++ b/mf/feta-flags-generic.mf @@ -17,10 +17,6 @@ % along with LilyPond. If not, see . -if test = -1: - mode := smoke; -fi - staffsize# := design_size * pt#; mode_setup; diff --git a/mf/feta-flags11.mf b/mf/feta-flags11.mf index 30cd7f0976..bf199c6e69 100644 --- a/mf/feta-flags11.mf +++ b/mf/feta-flags11.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 11.22; -test := 0; - - input feta-flags-generic; end. diff --git a/mf/feta-flags13.mf b/mf/feta-flags13.mf index 3210b1abc1..4982c0aec2 100644 --- a/mf/feta-flags13.mf +++ b/mf/feta-flags13.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 12.60; -test := 0; - - input feta-flags-generic; end. diff --git a/mf/feta-flags14.mf b/mf/feta-flags14.mf index 9a5449cc5d..6ef0d6fe5e 100644 --- a/mf/feta-flags14.mf +++ b/mf/feta-flags14.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 14.14; -test := 0; - - input feta-flags-generic; end. diff --git a/mf/feta-flags16.mf b/mf/feta-flags16.mf index d02993736a..8e23c9c297 100644 --- a/mf/feta-flags16.mf +++ b/mf/feta-flags16.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 15.87; -test := 0; - - input feta-flags-generic; end. diff --git a/mf/feta-flags18.mf b/mf/feta-flags18.mf index dcaefd440d..b69f9e7bca 100644 --- a/mf/feta-flags18.mf +++ b/mf/feta-flags18.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 17.82; -test := 0; - - input feta-flags-generic; end. diff --git a/mf/feta-flags20.mf b/mf/feta-flags20.mf index b7b834ecc4..f56676845b 100644 --- a/mf/feta-flags20.mf +++ b/mf/feta-flags20.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 20; -test := 0; - - input feta-flags-generic; end. diff --git a/mf/feta-flags23.mf b/mf/feta-flags23.mf index dcd640c8a9..e51988d2e0 100644 --- a/mf/feta-flags23.mf +++ b/mf/feta-flags23.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 22.45; -test := 0; - - input feta-flags-generic; end. diff --git a/mf/feta-flags26.mf b/mf/feta-flags26.mf index b2a1fe616f..a3276c1ad0 100644 --- a/mf/feta-flags26.mf +++ b/mf/feta-flags26.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 25.20; -test := 0; - - input feta-flags-generic; end. diff --git a/mf/feta-flats.mf b/mf/feta-flats.mf index e7b3402df2..b7470e2fec 100644 --- a/mf/feta-flats.mf +++ b/mf/feta-flats.mf @@ -187,57 +187,37 @@ fet_beginchar ("Flat", "flat"); false, false); penlabels (range 0 thru 11); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -draw_shifted_too; - - fet_beginchar ("Arrowed Flat (arrow up)", "flat.arrowup"); - draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, - true, false); - penlabels (range 0 thru 23); - - remember_pic := currentpicture; + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + true, false); + penlabels (range 0 thru 23); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -draw_shifted_too; - - fet_beginchar ("Arrowed Flat (arrow down)", "flat.arrowdown"); - draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, - false, true); - penlabels (range 0 thru 23); - - remember_pic := currentpicture; + draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, + false, true); + penlabels (range 0 thru 23); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -draw_shifted_too; - - fet_beginchar ("Arrowed Flat (arrow up and down)", "flat.arrowboth"); draw_arrowed_meta_flat (0, 0.8 staff_space#, 0.31 staff_space, true, true); penlabels (range 0 thru 23); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -draw_shifted_too; - - fet_beginchar ("Flat (slashed)", "flat.slash"); set_char_box (.4 staff_space#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); @@ -271,9 +251,7 @@ fet_beginchar ("Flat (slashed)", "flat.slash"); penlabels (12, 13); labels (14, 15); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -331,9 +309,7 @@ fet_beginchar ("Flat (slashed twice)", "flat.slashslash"); penlabels (22, 23); labels (24, 25); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -447,15 +423,10 @@ fet_beginchar ("Flatflat (mirrored)", "mirroredflat.flat"); currentpicture := currentpicture shifted (w/2, 0); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -draw_shifted_too; - - fet_beginchar ("Semi flat", "mirroredflat"); set_char_box (1.2 stafflinethickness#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#); @@ -560,10 +531,5 @@ fet_beginchar ("3/4 Flat", "flatflat.slash"); penlabels (12, 13); labels (14, 15); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; - - -draw_shifted_too; diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index b18e0c9288..e0d008bb2f 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -17,10 +17,6 @@ % along with LilyPond. If not, see . -if test = -1: - mode := smoke; -fi - staffsize# := design_size * pt#; mode_setup; diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf index 9d8d697108..9a695225fb 100644 --- a/mf/feta-macros.mf +++ b/mf/feta-macros.mf @@ -21,6 +21,8 @@ % debugging % +input debugging-settings.mf + def print_penpos (suffix $) = message "z" & str$ & "l = (" & decimal x.$.l & ", " &decimal y.$.l & ");" @@ -50,15 +52,15 @@ def treq = enddef; -def draw_staff_if_debugging (expr first, last, offset) = +def draw_staff_if_debugging (expr first, last) = if test <> 0: pickup pencircle scaled stafflinethickness; for i := first step 1 until last: draw (-staff_space, - (i + offset) * staff_space_rounded) + (i + stafflines_y_offset) * staff_space_rounded) -- (4 staff_space, - (i + offset) * staff_space_rounded); + (i + stafflines_y_offset) * staff_space_rounded); endfor; fi; enddef; diff --git a/mf/feta-naturals.mf b/mf/feta-naturals.mf index aca7d3b5cf..e1c1e96b74 100644 --- a/mf/feta-naturals.mf +++ b/mf/feta-naturals.mf @@ -126,9 +126,7 @@ def draw_natural (expr arrowup, arrowdown) = w := w + extendright; fi; - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; @@ -137,29 +135,16 @@ fet_beginchar ("Natural", "natural"); fet_endchar; -draw_shifted_too; - - fet_beginchar ("Arrowed Natural (arrow up)", "natural.arrowup"); draw_natural (true, false); fet_endchar; -draw_shifted_too; - - fet_beginchar ("Arrowed Natural (arrow down)", "natural.arrowdown"); draw_natural (false, true); fet_endchar; -draw_shifted_too; - - fet_beginchar ("Arrowed Natural (arrows up and down)", "natural.arrowboth"); draw_natural (true, true); fet_endchar; - - -draw_shifted_too; - diff --git a/mf/feta-noteheads-generic.mf b/mf/feta-noteheads-generic.mf index 3c255073c8..47293eb13c 100644 --- a/mf/feta-noteheads-generic.mf +++ b/mf/feta-noteheads-generic.mf @@ -17,10 +17,6 @@ % along with LilyPond. If not, see . -if test = -1: - mode := smoke; -fi - staffsize# := design_size * pt#; mode_setup; diff --git a/mf/feta-noteheads.mf b/mf/feta-noteheads.mf index 3d61ce49c3..2ebf537b59 100644 --- a/mf/feta-noteheads.mf +++ b/mf/feta-noteheads.mf @@ -21,16 +21,11 @@ test_outlines := 0; -save remember_pic; -picture remember_pic; - - % Most beautiful noteheads are pronounced, not circular, % and not even symmetric. % These examples are inspired by [Wanske]; see literature list. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % NOTE HEAD VARIABLES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -159,33 +154,17 @@ enddef; fet_beginchar ("Longa notehead", "uM2"); draw_longa (true); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Longa notehead", "dM2"); draw_longa (false); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Longa notehead", "uM2"); - draw_longa (true); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; - - - fet_beginchar ("Longa notehead", "dM2"); - draw_longa (false); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - def draw_brevis (expr linecount, line_thickness_multiplier) = save stemthick, fudge, gap; @@ -253,35 +232,17 @@ enddef; fet_beginchar ("Brevis notehead", "sM1"); draw_brevis (1, 1); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Brevis notehead", "sM1"); - draw_brevis(1, 1); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Double-lined brevis notehead", "sM1double"); draw_brevis (2, 0.8); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Double-lined brevis notehead", "sM1double"); - draw_brevis (2, 0.8); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Whole notehead", "s0"); draw_outside_ellipse (1.80 - puff_up_factor / 3.0, 0, 0.707, 0); undraw_inside_ellipse (1.30, 125 - puff_up_factor * 10, @@ -289,60 +250,26 @@ fet_beginchar ("Whole notehead", "s0"); whole_notehead_width# := charwd; - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole notehead", "s0"); - draw_outside_ellipse (1.80 - puff_up_factor / 3.0, 0, - 0.707, 0); - undraw_inside_ellipse (1.30, 125 - puff_up_factor * 10, - 0.68, 2 stafflinethickness#); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Half notehead", "s1"); draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, 0.66, 0.17); undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#); half_notehead_width# := charwd; - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Half notehead", "s1"); - draw_outside_ellipse (1.53 - puff_up_factor / 3.0, 34, - 0.66, 0.17); - undraw_inside_ellipse (3.25, 33, 0.81, - 2.5 stafflinethickness#); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Quarter notehead", "s2"); draw_quarter_path; - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Quarter notehead", "s2"); - draw_outside_ellipse (1.49 - puff_up_factor / 3.0, 31, - 0.707, 0); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -351,58 +278,26 @@ fet_beginchar ("Whole diamondhead", "s0diamond"); undraw_inside_ellipse (1.30, 125, 0.6, .4 staff_space# + stafflinethickness#); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole diamondhead", "s0diamond"); - draw_outside_ellipse (1.80, 0, 0.495, 0); - undraw_inside_ellipse (1.30, 125, 0.6, - .4 staff_space# + stafflinethickness#); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Half diamondhead", "s1diamond"); draw_outside_ellipse (1.50, 34, 0.49, 0.17); undraw_inside_ellipse (3.5, 33, 0.80, .3 staff_space# + 1.5 stafflinethickness#); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Half diamondhead", "s1diamond"); - draw_outside_ellipse (1.50, 34, 0.49, 0.17); - undraw_inside_ellipse (3.5, 33, 0.80, - .3 staff_space# - + 1.5 stafflinethickness#); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Quarter diamondhead", "s2diamond"); draw_outside_ellipse (1.80, 35, 0.495, -0.25); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Quarter diamondhead", "s2diamond"); - draw_outside_ellipse (1.80, 35, 0.495, -0.25); - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -561,19 +456,10 @@ enddef; fet_beginchar ("Whole trianglehead", "s0triangle"); draw_whole_triangle_head; - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole trianglehead", "s0triangle"); - draw_whole_triangle_head; - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - def draw_small_triangle_head (expr dir) = save hei, xs; save llap; @@ -595,14 +481,14 @@ enddef; fet_beginchar ("Half trianglehead (downstem)", "d1triangle"); draw_small_triangle_head (-1); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Half trianglehead (upstem)", "u1triangle"); draw_small_triangle_head (1); - draw_staff_if_debugging (-2, 2, 0.5); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -623,14 +509,14 @@ enddef; fet_beginchar ("Quarter trianglehead (upstem)", "u2triangle"); draw_closed_triangle_head (1); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Quarter trianglehead (downstem)", "d2triangle"); draw_closed_triangle_head (-1); - draw_staff_if_debugging (-2, 2, 0.5); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -707,21 +593,21 @@ enddef; fet_beginchar ("Whole slashhead", "s0slash"); draw_slash (4 slash_thick# + 0.5 staff_space#); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Half slashhead", "s1slash"); draw_slash (3.0 slash_thick# + 0.15 staff_space#); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("Quarter slashhead", "s2slash"); draw_slash (1.5 slash_thick#); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -835,28 +721,10 @@ fet_beginchar ("Whole Crossed notehead", "s0cross"); draw_cross (3.75); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Whole Crossed notehead", "s0cross"); - save wid, hei; - - wid# := black_notehead_width# + 4 stafflinethickness#; - hei# := noteheight# + stafflinethickness#; - - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Half Crossed notehead", "s1cross"); save wid, hei; @@ -867,28 +735,10 @@ fet_beginchar ("Half Crossed notehead", "s1cross"); draw_cross (3.0); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Half Crossed notehead", "s1cross"); - save wid, hei; - - wid# := black_notehead_width# + 2 stafflinethickness#; - hei# := noteheight# + stafflinethickness# / 2; - - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("Crossed notehead", "s2cross"); wid# := black_notehead_width#; hei# := noteheight#; @@ -896,25 +746,10 @@ fet_beginchar ("Crossed notehead", "s2cross"); draw_cross (1.0); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("Crossed notehead", "s2cross"); - wid# := black_notehead_width#; - hei# := noteheight#; - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - fet_beginchar ("X-Circled notehead", "s2xcircle"); save wid, hei; save cthick, cxd, cyd, dy; @@ -960,29 +795,10 @@ fet_beginchar ("X-Circled notehead", "s2xcircle"); z12 = (charwx * hppp, charwy * vppp); labels (12); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -if test > 0: - fet_beginchar ("X-Circled notehead", "s2xcircle"); - save wid, hei; - save cthick, cxr, cyr; - - wid# := black_notehead_width# * sqrt (sqrt2); - hei# := noteheight# * sqrt (sqrt2); - - set_char_box (0, wid#, hei# / 2, hei# / 2); - - currentpicture := remember_pic; - - draw_staff_if_debugging (-2, 2, 0.5); - fet_endchar; -fi; - - %%%%%%%% % % SOLFA SHAPED NOTES @@ -1634,7 +1450,7 @@ def draw_sol_head (expr filled) = if not filled: undraw_inside_ellipse (3.25, 33, 0.81, 2.5 stafflinethickness#); fi - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; fet_beginchar ("Whole solhead", "s0sol"); @@ -2253,7 +2069,7 @@ begingroup if not filled: undraw_inside_ellipse (1.9, 33, 0.74, 5.5 stafflinethickness#); fi - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); endgroup enddef; diff --git a/mf/feta-noteheads11.mf b/mf/feta-noteheads11.mf index b02844a196..bfbd735129 100644 --- a/mf/feta-noteheads11.mf +++ b/mf/feta-noteheads11.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 11.22; -test := 0; - - input feta-noteheads-generic; end. diff --git a/mf/feta-noteheads13.mf b/mf/feta-noteheads13.mf index e010769f4b..a78ab0e959 100644 --- a/mf/feta-noteheads13.mf +++ b/mf/feta-noteheads13.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 12.60; -test := 0; - - input feta-noteheads-generic; end. diff --git a/mf/feta-noteheads14.mf b/mf/feta-noteheads14.mf index 7d25cb2a60..75fccc1a2d 100644 --- a/mf/feta-noteheads14.mf +++ b/mf/feta-noteheads14.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 14.14; -test := 0; - - input feta-noteheads-generic; end. diff --git a/mf/feta-noteheads16.mf b/mf/feta-noteheads16.mf index 755f9ffdd5..49c48f1e2c 100644 --- a/mf/feta-noteheads16.mf +++ b/mf/feta-noteheads16.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 15.87; -test := 0; - - input feta-noteheads-generic; end. diff --git a/mf/feta-noteheads18.mf b/mf/feta-noteheads18.mf index bdc6918bf3..6cfcb6d630 100644 --- a/mf/feta-noteheads18.mf +++ b/mf/feta-noteheads18.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 17.82; -test := 0; - - input feta-noteheads-generic; end. diff --git a/mf/feta-noteheads20.mf b/mf/feta-noteheads20.mf index 072f99207c..4a5843cfd9 100644 --- a/mf/feta-noteheads20.mf +++ b/mf/feta-noteheads20.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 20; -test := 0; - - input feta-noteheads-generic; end. diff --git a/mf/feta-noteheads23.mf b/mf/feta-noteheads23.mf index ab0154832e..c197af7d0c 100644 --- a/mf/feta-noteheads23.mf +++ b/mf/feta-noteheads23.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 22.45; -test := 0; - - input feta-noteheads-generic; end. diff --git a/mf/feta-noteheads26.mf b/mf/feta-noteheads26.mf index b25d21495c..333c4e3dd0 100644 --- a/mf/feta-noteheads26.mf +++ b/mf/feta-noteheads26.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 25.20; -test := 0; - - input feta-noteheads-generic; end. diff --git a/mf/feta-parenthesis.mf b/mf/feta-parenthesis.mf index a780ee9c30..ad2561a596 100644 --- a/mf/feta-parenthesis.mf +++ b/mf/feta-parenthesis.mf @@ -31,15 +31,10 @@ fet_beginchar ("Right Parenthesis", "rightparen"); draw_paren; penlabels (1, 2, 3); - remember_pic := currentpicture; - - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; -draw_shifted_too; - - fet_beginchar ("Left Parenthesis", "leftparen"); draw_paren; diff --git a/mf/feta-rests.mf b/mf/feta-rests.mf index 1ba2807bef..9147b7fa95 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_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -52,7 +52,7 @@ fet_beginchar ("half rest", "1"); block_rest; - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -72,8 +72,6 @@ fet_beginchar ("whole rest (outside staff)", "0o"); lft x5 = -b - block_rest_y; rt x6 = w + block_rest_y; draw_gridline (z5, z6, ledgerlinethickness_rounded); - - draw_staff_if_debugging (-2, 2, -3); fet_endchar; @@ -90,8 +88,6 @@ fet_beginchar ("half rest (outside staff)", "1o"); rt x6 = w + block_rest_y; draw_gridline (z5, z6, ledgerlinethickness_rounded); - - draw_staff_if_debugging (-2, 2, 3); fet_endchar; @@ -103,7 +99,7 @@ fet_beginchar ("maxima rest", "M3"); addto currentpicture also currentpicture shifted (2 breve_rest_x, 0); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -113,7 +109,7 @@ fet_beginchar ("longa rest", "M2"); draw_block ((0, -breve_rest_y + feta_shift), (breve_rest_x, breve_rest_y)); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -122,7 +118,7 @@ fet_beginchar ("breve rest", "M1"); draw_block ((0, 0), (breve_rest_x, breve_rest_y)); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; fet_beginchar ("breve rest (outside staff)", "M1o"); @@ -139,8 +135,6 @@ fet_beginchar ("breve rest (outside staff)", "M1o"); draw_gridline (z5, z6, ledgerlinethickness_rounded); draw_gridline ((x5, 0), (x6, 0), ledgerlinethickness_rounded); - - draw_staff_if_debugging (-2, 2, 3); fet_endchar; @@ -226,7 +220,7 @@ fet_beginchar ("Quarter rest", "2"); penlabels (1, 2, 3, 4, 5, 6, 7); penlabels (10, 11, 12, 13); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -374,7 +368,7 @@ def draw_eighth_rest (expr show_labels) = -- z1l .. cycle; - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; @@ -440,7 +434,7 @@ fet_beginchar ("16th rest", "4"); penlabels (1, 2); labels (9); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -494,7 +488,7 @@ fet_beginchar ("32th rest", "5"); penlabels (1, 2); labels (9); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -552,7 +546,7 @@ fet_beginchar ("64th rest", "6"); penlabels (1, 2); labels (9); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -614,7 +608,7 @@ fet_beginchar ("128th rest", "7"); penlabels (1, 2); labels (9); - draw_staff_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; diff --git a/mf/feta-scripts.mf b/mf/feta-scripts.mf index 52a07209f1..0baef99bb4 100644 --- a/mf/feta-scripts.mf +++ b/mf/feta-scripts.mf @@ -1277,7 +1277,6 @@ 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_if_debugging (-2, 2, 0); fet_endchar; @@ -1495,7 +1494,7 @@ fet_beginchar ("Arpeggio", "arpeggio"); draw_arpeggio; penlabels (range 1 thru 9); - draw_staff_if_debugging (-2, 2, 0.0); + draw_staff_if_debugging (-2, 2); endgroup; fet_endchar; diff --git a/mf/feta-sharps.mf b/mf/feta-sharps.mf index d2ecd2d277..46937f9e4d 100644 --- 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_if_debugging (-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_if_debugging (-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_if_debugging (-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_if_debugging (-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_if_debugging (-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_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; - - -draw_shifted_too; diff --git a/mf/feta-timesignatures.mf b/mf/feta-timesignatures.mf index 81daa8f428..8a50fc512a 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_if_debugging (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; diff --git a/mf/feta11.mf b/mf/feta11.mf index be6a6a7e10..6eca785edd 100644 --- a/mf/feta11.mf +++ b/mf/feta11.mf @@ -4,8 +4,6 @@ input feta-autometric; design_size := 11.22; -test := 0; - input feta-generic; diff --git a/mf/feta13.mf b/mf/feta13.mf index 5014c12342..2fbe96b467 100644 --- a/mf/feta13.mf +++ b/mf/feta13.mf @@ -4,8 +4,6 @@ input feta-autometric; design_size := 12.60; -test := 0; - input feta-generic; diff --git a/mf/feta14.mf b/mf/feta14.mf index 23ac8e4d15..738606985e 100644 --- a/mf/feta14.mf +++ b/mf/feta14.mf @@ -4,8 +4,6 @@ input feta-autometric; design_size := 14.14; -test := 0; - input feta-generic; diff --git a/mf/feta16.mf b/mf/feta16.mf index 174460b715..6b06193457 100644 --- a/mf/feta16.mf +++ b/mf/feta16.mf @@ -4,8 +4,6 @@ input feta-autometric; design_size := 15.87; -test := 0; - input feta-generic; diff --git a/mf/feta18.mf b/mf/feta18.mf index b52f6a3e35..6b6dd49524 100644 --- a/mf/feta18.mf +++ b/mf/feta18.mf @@ -5,8 +5,6 @@ input feta-autometric; % todo change file name design_size := 17.82; -test := 0; - input feta-generic; diff --git a/mf/feta20.mf b/mf/feta20.mf index 2b561b200d..46c923fa56 100644 --- a/mf/feta20.mf +++ b/mf/feta20.mf @@ -7,7 +7,6 @@ input feta-autometric; % use feta-test for debugging. -test := 0; input feta-generic; diff --git a/mf/feta23.mf b/mf/feta23.mf index d2cf0025e9..93b8679761 100644 --- a/mf/feta23.mf +++ b/mf/feta23.mf @@ -5,8 +5,6 @@ input feta-autometric; % todo change file name design_size := 22.45; -test := 0; - input feta-generic; diff --git a/mf/feta26.mf b/mf/feta26.mf index 2bfa536618..2877d7431d 100644 --- a/mf/feta26.mf +++ b/mf/feta26.mf @@ -4,8 +4,6 @@ input feta-autometric; design_size := 25.20; -test := 0; - input feta-generic; diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf index fd2f4d7cbd..4221f02a38 100644 --- a/mf/parmesan-clefs.mf +++ b/mf/parmesan-clefs.mf @@ -125,9 +125,7 @@ enddef; fet_beginchar ("Ed. Vat. do clef", "vaticana.do"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_vaticana_do_clef ((0, 0), 1.0); fet_endchar; @@ -194,9 +192,7 @@ enddef; fet_beginchar ("Ed. Vat. fa clef", "vaticana.fa"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_vaticana_fa_clef ((0, 0), 1.0); fet_endchar; @@ -282,9 +278,7 @@ enddef; fet_beginchar ("Ed. Med. do clef", "medicaea.do"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_medicaea_do_clef ((0, 0), 1.0); fet_endchar; @@ -352,9 +346,7 @@ enddef; fet_beginchar ("Ed. Med. fa clef", "medicaea.fa"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_medicaea_fa_clef ((0, 0), 1.0); fet_endchar; @@ -589,9 +581,7 @@ enddef; fet_beginchar ("neo-mensural c clef", "neomensural.c"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_neomensural_c_clef ((0, 0), 1.0); fet_endchar; @@ -696,9 +686,7 @@ enddef; fet_beginchar ("petrucci c1 clef", "petrucci.c1"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), +2, 1.0); fet_endchar; @@ -709,9 +697,7 @@ fet_endchar; fet_beginchar ("petrucci c2 clef", "petrucci.c2"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), +1, 1.0); fet_endchar; @@ -722,9 +708,7 @@ fet_endchar; fet_beginchar ("petrucci c3 clef", "petrucci.c3"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), 0, 1.0); fet_endchar; @@ -735,9 +719,7 @@ fet_endchar; fet_beginchar ("petrucci c4 clef", "petrucci.c4"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), -1, 1.0); fet_endchar; @@ -748,9 +730,7 @@ fet_endchar; fet_beginchar ("petrucci c5 clef", "petrucci.c5"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_c_clef ((0, 0), -2, 1.0); fet_endchar; @@ -840,9 +820,7 @@ enddef; fet_beginchar ("mensural c clef", "mensural.c"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_mensural_c_clef ((0, 0), 1.0, true); fet_endchar; @@ -853,9 +831,7 @@ fet_endchar; fet_beginchar ("black mensural c clef", "blackmensural.c"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_mensural_c_clef ((0, 0), 1.0, false); fet_endchar; @@ -1034,9 +1010,7 @@ enddef; fet_beginchar ("petrucci f clef", "petrucci.f"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_f_clef ((0, 0), 1.0); fet_endchar; @@ -1142,9 +1116,7 @@ enddef; fet_beginchar ("mensural f clef", "mensural.f"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_mensural_f_clef ((0, 0), 1.0); fet_endchar; @@ -1374,9 +1346,7 @@ enddef; fet_beginchar ("petrucci g clef", "petrucci.g"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_g_clef ((0, 0), 1.0); fet_endchar; @@ -1408,9 +1378,7 @@ enddef; % until the code for the mensural g clef will be rewritten. % fet_beginchar ("mensural g clef", "mensural.g"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_petrucci_g_clef ((0, 0), 1.0); fet_endchar; @@ -1499,9 +1467,7 @@ enddef; fet_beginchar ("Hufnagel do clef", "hufnagel.do"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_hufnagel_do_clef ((0, 0), 1.0); fet_endchar; @@ -1595,9 +1561,7 @@ enddef; fet_beginchar ("Hufnagel fa clef", "hufnagel.fa"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_hufnagel_fa_clef ((0, 0), 1.0); fet_endchar; @@ -1619,9 +1583,7 @@ enddef; fet_beginchar ("Hufnagel do/fa clef", "hufnagel.do.fa"); - if test = 1: - draw_staff_if_debugging (-1, 3, 0.0); - fi; + draw_staff_if_debugging (-1, 3); draw_hufnagel_do_fa_clef ((0, 0), 1.0); fet_endchar; diff --git a/mf/parmesan-generic.mf b/mf/parmesan-generic.mf index 31b35ff25b..c3e6f85911 100644 --- a/mf/parmesan-generic.mf +++ b/mf/parmesan-generic.mf @@ -17,10 +17,6 @@ % along with LilyPond. If not, see . -if test = -1: - mode := smoke; -fi; - mode_setup; staffsize# := design_size * pt#; diff --git a/mf/parmesan-noteheads-generic.mf b/mf/parmesan-noteheads-generic.mf index a4103791ff..c2c141b40a 100644 --- a/mf/parmesan-noteheads-generic.mf +++ b/mf/parmesan-noteheads-generic.mf @@ -17,10 +17,6 @@ % along with LilyPond. If not, see . -if test = -1: - mode := smoke; -fi - staffsize# := design_size * pt#; mode_setup; diff --git a/mf/parmesan-noteheads11.mf b/mf/parmesan-noteheads11.mf index 288695a45e..a3006cdcb7 100644 --- a/mf/parmesan-noteheads11.mf +++ b/mf/parmesan-noteheads11.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 11.22; -test := 0; - - input parmesan-noteheads-generic; end. diff --git a/mf/parmesan-noteheads13.mf b/mf/parmesan-noteheads13.mf index ad126423aa..3b4961a249 100644 --- a/mf/parmesan-noteheads13.mf +++ b/mf/parmesan-noteheads13.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 12.60; -test := 0; - - input parmesan-noteheads-generic; end. diff --git a/mf/parmesan-noteheads14.mf b/mf/parmesan-noteheads14.mf index f5d3a41df7..4699588408 100644 --- a/mf/parmesan-noteheads14.mf +++ b/mf/parmesan-noteheads14.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 14.14; -test := 0; - - input parmesan-noteheads-generic; end. diff --git a/mf/parmesan-noteheads16.mf b/mf/parmesan-noteheads16.mf index 3db517fa04..a398167939 100644 --- a/mf/parmesan-noteheads16.mf +++ b/mf/parmesan-noteheads16.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 15.87; -test := 0; - - input parmesan-noteheads-generic; end. diff --git a/mf/parmesan-noteheads18.mf b/mf/parmesan-noteheads18.mf index ed0f99ec0e..3e59cd4f8d 100644 --- a/mf/parmesan-noteheads18.mf +++ b/mf/parmesan-noteheads18.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 17.82; -test := 0; - - input parmesan-noteheads-generic; end. diff --git a/mf/parmesan-noteheads20.mf b/mf/parmesan-noteheads20.mf index 8891652bb8..6dbe9650e9 100644 --- a/mf/parmesan-noteheads20.mf +++ b/mf/parmesan-noteheads20.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 20; -test := 0; - - input parmesan-noteheads-generic; end. diff --git a/mf/parmesan-noteheads23.mf b/mf/parmesan-noteheads23.mf index fe64e6f496..46c58073c7 100644 --- a/mf/parmesan-noteheads23.mf +++ b/mf/parmesan-noteheads23.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 22.45; -test := 0; - - input parmesan-noteheads-generic; end. diff --git a/mf/parmesan-noteheads26.mf b/mf/parmesan-noteheads26.mf index 082ffc208d..01618bfc99 100644 --- a/mf/parmesan-noteheads26.mf +++ b/mf/parmesan-noteheads26.mf @@ -4,9 +4,6 @@ input feta-autometric; design_size := 25.20; -test := 0; - - input parmesan-noteheads-generic; end. diff --git a/mf/parmesan11.mf b/mf/parmesan11.mf index 27ba341437..c0f37e1945 100644 --- a/mf/parmesan11.mf +++ b/mf/parmesan11.mf @@ -5,8 +5,6 @@ design_size := 11.22; input feta-autometric; -test := 0; - input parmesan-generic; end. diff --git a/mf/parmesan13.mf b/mf/parmesan13.mf index 905da48d5d..5ca92f334a 100644 --- a/mf/parmesan13.mf +++ b/mf/parmesan13.mf @@ -5,8 +5,6 @@ design_size := 12.60; input feta-autometric; -test := 0; - input parmesan-generic; diff --git a/mf/parmesan14.mf b/mf/parmesan14.mf index 6357337be2..22e3c27661 100644 --- a/mf/parmesan14.mf +++ b/mf/parmesan14.mf @@ -5,8 +5,6 @@ design_size := 14.14; input feta-autometric; -test := 0; - input parmesan-generic; diff --git a/mf/parmesan16.mf b/mf/parmesan16.mf index 19b0516779..75573a6707 100644 --- a/mf/parmesan16.mf +++ b/mf/parmesan16.mf @@ -5,8 +5,6 @@ design_size := 15.87; input feta-autometric; -test := 0; - input parmesan-generic; diff --git a/mf/parmesan18.mf b/mf/parmesan18.mf index 8c28507046..76a6718d50 100644 --- a/mf/parmesan18.mf +++ b/mf/parmesan18.mf @@ -5,8 +5,6 @@ design_size := 17.82; input feta-autometric; -test := 0; - input parmesan-generic; diff --git a/mf/parmesan20.mf b/mf/parmesan20.mf index d14251edce..d722928746 100644 --- a/mf/parmesan20.mf +++ b/mf/parmesan20.mf @@ -5,8 +5,6 @@ design_size := 20; input feta-autometric; -test := 0; - input parmesan-generic; diff --git a/mf/parmesan23.mf b/mf/parmesan23.mf index 39b643732b..ac0b017951 100644 --- a/mf/parmesan23.mf +++ b/mf/parmesan23.mf @@ -5,8 +5,6 @@ design_size := 22.45; input feta-autometric; -test := 0; - input parmesan-generic; diff --git a/mf/parmesan26.mf b/mf/parmesan26.mf index 1be6fb5191..c2cf1946be 100644 --- a/mf/parmesan26.mf +++ b/mf/parmesan26.mf @@ -5,8 +5,6 @@ design_size := 25.20; input feta-autometric; -test := 0; - input parmesan-generic; -- 2.39.2