lilypond-0.1.24

diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly
index 037eee9b66433623dd8c417fac2292c2d5d24a31..394441aecc283c1b80b0b7bb026ec05518c1bf2f 100644 (file)
--- 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 Tue Oct 14 23:56:57 1997
+% on Mon Oct 20 01:50:48 1997
 % Do not edit
 % input from out/font-en-tja16.log
 % name=\symboltables {
@@ -52,7 +52,9 @@
         "pedaltoe"     "\\pedaltoe"    -2.00\pt        2.00\pt -0.00\pt        6.00\pt 
         }
     "floogbars"         = \table {
-        "3u"   "\\eighthflag"  -0.20\pt        4.18\pt -12.77\pt       0.20\pt 
-        "3d"   "\\deighthflag" -0.20\pt        4.18\pt -0.20\pt        12.77\pt        
+        "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        
         }
     %  } % $name

diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly
index 716f6bbc769097ea1f37d88c2f77232a9ad2f4d9..fe8b2748250c016ec0495d768d7dff89d74a6983 100644 (file)
--- 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 Tue Oct 14 23:57:04 1997
+% on Mon Oct 20 01:50:55 1997
 % Do not edit
 % input from out/font-en-tja20.log
 % name=\symboltables {
@@ -52,7 +52,9 @@
         "pedaltoe"     "\\pedaltoe"    -2.50\pt        2.50\pt -0.00\pt        7.50\pt 
         }
     "floogbars"         = \table {
-        "3u"   "\\eighthflag"  -0.25\pt        5.23\pt -15.91\pt       0.25\pt 
-        "3d"   "\\deighthflag" -0.25\pt        5.23\pt -0.25\pt        15.91\pt        
+        "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        
         }
     %  } % $name

diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index a7995d6ee1ef6dd9e5b8d369b45ccd5d5d51fe68..575c4943fcb89a5ca67824283933f100f4a4c93a 100644 (file)
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -1,51 +1,47 @@
 % flags 
 %
 
-
 fet_begingroup("floogbars")
 
-save flag_angle, flare;
-save hip_thickness, hip_depth, hip_width;
-save foot_thickness, foot_depth, foot_width;
-
-flag_angle = 32;
-
-hip_thickness# = 1.2 stafflinethickness#;
-foot_thickness# = blot_diameter#;
-flare# = 1.0 interline#;
-
-hip_depth# = 15/7 interline#; 
-hip_width# = 7/8 interline# + hip_thickness# /2 + stemthickness#/2;
+% Flags pointing down overlap with  the notehead (in x-direction), so 
+% the down-flag can be bigger
+upflag_width# = .750 black_notehead_width#;
+downflag_width# = .833 black_notehead_width#;
 
-foot_depth# = flare# + 15/7 interline#;
-foot_width# = .8 hip_width#;
-
-
-define_pixels(flare, 
-       hip_depth, hip_width, hip_thickness,
-       foot_depth, foot_width, foot_thickness
-);
+%
+% Flags pointing down cannot overlap with the notehead in y-direction,
+% so they have less slant.
 
-%treq;
+%
+% Because of optical illusion, the utmost flag 
+% (bottom for down-pointing, top  
+% for up-pointing) should be smaller than the other flags 
+%
 
+save hip_thickness, foot_thickness;
+hip_thickness# = 1.3 stemthickness#;
+foot_thickness# =  hip_thickness#;
 
 %
-% Inspired by Adobe Sonata,
+% Inspired by Adobe Sonata and [Wanske]
 % for example, see POSTSCRIPT Language -- program design, 
-% page 119
+% page 119, and [Wanske], p 41,42
 %
-def draw_eight_flag =
-       penpos0(stemthickness, 0);
+def draw_flag(expr center, flare,
+       hip_depth, hip_width, hip_thickness,
+       foot_depth, foot_width, foot_thickness, flagcut) =
+       clearxy;
+
        penpos1(flare, 90);
-       penpos2(hip_thickness, 0);
+       penpos2(whatever, 40);
+       x2r - x2l = hip_thickness;
        penpos3(foot_thickness, 0) ;
-       penpos4(stemthickness, 0);
 
-       z0r = z1r;
-       z0  = (0,0);
-       z2 = (hip_width, -hip_depth);
-       z3 = (foot_width, -foot_depth);
-       z4r = z1l;
+       z1r  = center;
+       z2 = center + (hip_width, -flare - hip_depth);
+       z3orig = center + (foot_width, -flare - foot_depth);
+       z3 = (1-flagcut) [z2, z3orig];
+
 
        save bot_dir, bot_path;
        pair bot_dir;
@@ -53,30 +49,146 @@ def draw_eight_flag =
        bot_path := z2{down} .. z3;
        bot_dir := direction 1 of bot_path;
 
-       fill z1l{dir -flag_angle} .. z2l{down} .. 
+       fill z1l{curl 0}
+               ..tension 1.1 .. z2l .. 
                z3l{bot_dir}  .. z3r{-bot_dir} ..
-               {up}z2r .. {up}z1r .. 
-               z0l{down} -- z4l -- cycle;
-               
-               ;
-
+               z2r .. {up}z1r & z1r -- cycle;
 enddef;
 
 
+
+% godbewaarme, wat een kutsymbolen
 fet_beginchar("8th Flag (up)", "3u", "eighthflag")
-       set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2, 
-               foot_depth# + foot_thickness#/2, stemthickness#/2)
 
