Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / mf / parmesan-accidentals.mf

diff --git a/mf/parmesan-accidentals.mf b/mf/parmesan-accidentals.mf
index 57f94a96fcec26b89a187841b85484235385eb3f..b71674ea2ce7a286ab4af3442505bfcaddbaaa77 100644 (file)
--- a/mf/parmesan-accidentals.mf
+++ b/mf/parmesan-accidentals.mf
@@ -1,10 +1,21 @@
-% -%-Fundamental-%- -*-Metafont-*-
-% parmesan-accidentals.mf -- implement ancient accidentals
-% 
-% source file of LilyPond's pretty-but-neat music font
-% 
-% (c) 2001--2006 Juergen Reuter <reuter@ipd.uka.de>
+% Feta (not the Font-En-Tja) music font --  ancient accidentals
+% This file is part of LilyPond, the GNU music typesetter.
+%
+% Copyright (C) 2001--2010 Juergen Reuter <reuter@ipd.uka.de>
 % 
+%
+% LilyPond 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.
+%
+% LilyPond is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 fet_begingroup ("accidentals");
 
@@ -17,18 +28,18 @@ fet_begingroup ("accidentals");
 %
 %
 %
-fet_beginchar ("Ed. Med. Flat" , "medicaea-1");
+fet_beginchar ("Ed. Med. Flat" , "medicaeaM1");
        set_char_box (0.1 staff_space#, 0.6 staff_space#,
                      0.6 staff_space#, 1.0 staff_space#);
 
-       save ellipse, pat, outline;
+       save ellipse, pat, outline, T;
        path ellipse, pat, outline;
+       transform T;
 
-       pickup pencircle xscaled 0.50 linethickness
-                        yscaled 0.22 staff_space;
-
-       ellipse := fullcircle xscaled 0.5 linethickness
-                                     yscaled 0.22 staff_space;
+       T := identity xscaled 0.50 linethickness
+                     yscaled 0.22 staff_space;
+       pickup pencircle transformed T;
+       ellipse := fullcircle transformed T;
 
        x1 = x2 = 0;
        top y1 = h;
@@ -38,13 +49,11 @@ fet_beginchar ("Ed. Med. Flat" , "medicaea-1");
             -- get_subpath (ellipse, down, up, z2)
             -- cycle;
 
-       pickup pencircle xscaled 0.50 linethickness
-                        yscaled 0.22 staff_space
-                        rotated -63;
-
-       ellipse := fullcircle xscaled 0.50 linethickness
-                             yscaled 0.22 staff_space
-                             rotated -63;
+       T := identity xscaled 0.50 linethickness
+                     yscaled 0.22 staff_space
+                     rotated -63;
+       pickup pencircle transformed T;
+       ellipse := fullcircle transformed T;
 
        z3 = (0.10 staff_space, -0.50 staff_space);
        z4 = (0.40 staff_space, +0.40 staff_space);
@@ -87,7 +96,7 @@ fet_endchar;
 %
 %
 %
-fet_beginchar ("Ed. Vat. Flat" , "vaticana-1");
+fet_beginchar ("Ed. Vat. Flat" , "vaticanaM1");
        z1 = (0.00 staff_space, +0.80 staff_space);
        z2 = (0.00 staff_space, -0.08 staff_space);
        z3 = (0.25 staff_space, -0.23 staff_space);
@@ -96,14 +105,14 @@ fet_beginchar ("Ed. Vat. Flat" , "vaticana-1");
        z6 = (0.25 staff_space, +0.20 staff_space);
        z7 = (0.15 staff_space, +0.26 staff_space);
 
-       save pat, ellipse;
+       save pat, ellipse, T;
        path pat, ellipse;
+       transform T;
 
-       pickup pencircle xscaled 0.50 linethickness
-                        yscaled 0.22 staff_space;
-
-       ellipse := fullcircle xscaled 0.50 linethickness
-                             yscaled 0.22 staff_space;
+       T := identity xscaled 0.50 linethickness
+                     yscaled 0.22 staff_space;
+       pickup pencircle transformed T;
+       ellipse := fullcircle transformed T;
 
        pat := z1
               -- z2{down}
@@ -140,14 +149,14 @@ fet_endchar;
 
 
 fet_beginchar ("Ed. Vat. Natural" , "vaticana0");
-       save ellipse;
+       save ellipse, T;
        path ellipse;
+       transform T;
 
-       pickup pencircle xscaled 0.80 linethickness
-                        yscaled 0.22 staff_space;
-
-       ellipse := fullcircle xscaled 0.8 linethickness
-                             yscaled 0.22 staff_space;
+       T := identity xscaled 0.80 linethickness
+                     yscaled 0.22 staff_space;
+       pickup pencircle transformed T;
+       ellipse := fullcircle transformed T;
 
        z1 = (0.00 staff_space, +0.65 staff_space);
        z2 = (0.00 staff_space, -0.35 staff_space);
@@ -194,12 +203,13 @@ fet_beginchar ("Mensural Sharp" , "mensural1");
 
        stemthick# = linethickness#;
 
-       save circle, pat;
+       save circle, pat, T;
        path circle, pat;
+       transform T;
 
-       pickup pencircle scaled 0.8 stemthick;
-
-       circle := fullcircle scaled 0.8 stemthick;
+       T := identity scaled 0.8 stemthick;
+       pickup pencircle transformed T;
+       circle := fullcircle transformed T;
 
        z1 = 0.4 staff_space * (0.8, 1);
        z1 = -z2;
@@ -222,23 +232,22 @@ fet_beginchar ("Mensural Sharp" , "mensural1");
 fet_endchar;
 
 
-fet_beginchar ("Mensural Flat" , "mensural-1");
+fet_beginchar ("Mensural Flat" , "mensuralM1");
        save stemthick;
 
        define_pixels (stemthick);
 
        stemthick# = linethickness#;
 
-       save ellipse, pat, outline;
+       save ellipse, pat, outline, T;
        path ellipse, pat, outline;
+       transform T;
 
-       pickup pencircle xscaled 1.4 stemthick
-                        yscaled 0.6 stemthick
-                        rotated 45;
-
-       ellipse := fullcircle xscaled 1.4 stemthick
-                             yscaled 0.6 stemthick
-                             rotated 45;
+       T := identity xscaled 1.4 stemthick
+                     yscaled 0.6 stemthick
+                     rotated 45;
+       pickup pencircle transformed T;
+       ellipse := fullcircle transformed T;
 
        z1 = (0.00 staff_space, +1.80 staff_space);
        z2 = (0.00 staff_space, -0.25 staff_space);
@@ -287,23 +296,22 @@ fet_beginchar ("Mensural Flat" , "mensural-1");
 fet_endchar;
 
 
-fet_beginchar ("Hufnagel Flat" , "hufnagel-1");
+fet_beginchar ("Hufnagel Flat" , "hufnagelM1");
        save stemthick;
 
        define_pixels (stemthick);
 
        stemthick# = linethickness#;
 
-       save ellipse, pat;
+       save ellipse, pat, T;
        path ellipse, pat;
+       transform T;
 
-       pickup pencircle xscaled 2.4 stemthick
-                        yscaled 0.4 stemthick
-                        rotated 45;
-
-       ellipse := fullcircle xscaled 2.4 stemthick
-                             yscaled 0.4 stemthick
-                             rotated 45;
+       T := identity xscaled 2.4 stemthick
+                     yscaled 0.4 stemthick
+                     rotated 45;
+       pickup pencircle transformed T;
+       ellipse := fullcircle transformed T;
 
        z1 = (0.00 staff_space, +1.80 staff_space);
        z2 = (0.00 staff_space, -0.15 staff_space);