From: fred <fred>
Date: Sun, 24 Mar 2002 20:00:51 +0000 (+0000)
Subject: lilypond-0.1.25
X-Git-Tag: release/1.5.59~3701
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a539506069569b3a53f8440929f19fc8f9f055ea;p=lilypond.git

lilypond-0.1.25
---

diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly
index 394441aecc..41e99c6833 100644
--- a/init/font-en-tja16.ly
+++ b/init/font-en-tja16.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 01:50:48 1997
+% on Mon Oct 20 23:14:01 1997
 % Do not edit
 % input from out/font-en-tja16.log
 % name=\symboltables {
@@ -51,10 +51,14 @@
         "pedalheel"	"\\pedalheel"	-2.00\pt	2.00\pt	-2.00\pt	2.67\pt	
         "pedaltoe"	"\\pedaltoe"	-2.00\pt	2.00\pt	-0.00\pt	6.00\pt	
         }
-    "floogbars"	 = \table {
-        "3u"	"\\eighthflag"	-0.20\pt	4.16\pt	-12.83\pt	0.20\pt	
-        "3d"	"\\deighthflag"	-0.20\pt	4.60\pt	-0.20\pt	12.83\pt	
-        "4u"	"\\sixteenthflag"	-0.20\pt	4.16\pt	-13.00\pt	0.20\pt	
-        "4d"	"\\dsixteenthflag"	-0.20\pt	4.60\pt	-0.20\pt	12.00\pt	
+    "flags"	 = \table {
+        "u3"	"\\eighthflag"	-0.20\pt	4.16\pt	-12.26\pt	0.20\pt	
+        "d3"	"\\deighthflag"	-0.20\pt	4.60\pt	-0.20\pt	11.66\pt	
+        "u4"	"\\sixteenthflag"	-0.20\pt	4.16\pt	-14.00\pt	0.20\pt	
+        "d4"	"\\dsixteenthflag"	-0.20\pt	4.60\pt	-0.20\pt	12.00\pt	
+        "u5"	"\\thirtysecondflag"	-0.20\pt	4.16\pt	-17.00\pt	0.20\pt	
+        "d5"	"\\dthirtysecondflag"	-0.20\pt	4.16\pt	-0.20\pt	15.40\pt	
+        "u6"	"\\sixtyfourthflag"	-0.20\pt	4.16\pt	-21.00\pt	0.20\pt	
+        "d6"	"\\dsixtyfourthflag"	-0.20\pt	4.16\pt	-0.20\pt	17.40\pt	
         }
     %  } % $name
diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly
index fe8b274825..6b22684668 100644
--- a/init/font-en-tja20.ly
+++ b/init/font-en-tja20.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 01:50:55 1997
+% on Mon Oct 20 23:14:08 1997
 % Do not edit
 % input from out/font-en-tja20.log
 % name=\symboltables {
@@ -51,10 +51,14 @@
         "pedalheel"	"\\pedalheel"	-2.50\pt	2.50\pt	-2.50\pt	3.33\pt	
         "pedaltoe"	"\\pedaltoe"	-2.50\pt	2.50\pt	-0.00\pt	7.50\pt	
         }
-    "floogbars"	 = \table {
-        "3u"	"\\eighthflag"	-0.25\pt	5.20\pt	-16.04\pt	0.25\pt	
-        "3d"	"\\deighthflag"	-0.25\pt	5.75\pt	-0.25\pt	16.04\pt	
-        "4u"	"\\sixteenthflag"	-0.25\pt	5.20\pt	-16.25\pt	0.25\pt	
-        "4d"	"\\dsixteenthflag"	-0.25\pt	5.75\pt	-0.25\pt	15.00\pt	
+    "flags"	 = \table {
+        "u3"	"\\eighthflag"	-0.25\pt	5.20\pt	-15.33\pt	0.25\pt	
+        "d3"	"\\deighthflag"	-0.25\pt	5.75\pt	-0.25\pt	14.58\pt	
+        "u4"	"\\sixteenthflag"	-0.25\pt	5.20\pt	-17.50\pt	0.25\pt	
+        "d4"	"\\dsixteenthflag"	-0.25\pt	5.75\pt	-0.25\pt	15.00\pt	
+        "u5"	"\\thirtysecondflag"	-0.25\pt	5.20\pt	-21.25\pt	0.25\pt	
+        "d5"	"\\dthirtysecondflag"	-0.25\pt	5.20\pt	-0.25\pt	19.25\pt	
+        "u6"	"\\sixtyfourthflag"	-0.25\pt	5.20\pt	-26.25\pt	0.25\pt	
+        "d6"	"\\dsixtyfourthflag"	-0.25\pt	5.20\pt	-0.25\pt	21.75\pt	
         }
     %  } % $name
diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index 575c4943fc..8b6c0c79fe 100644
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -1,7 +1,7 @@
 % flags 
 %
 
-fet_begingroup("floogbars")
+fet_begingroup("flags")
 
 % Flags pointing down overlap with  the notehead (in x-direction), so 
 % the down-flag can be bigger
@@ -58,8 +58,7 @@ enddef;
 
 
 % godbewaarme, wat een kutsymbolen
-fet_beginchar("8th Flag (up)", "3u", "eighthflag")
-
+fet_beginchar("8th Flag (up)", "u3", "eighthflag")
 	save flare, 
 	hip_depth, hip_width,
 	foot_depth, foot_width;
@@ -68,7 +67,7 @@ fet_beginchar("8th Flag (up)", "3u", "eighthflag")
 	hip_depth# = 8/15 foot_depth#; 
 	hip_width# = upflag_width# - hip_thickness#/2;
 
-	foot_depth# =  15/7 interline#;
+	foot_depth# + flare# =  3 interline#;
 	foot_width# = .8 hip_width#;
 
 	set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
@@ -87,7 +86,7 @@ fet_beginchar("8th Flag (up)", "3u", "eighthflag")
 	draw (0, 0) .. (0,-2 interline);
 fet_endchar;
 
-fet_beginchar("8th Flag (down)", "3d", "deighthflag")
+fet_beginchar("8th Flag (down)", "d3", "deighthflag")
 	save flare, 
 	hip_depth, hip_width, 
 	foot_depth, foot_width;
@@ -96,8 +95,10 @@ fet_beginchar("8th Flag (down)", "3d", "deighthflag")
 
 	hip_depth# = 8/15 foot_depth#; 
 	hip_width# = downflag_width# - hip_thickness#/2;
-	foot_depth# = 15/7 interline#;
-	foot_width# = .8 hip_width#;
+
+	% 2.9 -> don't intersect staffline at foot
+	foot_depth# + flare# =  2.85 interline#;
+	foot_width# = .82 hip_width#;
 
 	set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
 		+ stemthickness#/2, 
@@ -117,7 +118,7 @@ fet_beginchar("8th Flag (down)", "3d", "deighthflag")
 fet_endchar;
 
 
-fet_beginchar("16th Flag (up)", "4u", "sixteenthflag")
+fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
 	save flare,  flagspace,
 	hip_depth, hip_width, 
 	foot_depth, foot_width;
@@ -126,14 +127,14 @@ fet_beginchar("16th Flag (up)", "4u", "sixteenthflag")
 	flagspace# = .85 interline#;
 	hip_depth# = 8/15 foot_depth#; 
 
-	flagspace# + flare# + foot_depth# = 3.25 interline#;
+	flagspace# + flare# + foot_depth# = 3.5 interline#;
 
 	hip_width# = upflag_width# - hip_thickness#/2;
 	foot_width# = .8 hip_width#;
 
 	set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
 		+ stemthickness#/2, 
-		3.25 interline#, stemthickness#/2)
+		3.5 interline#, stemthickness#/2)
 
 	define_pixels(flagspace);
 		define_pixels(flare, 
@@ -142,7 +143,7 @@ fet_beginchar("16th Flag (up)", "4u", "sixteenthflag")
 
 	draw_flag((stemthickness/2, 0),flare, 
 		1.2 hip_depth, .97 hip_width, hip_thickness,
-		foot_depth, .9 foot_width, foot_thickness, 0.37);	
+		foot_depth, .9 foot_width, foot_thickness, 0.5);	
 	draw_flag((stemthickness/2, -flagspace),flare, 
 		hip_depth,  hip_width, hip_thickness,
 		foot_depth, foot_width, foot_thickness, 0);	
@@ -153,7 +154,7 @@ fet_beginchar("16th Flag (up)", "4u", "sixteenthflag")
 fet_endchar;
 
 
-fet_beginchar("16th Flag (up)", "4d", "dsixteenthflag")
+fet_beginchar("16th Flag (down)", "d4", "dsixteenthflag")
 	save flare,  flagspace,
 	hip_depth, hip_width, 
 	foot_depth, foot_width;