-       draw_eight_flag;        
-       penlabels(0, 1, 2, 3, 4);
+       save flare, 
+       hip_depth, hip_width,
+       foot_depth, foot_width;
+
+       flare# = 1.0 interline#;
+       hip_depth# = 8/15 foot_depth#; 
+       hip_width# = upflag_width# - hip_thickness#/2;
+
+       foot_depth# =  15/7 interline#;
+       foot_width# = .8 hip_width#;
+
+       set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
+               + stemthickness#/2, 
+               flare# + foot_depth# + foot_thickness#/2, stemthickness#/2)
+
+       define_pixels(flare, 
+       hip_depth, hip_width, hip_thickness,
+       foot_depth, foot_width, foot_thickness);
+       draw_flag((stemthickness/2,0), flare, 
+               hip_depth, hip_width, hip_thickness,
+               foot_depth, foot_width, foot_thickness, 0)
+               ;       
+       penlabels(1, 2, 3);
+       pickup pencircle scaled stemthickness;
+       draw (0, 0) .. (0,-2 interline);
 fet_endchar;
 
 fet_beginchar("8th Flag (down)", "3d", "deighthflag")
-       set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2, 
-               foot_depth# + foot_thickness#/2, stemthickness#/2)
+       save flare, 
+       hip_depth, hip_width, 
+       foot_depth, foot_width;
+
+       flare# = 1.0 interline#;
+
+       hip_depth# = 8/15 foot_depth#; 
+       hip_width# = downflag_width# - hip_thickness#/2;
+       foot_depth# = 15/7 interline#;
+       foot_width# = .8 hip_width#;
+
+       set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
+               + stemthickness#/2, 
+               flare# + foot_depth# + foot_thickness#/2, stemthickness#/2)
+
+       define_pixels(flare, 
+       hip_depth, hip_width, hip_thickness,
+       foot_depth, foot_width, foot_thickness);
+
+       draw_flag((stemthickness/2,0),flare, 
+               hip_depth, hip_width, hip_thickness,
+               foot_depth, foot_width, foot_thickness, 0);     
+       pickup pencircle scaled stemthickness;
+       draw (0, 0) .. (0,-2 interline);
+
+       y_mirror_char;
+fet_endchar;
+
+
+fet_beginchar("16th Flag (up)", "4u", "sixteenthflag")
+       save flare,  flagspace,
+       hip_depth, hip_width, 
+       foot_depth, foot_width;
+
+       flare# = 0.85 interline#;
+       flagspace# = .85 interline#;
+       hip_depth# = 8/15 foot_depth#; 
+
+       flagspace# + flare# + foot_depth# = 3.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, 
+               3.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.2 hip_depth, .97 hip_width, hip_thickness,
+               foot_depth, .9 foot_width, foot_thickness, 0.37);       
+       draw_flag((stemthickness/2, -flagspace),flare, 
+               hip_depth,  hip_width, hip_thickness,
+               foot_depth, foot_width, foot_thickness, 0);     
+
+       pickup pencircle scaled stemthickness;
+       draw (0, 0) .. (0,-2 interline);
+
+fet_endchar;
+
+
+fet_beginchar("16th Flag (up)", "4d", "dsixteenthflag")
+       save flare,  flagspace,
+       hip_depth, hip_width, 
+       foot_depth, foot_width;
+
+       flare# = 0.87 interline#;
+       flagspace# = .9 interline#;
+       hip_depth# = .7 foot_depth#; 
+
+       flagspace# + flare# + foot_depth# = 3 interline#;
+
+       hip_width# = downflag_width# - hip_thickness#/2;
+
+       foot_width# = 1.00 hip_width#;
+
+       set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
+               + stemthickness#/2, 
+               3 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, 
+                hip_depth, .97 hip_width, hip_thickness,
+               1.2 foot_depth, .95 foot_width, foot_thickness, 0.0);   
+
+       draw_flag((stemthickness/2, -flagspace),flare, 
+               hip_depth,  hip_width, hip_thickness,
+               foot_depth, foot_width, foot_thickness, 0);     
+
+       pickup pencircle scaled stemthickness;
+       draw (0, 0) .. (0,-2 interline);
 
-       draw_eight_flag;
        y_mirror_char;
 fet_endchar;
 
-fet_endgroup("floogbars")
+fet_endgroup("floogbars");

diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex
index b941882ea80467cc1c745ecae2bfe43a27c4466d..d7c1698b2cd60bbae874d2fb465299fb7d67e44e 100644 (file)
--- 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 Tue Oct 14 23:56:57 1997
+% on Mon Oct 20 01:50:48 1997
 % Do not edit
 % input from out/font-en-tja16.log
 % name
@@ -54,4 +54,6 @@
 % floogbars
 \fetdef\eighthflag{38}
 \fetdef\deighthflag{39}
+\fetdef\sixteenthflag{40}
+\fetdef\dsixteenthflag{41}
 

diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex
index e105c51ff3e09606b2a1c56d2c0229c40f854778..6e2125afd11362b337e0b255a71a129dec658aa0 100644 (file)
--- 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 Tue Oct 14 23:57:04 1997
+% on Mon Oct 20 01:50:55 1997
 % Do not edit
 % input from out/font-en-tja20.log
 % name
@@ -54,4 +54,6 @@
 % floogbars
 \fetdef\eighthflag{38}
 \fetdef\deighthflag{39}
+\fetdef\sixteenthflag{40}
+\fetdef\dsixteenthflag{41}