X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2Ffeta-scripts.mf;h=e27974b955040ccea88c9a0f77aa88149aaf6c4e;hb=87eb2f9fe1be3a532675fe4b7322bbba5a60ba5c;hp=39d751ab597e948bb42044f9e443d5d0ac25e412;hpb=75ef3811c47302559fe275145212715ce109cbe3;p=lilypond.git

diff --git a/mf/feta-scripts.mf b/mf/feta-scripts.mf
index 39d751ab59..e27974b955 100644
--- a/mf/feta-scripts.mf
+++ b/mf/feta-scripts.mf
@@ -1,14 +1,14 @@
 % Feta (not the Font-En-Tja) music font --  implement scripts
 % This file is part of LilyPond, the GNU music typesetter.
 %
-% Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+% Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %	Jan Nieuwenhuizen <janneke@gnu.org>
 %
 %
-% 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
@@ -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 (-2, 2, 0);
 fet_endchar;
 
 
@@ -1495,7 +1494,7 @@ fet_beginchar ("Arpeggio", "arpeggio");
 	draw_arpeggio;
 	penlabels (range 1 thru 9);
 
-	draw_staff (-2, 2, 0.0);
+	draw_staff_if_debugging (-2, 2);
 	endgroup;
 fet_endchar;
 
@@ -1736,14 +1735,16 @@ fet_beginchar ("Straight caesura", "caesura.straight");
 	labels(1a, 1b, 2a, 2b, 3a, 3b, 4a, 4b);
 fet_endchar;
 
-% A tick character to use instead of a comma or caesura as a breath mark,
-% Very common in vocal notation
+
+% A tick character to use instead of a comma or caesura as a breath mark.
+% Very common in vocal notation.
 
 fet_beginchar ("Tick mark", "tickmark");
 	save end_rad, bot_rad, pat, x_centre, x_extent;
+	path pat;
+
 	end_rad = linethickness / 2;
 	bot_rad = linethickness;
-	path pat;
 
 	x_centre# = 0.6 staff_space#;
 	x_extent# = 1.7 staff_space#;
@@ -1759,6 +1760,7 @@ fet_beginchar ("Tick mark", "tickmark");
 	y2l = 0;
 
 	top rt z3 = (x_extent - x_centre, x_extent);
+
 	x4 = lft x1;
 	y4 = staff_space;
 
@@ -1767,22 +1769,26 @@ fet_beginchar ("Tick mark", "tickmark");
 	penpos1 (end_rad, angle(z2 - z1) + 90);
 
 	pat = z1r
-		  ..top z1..z1l{z2-z1}
-		  ..{z2 - (z1 + (0.3 staff_space,0))}z2l + (-bot_rad, bot_rad)
-		  ..z2l
-		  ..z2l + (bot_rad, bot_rad){z3 - (0.6 staff_space, 0) - z2}
-		  ..{z3 - z4}z3r
-		  ..rt z3..{z4 - z3}z3l
-		  ..{z2 - (z3 - (0.6 staff_space, 0))}rt z2r
-		  ..{z1 - z2}lft z2r{z1 - z2}
-		  ..cycle;
+	      .. top z1
+	      .. z1l{z2 - z1}
+	      .. {z2 - (z1 + (0.3 staff_space,0))}z2l + (-bot_rad, bot_rad)
+	      .. z2l
+	      .. z2l + (bot_rad, bot_rad){z3 - (0.6 staff_space, 0) - z2}
+	      .. {z3 - z4}z3r
+	      .. rt z3
+	      .. {z4 - z3}z3l
+	      .. {z2 - (z3 - (0.6 staff_space, 0))}rt z2r
+	      .. {z1 - z2}lft z2r{z1 - z2}
+	      .. cycle;
 	fill pat;
 
 	set_char_box (x_centre#, x_extent# - x_centre#, 0, x_extent#);
 
-	penlabels (1, 2, 3, 4);
+	penlabels (1, 2, 3);
+	labels (4);
 fet_endchar;
 
+
 fet_beginchar ("snap pizzicato (Bartok pizzicato)", "snappizzicato");
 	save height, width, thickness, superness;