X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Fparmesan-scripts.mf;h=ee2b56b715c34f4eb5c96dd8db00ab5399eebe21;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=d5b1f6de2e3cf7e8636a800299ae919bbe40b51c;hpb=c761573d85f37ddbb08415bc558e0742554662ae;p=lilypond.git diff --git a/mf/parmesan-scripts.mf b/mf/parmesan-scripts.mf index d5b1f6de2e..ee2b56b715 100644 --- a/mf/parmesan-scripts.mf +++ b/mf/parmesan-scripts.mf @@ -1,13 +1,13 @@ % Feta (not the Font-En-Tja) music font -- ancient script symbols % This file is part of LilyPond, the GNU music typesetter. % -% Copyright (C) 2002--2012 Juergen Reuter +% Copyright (C) 2002--2015 Juergen Reuter % % -% 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 @@ -254,16 +254,16 @@ fet_beginchar ("Kievan end of piece (slash)", "barline.kievan"); save hair_thickness, thick_thickness, width, depth, height, padding; hair# = 1.9 linethickness#; thick# = 6.0 linethickness#; - width = .8 staff_space; + width# = 1.0 staff_space#; height# + depth# = 4 staff_space#; - depth# = height# + hair# / 2; - padding = .2 staff_space; + depth# = height# + hair#; + padding# = .2 staff_space#; - set_char_box (0, 0, depth#, height#); - define_pixels (hair, thick); + set_char_box (0, width# + 3 padding#, depth#, height# + staff_space#); + define_pixels (hair, thick, width, padding, depth, height); - x1r - x2l = width; - y1 - y3r = d + h + linethickness / 2; + x7r - x2l = width; + y1 - y3r = depth + height + linethickness / 2; z3 = z2; z4 = .5 [z1, z2] = (width / 2 + padding, hair / 8); @@ -271,7 +271,6 @@ fet_beginchar ("Kievan end of piece (slash)", "barline.kievan"); z7 - z6 = (.5 staff_space, -.2 staff_space); .4 [z6, z7] = 7/6 [z2, z1]; - pickup pencircle scaled blot_diameter; penpos1 (hair, 0); penpos2 (hair, 0); penpos3 (hair, -90); @@ -285,7 +284,9 @@ fet_beginchar ("Kievan end of piece (slash)", "barline.kievan"); penstroke z1e -- z2e; - fill simple_serif (z3l, z3r, 90){1.5 right} + fill z3l + -- z2l{z2 - z1} + .. z3r{right} .. z4r .. z5r .. z6r @@ -293,7 +294,7 @@ fet_beginchar ("Kievan end of piece (slash)", "barline.kievan"); .. {left}z6l .. z5l .. z4l - .. cycle; + .. {left}cycle; fet_endchar; fet_endgroup ("scripts");