X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-rests.mf;h=0a9d7ea43d9234e1da701dcf473103a39608e731;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=84a525b74663254bc2186542d208ab32263fe4c9;hpb=4f27e3239758438b394f89c8d268fedf66dd3999;p=lilypond.git diff --git a/mf/feta-rests.mf b/mf/feta-rests.mf index 84a525b746..0a9d7ea43d 100644 --- a/mf/feta-rests.mf +++ b/mf/feta-rests.mf @@ -1,12 +1,12 @@ % Feta (not the Font-En-Tja) music font -- rest symbols -*-Fundamental-*- % This file is part of LilyPond, the GNU music typesetter. % -% Copyright (C) 1997--2009 Jan Nieuwenhuizen +% Copyright (C) 1997--2014 Jan Nieuwenhuizen % -% LilyPond is free software: you can redistribute it and/or modify +% The LilyPond font is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by % the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. +% (at your option) any later version, or under the SIL Open Font License. % % LilyPond is distributed in the hope that it will be useful, % but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -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); fet_endchar; @@ -52,7 +52,7 @@ fet_beginchar ("half rest", "1"); block_rest; - draw_staff (-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 (-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 (-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 (-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 (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -122,7 +118,23 @@ 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); +fet_endchar; + +fet_beginchar ("breve rest (outside staff)", "M1o"); + set_char_box (0, breve_rest_x#, + ledgerlinethickness# / 2, breve_rest_y#); + + draw_block ((0, 0), (breve_rest_x, breve_rest_y)); + + pickup pencircle scaled ledgerlinethickness; + + y5 = y6 = breve_rest_y; + lft x5 = -b - breve_rest_y / 2; + rt x6 = w + breve_rest_y / 2; + + draw_gridline (z5, z6, ledgerlinethickness_rounded); + draw_gridline ((x5, 0), (x6, 0), ledgerlinethickness_rounded); fet_endchar; @@ -208,7 +220,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); fet_endchar; @@ -356,7 +368,7 @@ def draw_eighth_rest (expr show_labels) = -- z1l .. cycle; - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); enddef; @@ -422,7 +434,7 @@ fet_beginchar ("16th rest", "4"); penlabels (1, 2); labels (9); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -476,7 +488,7 @@ fet_beginchar ("32th rest", "5"); penlabels (1, 2); labels (9); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -534,7 +546,7 @@ fet_beginchar ("64th rest", "6"); penlabels (1, 2); labels (9); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar; @@ -596,7 +608,7 @@ fet_beginchar ("128th rest", "7"); penlabels (1, 2); labels (9); - draw_staff (-2, 2, 0); + draw_staff_if_debugging (-2, 2); fet_endchar;