@@ -179,7 +180,7 @@ fet_beginchar("16th Flag (up)", "4d", "dsixteenthflag")
 
 	draw_flag((stemthickness/2, 0),flare, 
 		 hip_depth, .97 hip_width, hip_thickness,
-		1.2 foot_depth, .95 foot_width, foot_thickness, 0.0);	
+		1.2 foot_depth, .95 foot_width, foot_thickness, 0.0);
 
 	draw_flag((stemthickness/2, -flagspace),flare, 
 		hip_depth,  hip_width, hip_thickness,
@@ -191,4 +192,169 @@ fet_beginchar("16th Flag (up)", "4d", "dsixteenthflag")
 	y_mirror_char;
 fet_endchar;
 
-fet_endgroup("floogbars");
+fet_beginchar("32nd Flag (up)", "u5", "thirtysecondflag")
+	save flare,  flagspace,
+	hip_depth, hip_width, 
+	foot_depth, foot_width;
+
+	flare# = 0.85 interline#;
+	flagspace# = .87 interline#;
+	hip_depth# = 8/15 foot_depth#; 
+
+	2 flagspace# + flare# + foot_depth# = 4.25 interline#;
+
+	hip_width# = upflag_width# - hip_thickness#/2;
+	foot_width# = .8 hip_width#;
+
+	set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
+		+ stemthickness#/2, 
+		4.25 interline#, stemthickness#/2)
+
+	define_pixels(flagspace);
+		define_pixels(flare, 
+	hip_depth, hip_width, hip_thickness,
+	foot_depth, foot_width, foot_thickness);
+
+	draw_flag((stemthickness/2, 0),flare, 
+		1.25 hip_depth, .95 hip_width, hip_thickness,
+		.85 foot_depth, 1.1 foot_width, foot_thickness, 0.0);	
+	draw_flag((stemthickness/2, -flagspace),flare, 
+		1.2 hip_depth, .97 hip_width, hip_thickness,
+		foot_depth, .9 foot_width, foot_thickness, 0.37);	
+	draw_flag((stemthickness/2, -2 flagspace),flare, 
+		1.1 hip_depth,  hip_width,  hip_thickness,
+		foot_depth, 1.15 foot_width,  foot_thickness, 0);	
+
+	pickup pencircle scaled stemthickness;
+	draw (0, 0) .. (0,-3 interline);
+
+fet_endchar;
+
+
+
+fet_beginchar("32nd Flag (up)", "d5", "dthirtysecondflag")
+	save flare,  flagspace,
+	hip_depth, hip_width, 
+	foot_depth, foot_width;
+
+	flare# = 0.85 interline#;
+	flagspace# = .85 interline#;
+	hip_depth# = .57 foot_depth#; 
+	foot_width# = 1.0 hip_width#;
+
+	2 flagspace# + flare# + foot_depth# = 3.85 interline#;
+	hip_width# = upflag_width# - hip_thickness#/2;
+
+
+	set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
+		+ stemthickness#/2, 
+		3.85 interline#, stemthickness#/2)
+
+	define_pixels(flagspace);
+		define_pixels(flare, 
+	hip_depth, hip_width, hip_thickness,
+	foot_depth, foot_width, foot_thickness);
+
+	draw_flag((stemthickness/2, 0),flare, 
+		1.3 hip_depth, .93 hip_width, hip_thickness,
+		foot_depth,  .9 foot_width, foot_thickness, 0.0);	
+	draw_flag((stemthickness/2, -flagspace),flare, 
+		1.15 hip_depth, .97 hip_width, hip_thickness,
+		foot_depth,  .95 foot_width, foot_thickness, 0.0);	
+	draw_flag((stemthickness/2, -2 flagspace),flare, 
+		1.0 hip_depth,  hip_width, .95 hip_thickness,
+		foot_depth,  foot_width, .93 foot_thickness, 0);	
+
+	pickup pencircle scaled stemthickness;
+	draw (0, 0) .. (0,-3 interline);
+	y_mirror_char;
+fet_endchar;
+
+fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
+	save flare,  flagspace,
+	hip_depth, hip_width, 
+	foot_depth, foot_width;
+
+	flare# = 0.85 interline#;
+	flagspace# = .9 interline#;
+	hip_depth# = 8/15 foot_depth#; 
+
+	3 flagspace# + flare# + foot_depth# = 5.25 interline#;
+
+	hip_width# = upflag_width# - hip_thickness#/2;
+	foot_width# = .8 hip_width#;
+
+	set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
+		+ stemthickness#/2, 
+		5.25 interline#, stemthickness#/2)
+
+	define_pixels(flagspace);
+		define_pixels(flare, 
+	hip_depth, hip_width, hip_thickness,
+	foot_depth, foot_width, foot_thickness);
+
+	draw_flag((stemthickness/2, 0),flare, 
+		1.25 hip_depth, .95 hip_width, hip_thickness,
+		.85 foot_depth, 1.1 foot_width, foot_thickness, 0.0);	
+	draw_flag((stemthickness/2, -flagspace),flare, 
+		1.2 hip_depth, .97 hip_width, hip_thickness,
+		foot_depth, .9 foot_width, foot_thickness, 0.37);	
+	draw_flag((stemthickness/2, -2flagspace),flare, 
+		1.2 hip_depth, .97 hip_width, hip_thickness,
+		foot_depth, .9 foot_width, foot_thickness, 0.37);	
+	draw_flag((stemthickness/2, -3 flagspace),flare, 
+		1.1 hip_depth,  hip_width,  hip_thickness,
+		foot_depth, 1.15 foot_width,  foot_thickness, 0);	
+
+	pickup pencircle scaled stemthickness;
+	draw (0, 0) .. (0,-5 interline);
+
+fet_endchar;
+
+
+fet_beginchar("64th Flag (down)", "d6", "dsixtyfourthflag")
+	save flare,  flagspace,
+	hip_depth, hip_width, 
+	foot_depth, foot_width;
+	save lastcut;
+	flare# = 0.85 interline#;
+	flagspace# = .9 interline#;
+	hip_depth# = .57 foot_depth#; 
+	foot_width# = 1.0 hip_width#;
+
+	lastcut = .7;
+
+	3 flagspace# + flare# + hip_depth# + 
+		(foot_depth# - hip_depth#) * (1-lastcut) = 4.35 interline#;
+	hip_width# = upflag_width# - hip_thickness#/2;
+
+
+	set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
+		+ stemthickness#/2, 
+		4.35 interline#, stemthickness#/2)
+
+	define_pixels(flagspace);
+		define_pixels(flare, 
+	hip_depth, hip_width, hip_thickness,
+	foot_depth, foot_width, foot_thickness);
+
+	draw_flag((stemthickness/2, 0),flare, 
+		1.33 hip_depth, .92 hip_width, hip_thickness,
+		1.15 foot_depth,  .9 foot_width, foot_thickness, 0.0);	
+	draw_flag((stemthickness/2, -flagspace),flare, 
+		1.15 hip_depth, .97 hip_width, hip_thickness,
+		1.14 foot_depth,  .92 foot_width, foot_thickness, 0.0);	
+	draw_flag((stemthickness/2, -2 flagspace),flare, 
+		1.15 hip_depth, .97 hip_width, hip_thickness,
+		1.12 foot_depth,  .95 foot_width, foot_thickness, 0.0);	
+	draw_flag((stemthickness/2, -3flagspace),flare, 
+		1.0 hip_depth,  hip_width, .95 hip_thickness,
+		foot_depth,  foot_width, .93 foot_thickness, lastcut);	
+
+	pickup pencircle scaled stemthickness;
+	draw (0, 0) .. (0,-5 interline);
+	y_mirror_char;
+fet_endchar;
+
+
+fet_endgroup("flags");
diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex
index d7c1698b2c..890c8c726f 100644
--- a/tex/font-en-tja16.tex
+++ b/tex/font-en-tja16.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 01:50:48 1997
+% on Mon Oct 20 23:14:01 1997
 % Do not edit
 % input from out/font-en-tja16.log
 % name
@@ -51,9 +51,13 @@
 \fetdef\pedalheel{36}
 \fetdef\pedaltoe{37}
 
-% floogbars
+% flags
 \fetdef\eighthflag{38}
 \fetdef\deighthflag{39}
 \fetdef\sixteenthflag{40}
 \fetdef\dsixteenthflag{41}
+\fetdef\thirtysecondflag{42}
+\fetdef\dthirtysecondflag{43}
+\fetdef\sixtyfourthflag{44}
+\fetdef\dsixtyfourthflag{45}
 
diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex
index 6e2125afd1..347abfb998 100644
--- a/tex/font-en-tja20.tex
+++ b/tex/font-en-tja20.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 01:50:55 1997
+% on Mon Oct 20 23:14:08 1997
 % Do not edit
 % input from out/font-en-tja20.log
 % name
@@ -51,9 +51,13 @@
 \fetdef\pedalheel{36}
 \fetdef\pedaltoe{37}
 
-% floogbars
+% flags
 \fetdef\eighthflag{38}
 \fetdef\deighthflag{39}
 \fetdef\sixteenthflag{40}
 \fetdef\dsixteenthflag{41}
+\fetdef\thirtysecondflag{42}
+\fetdef\dthirtysecondflag{43}
+\fetdef\sixtyfourthflag{44}
+\fetdef\dsixtyfourthflag{45}