]> git.donarmstrong.com Git - lilypond.git/commitdiff
lilypond-0.1.26
authorfred <fred>
Sun, 24 Mar 2002 20:01:11 +0000 (20:01 +0000)
committerfred <fred>
Sun, 24 Mar 2002 20:01:11 +0000 (20:01 +0000)
init/font-en-tja16.ly
init/font-en-tja20.ly
mf/feta-banier.mf
tex/font-en-tja16.tex
tex/font-en-tja20.tex

index 41e99c6833a9f6f208412d2b3326787cc77c698b..8c5488ed2a18dbb5b5bc66b067786664cc558da7 100644 (file)
@@ -1,13 +1,13 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 23:14:01 1997
+% on Mon Oct 27 02:45:17 1997
 % Do not edit
 % input from out/font-en-tja16.log
 % name=\symboltables {
     "rests"     = \table {
-        "0"    "\\wholerest"   -0.00\pt        6.00\pt 1.50\pt 4.00\pt 
+        "0"    "\\wholerest"   -0.00\pt        6.00\pt -2.50\pt        0.00\pt 
         "1"    "\\halfrest"    -0.00\pt        6.00\pt -0.00\pt        2.50\pt 
-        "0o"   "\\outsidewholerest"    -2.50\pt        8.50\pt 1.50\pt 4.00\pt 
-        "1o"   "\\outsidehalfrest"     -2.50\pt        8.50\pt -0.00\pt        2.50\pt 
+        "0o"   "\\outsidewholerest"    -2.50\pt        8.50\pt -2.50\pt        0.40\pt 
+        "1o"   "\\outsidehalfrest"     -2.50\pt        8.50\pt -0.40\pt        2.50\pt 
         "2"    "\\quartrest"   -0.00\pt        4.32\pt 3.00\pt 14.40\pt        
         "3"    "\\eighthrest"  -0.00\pt        5.33\pt 4.00\pt 11.47\pt        
         "4"    "\\sixteenthrest"       -0.00\pt        6.23\pt -0.00\pt        11.47\pt        
         "pedaltoe"     "\\pedaltoe"    -2.00\pt        2.00\pt -0.00\pt        6.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        
+        "u3"   "\\eighthflag"  -0.20\pt        4.10\pt -12.26\pt       0.20\pt 
+        "u4"   "\\sixteenthflag"       -0.20\pt        4.10\pt -14.26\pt       0.20\pt 
+        "u5"   "\\thirtysecondflag"    -0.20\pt        4.10\pt -17.26\pt       0.20\pt 
+        "u6"   "\\sixtyfourthflag"     -0.20\pt        4.10\pt -21.26\pt       0.20\pt 
+        "d3"   "\\deighthflag" -0.20\pt        4.54\pt -0.20\pt        11.66\pt        
+        "d4"   "\\dsixteenthflag"      -0.20\pt        4.54\pt -0.20\pt        12.26\pt        
+        "d5"   "\\dthirtysecondflag"   -0.20\pt        4.54\pt -0.20\pt        15.66\pt        
+        "d6"   "\\dsixtyfourthflag"    -0.20\pt        4.54\pt -0.20\pt        17.66\pt        
         }
     %  } % $name
index 6b22684668a5968eff9d324e7d35e8ca546deb16..14c637a32878eb7136cc1539783d68573b534093 100644 (file)
@@ -1,13 +1,13 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 23:14:08 1997
+% on Mon Oct 27 02:45:24 1997
 % Do not edit
 % input from out/font-en-tja20.log
 % name=\symboltables {
     "rests"     = \table {
-        "0"    "\\wholerest"   -0.00\pt        7.50\pt 1.88\pt 5.00\pt 
+        "0"    "\\wholerest"   -0.00\pt        7.50\pt -3.13\pt        0.00\pt 
         "1"    "\\halfrest"    -0.00\pt        7.50\pt -0.00\pt        3.13\pt 
-        "0o"   "\\outsidewholerest"    -3.13\pt        10.62\pt        1.88\pt 5.00\pt 
-        "1o"   "\\outsidehalfrest"     -3.13\pt        10.62\pt        -0.00\pt        3.13\pt 
+        "0o"   "\\outsidewholerest"    -3.13\pt        10.62\pt        -3.13\pt        0.50\pt 
+        "1o"   "\\outsidehalfrest"     -3.13\pt        10.62\pt        -0.50\pt        3.13\pt 
         "2"    "\\quartrest"   -0.00\pt        5.40\pt 3.75\pt 18.00\pt        
         "3"    "\\eighthrest"  -0.00\pt        6.67\pt 5.00\pt 14.33\pt        
         "4"    "\\sixteenthrest"       -0.00\pt        7.79\pt -0.00\pt        14.33\pt        
         "pedaltoe"     "\\pedaltoe"    -2.50\pt        2.50\pt -0.00\pt        7.50\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        
+        "u3"   "\\eighthflag"  -0.25\pt        5.13\pt -15.33\pt       0.25\pt 
+        "u4"   "\\sixteenthflag"       -0.25\pt        5.13\pt -17.83\pt       0.25\pt 
+        "u5"   "\\thirtysecondflag"    -0.25\pt        5.13\pt -21.58\pt       0.25\pt 
+        "u6"   "\\sixtyfourthflag"     -0.25\pt        5.13\pt -26.58\pt       0.25\pt 
+        "d3"   "\\deighthflag" -0.25\pt        5.68\pt -0.25\pt        14.58\pt        
+        "d4"   "\\dsixteenthflag"      -0.25\pt        5.68\pt -0.25\pt        15.33\pt        
+        "d5"   "\\dthirtysecondflag"   -0.25\pt        5.68\pt -0.25\pt        19.58\pt        
+        "d6"   "\\dsixtyfourthflag"    -0.25\pt        5.68\pt -0.25\pt        22.08\pt        
         }
     %  } % $name
index 8b6c0c79fe0b340c4374c715de10feaab2aca564..6f80e3d3d1abad92b5dd1ad896a37f98f7d01cb1 100644 (file)
@@ -1,12 +1,14 @@
 % flags 
 %
 
-fet_begingroup("flags")
 
+fet_begingroup("flags")
+save outer_path;
+path outer_path;
 % 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#;
+upflag_width# = .750 black_notehead_width# + stemthickness#/2;
+downflag_width# = .833 black_notehead_width# + stemthickness#/2;
 
 %
 % Flags pointing down cannot overlap with the notehead in y-direction,
@@ -27,334 +29,354 @@ foot_thickness# =  hip_thickness#;
 % for example, see POSTSCRIPT Language -- program design, 
 % page 119, and [Wanske], p 41,42
 %
-def draw_flag(expr center, flare,
-       hip_depth, hip_width, hip_thickness,
-       foot_depth, foot_width, foot_thickness, flagcut) =
+
+def draw_flag(expr center, flare, 
+       dims, hip_depth, foot_wid, hip_thickness, foot_thickness)=
        clearxy;
 
        penpos1(flare, 90);
-       penpos2(whatever, 40);
+       penpos2(whatever, 0);
        x2r - x2l = hip_thickness;
        penpos3(foot_thickness, 0) ;
 
        z1r  = center;
-       z2 = center + (hip_width, -flare - hip_depth);
-       z3orig = center + (foot_width, -flare - foot_depth);
-       z3 = (1-flagcut) [z2, z3orig];
+       z2r = center + (xpart dims, -ypart(dims) * hip_depth);
+       z3r = center + (xpart(dims) * foot_wid, -ypart dims);
 
+       outer_path := z3r{curl 0} .. z2r{up} .. {up}z1r;
 
-       save bot_dir, bot_path;
-       pair bot_dir;
-       path bot_path;
-       bot_path := z2{down} .. z3;
-       bot_dir := direction 1 of bot_path;
-
+       penlabels(1, 2, 3);
        fill z1l{curl 0}
-               ..tension 1.1 .. z2l .. 
-               z3l{bot_dir}  .. z3r{-bot_dir} ..
-               z2r .. {up}z1r & z1r -- cycle;
+               ..tension 1.1 .. z2l{down} .. 
+               {curl 0} simple_serif(z3l, z3r, 80) &
+               outer_path & z1r -- cycle;
 enddef;
 
+%
+% TODO: calc intersectpoint
+% TODO: calc incision_depth
+% 
+def add_flag(expr yoff, flare, hip_wid_multiplier, 
+               hip_dep_multiplier,
+               intersectpoint, hip_thickness, foot_thickness) =
+       begingroup
+       save prev_center, prev_xextreme, prev_yextreme;
+       save rel_foot, ip, center, incision_depth;
+       save prev_hipwid, prev_footdep, prev_hipdep, wid, dep, hip_dep;
+       save hip_dep_ratio, foot_wid_ratio;
+       pair prev_center, center, foot, prev_xextreme, prev_yextreme;
+       pair ip, rel_foot;
+       
+       incision_depth = 1.013;
+       prev_center = point 2 of outer_path;
+       prev_xextreme = point 1 of outer_path;
+       prev_yextreme = point 0 of outer_path;
+       prev_hipwid = xpart (prev_xextreme - prev_center);
+       prev_footdep = -ypart (prev_yextreme - prev_center);
+       prev_hipdep = -ypart(prev_xextreme - prev_center);
+       ip = point intersectpoint of outer_path;
+
+       wid = prev_hipwid * hip_wid_multiplier;
+       hip_dep = prev_hipdep * hip_dep_multiplier;
+
+       center = prev_center + (0,yoff);
+       rel_foot = incision_depth [(wid, hip_dep), ip - center];
+       dep = -ypart(rel_foot);
+       foot_wid_ratio = xpart(rel_foot ) / wid;
+       hip_dep_ratio = hip_dep / dep;
+
+       draw_flag(center, flare, 
+               (wid, dep), hip_dep_ratio, foot_wid_ratio, 
+               hip_thickness, foot_thickness);
+       endgroup
+enddef;
 
-
-% godbewaarme, wat een kutsymbolen
 fet_beginchar("8th Flag (up)", "u3", "eighthflag")
        save flare, 
-       hip_depth, hip_width,
-       foot_depth, foot_width;
+               hip_depth_ratio, hip_width,
+               foot_depth, foot_width_ratio;
 
        flare# = 1.0 interline#;
-       hip_depth# = 8/15 foot_depth#; 
+       hip_depth_ratio = .72; 
+       foot_width_ratio = .8;
        hip_width# = upflag_width# - hip_thickness#/2;
 
-       foot_depth# + flare# =  3 interline#;
-       foot_width# = .8 hip_width#;
+       foot_depth# =  3 interline#;
 
-       set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
+       set_char_box(stemthickness# /2, hip_width# 
                + stemthickness#/2, 
-               flare# + foot_depth# + foot_thickness#/2, stemthickness#/2)
+                foot_depth# + foot_thickness#/2, stemthickness#/2)
 
-       define_pixels(flare, 
-       hip_depth, hip_width, hip_thickness,
-       foot_depth, foot_width, foot_thickness);
+       define_pixels(flare, hip_width, hip_thickness,
+               foot_depth, 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);
+               (hip_width, foot_depth), 
+               hip_depth_ratio, foot_width_ratio, hip_thickness, foot_thickness);
+
        pickup pencircle scaled stemthickness;
        draw (0, 0) .. (0,-2 interline);
 fet_endchar;
 
-fet_beginchar("8th Flag (down)", "d3", "deighthflag")
+fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
        save flare, 
-       hip_depth, hip_width, 
-       foot_depth, foot_width;
+               hip_depth_ratio, hip_width,
+               foot_depth, foot_width_ratio;
+       save flagspace, total_depth, flag_count;
+       total_depth# = 3.5 interline#;
+       flag_count = 2;
+       flare# = .85 interline#;
+       flagspace# = .85 interline#;    
+       hip_depth_ratio = .72 ;
+       hip_width# = upflag_width# - hip_thickness#/2;
+       flagspace# + foot_depth# = total_depth#;
 
-       flare# = 1.0 interline#;
+       foot_width_ratio = .8;
 
-       hip_depth# = 8/15 foot_depth#; 
-       hip_width# = downflag_width# - hip_thickness#/2;
+       set_char_box(stemthickness# /2, hip_width#
+               + stemthickness#/2, 
+               total_depth# + foot_thickness#/2, stemthickness#/2)
 
-       % 2.9 -> don't intersect staffline at foot
-       foot_depth# + flare# =  2.85 interline#;
-       foot_width# = .82 hip_width#;
+       define_pixels(flare, hip_width, hip_thickness,
+               flagspace,
+               foot_depth,  foot_thickness);
 
-       set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
-               + stemthickness#/2
-               flare# + foot_depth# + foot_thickness#/2, stemthickness#/2)
+       draw_flag((stemthickness/2,- flagspace), flare, 
+               (hip_width, foot_depth)
+               hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
 
-       define_pixels(flare, 
-       hip_depth, hip_width, hip_thickness,
-       foot_depth, foot_width, foot_thickness);
+       add_flag(flagspace, flare,
+               .97, 1.00, 1.25, hip_thickness, 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)", "u4", "sixteenthflag")
-       save flare,  flagspace,
-       hip_depth, hip_width, 
-       foot_depth, foot_width;
+fet_beginchar("32nd Flag (up)", "u5", "thirtysecondflag")
+       save flare, 
+               hip_depth_ratio, hip_width,
+               foot_depth, foot_width_ratio;
+       save flagspace, total_depth, flag_count;
+       flag_count = 3;
+       total_depth#=4.25 interline#;
+       flare# = .85 interline#;
+       flagspace# = .87 interline#;    
+       hip_depth_ratio = .72 ;
+       hip_width# = upflag_width# - hip_thickness#/2;
+       (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
-       flare# = 0.85 interline#;
-       flagspace# = .85 interline#;
-       hip_depth# = 8/15 foot_depth#; 
+       foot_width_ratio = .8;
 
-       flagspace# + flare# + foot_depth# = 3.5 interline#;
+       set_char_box(stemthickness# /2, hip_width#
+               + stemthickness#/2, 
+               total_depth# + foot_thickness#/2, stemthickness#/2)
 
-       hip_width# = upflag_width# - hip_thickness#/2;
-       foot_width# = .8 hip_width#;
+       define_pixels(flare, hip_width, hip_thickness,
+               flagspace,
+               foot_depth,  foot_thickness);
 
-       set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
-               + stemthickness#/2
-               3.5 interline#, stemthickness#/2)
+       draw_flag((stemthickness/2,- 2 flagspace), flare, 
+               (hip_width, foot_depth)
+               hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
 
-       define_pixels(flagspace);
-               define_pixels(flare, 
-       hip_depth, hip_width, hip_thickness,
-       foot_depth, foot_width, foot_thickness);
+       add_flag(flagspace, flare,
+               .97, 1.00, 1.25, hip_thickness, 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.5);        
-       draw_flag((stemthickness/2, -flagspace),flare, 
-               hip_depth,  hip_width, hip_thickness,
-               foot_depth, foot_width, foot_thickness, 0);     
+       add_flag(flagspace, flare,
+               .95, 1.05, 1.25, hip_thickness, foot_thickness);  
 
        pickup pencircle scaled stemthickness;
        draw (0, 0) .. (0,-2 interline);
-
 fet_endchar;
 
+fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
+       save flare, 
+               hip_depth_ratio, hip_width,
+               foot_depth, foot_width_ratio;
+       save flagspace, total_depth, flag_count;
+       
+       flag_count = 4;
+       flare# = .85 interline#;
+       flagspace# = .9 interline#;     
+       hip_depth_ratio = .72 ;
+       hip_width# = upflag_width# - hip_thickness#/2;
+       total_depth# = 5.25 interline#;
+       (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
-fet_beginchar("16th Flag (down)", "d4", "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#;
+       foot_width_ratio = .8;
 
-       set_char_box(stemthickness# /2, hip_width#  + hip_thickness#/2 
+       set_char_box(stemthickness# /2, hip_width#
                + stemthickness#/2, 
-               3 interline#, stemthickness#/2)
+               total_depth# + foot_thickness#/2, stemthickness#/2)
 
-       define_pixels(flagspace);
-               define_pixels(flare, 
-       hip_depth, hip_width, hip_thickness,
-       foot_depth, foot_width, foot_thickness);
+       define_pixels(flare, hip_width, hip_thickness,
+               flagspace,
+               foot_depth,  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,- (flag_count-1)* flagspace), flare, 
+               (hip_width, foot_depth), 
+               hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
 
-       draw_flag((stemthickness/2, -flagspace),flare, 
-               hip_depth,  hip_width, hip_thickness,
-               foot_depth, foot_width, foot_thickness, 0);     
+       add_flag(flagspace, flare,
+               .97, 1.00, 1.3, hip_thickness, foot_thickness);  
 
+       add_flag(flagspace, flare,
+               1.00, 1.00, 1.25, hip_thickness, foot_thickness);  
+       add_flag(flagspace, flare,
+               .95, 1.05, 1.25, hip_thickness, foot_thickness);  
        pickup pencircle scaled stemthickness;
        draw (0, 0) .. (0,-2 interline);
-
-       y_mirror_char;
 fet_endchar;
 
-fet_beginchar("32nd Flag (up)", "u5", "thirtysecondflag")
-       save flare,  flagspace,
-       hip_depth, hip_width, 
-       foot_depth, foot_width;
+fet_beginchar("8th (down)", "d3", "deighthflag")
+       save flare, 
+               hip_depth_ratio, hip_width,
+               foot_depth, foot_width_ratio;
+       save flagspace, total_depth, flag_count;
+       
+       flag_count = 1;
+       flare# = .99 interline#;
+       flagspace# = .9 interline#;     
+       hip_depth_ratio = .72 ;
+       hip_width# = downflag_width# - hip_thickness#/2;
+       total_depth# = 2.85 interline#;
+       (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
-       flare# = 0.85 interline#;
-       flagspace# = .87 interline#;
-       hip_depth# = 8/15 foot_depth#; 
+       foot_width_ratio = .8;
 
-       2 flagspace# + flare# + foot_depth# = 4.25 interline#;
+       set_char_box(stemthickness# /2, hip_width#
+               + stemthickness#/2, 
+               total_depth# + foot_thickness#/2, stemthickness#/2)
 
-       hip_width# = upflag_width# - hip_thickness#/2;
-       foot_width# = .8 hip_width#;
+       define_pixels(flare, hip_width, hip_thickness,
+               flagspace,
+               foot_depth,  foot_thickness);
 
-       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);       
+       draw_flag((stemthickness/2,- (flag_count-1) *flagspace), flare, 
+               (hip_width, foot_depth), 
+               hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
 
-       pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-3 interline);
 
+       pickup pencircle scaled stemthickness;
+       draw (0, 0) .. (0,-2 interline);
+       y_mirror_char;
 fet_endchar;
 
+fet_beginchar("16th (down)", "d4", "dsixteenthflag")
+       save flare, 
+               hip_depth_ratio, hip_width,
+               foot_depth, foot_width_ratio;
+       save flagspace, total_depth, flag_count;
+       
+       flag_count = 2;
+       flare# = .8 interline#;
+       flagspace# = .9 interline#;     
+       hip_depth_ratio = .85 ;
+       hip_width# = downflag_width# - hip_thickness#/2;
+       total_depth# = 3.0 interline#;
+       (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
+       foot_width_ratio = .95;
 
-fet_beginchar("32nd Flag (up)", "d5", "dthirtysecondflag")
-       save flare,  flagspace,
-       hip_depth, hip_width, 
-       foot_depth, foot_width;
+       set_char_box(stemthickness# /2, hip_width#
+               + stemthickness#/2, 
+               total_depth# + foot_thickness#/2, stemthickness#/2)
 
-       flare# = 0.85 interline#;
-       flagspace# = .85 interline#;
-       hip_depth# = .57 foot_depth#; 
-       foot_width# = 1.0 hip_width#;
+       define_pixels(flare, hip_width, hip_thickness,
+               flagspace,
+               foot_depth,  foot_thickness);
 
-       2 flagspace# + flare# + foot_depth# = 3.85 interline#;
-       hip_width# = upflag_width# - hip_thickness#/2;
+       draw_flag((stemthickness/2,- (flag_count-1) *flagspace), flare, 
+               (hip_width, foot_depth), 
+               hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+       add_flag(flagspace, flare,
+               .95, 1.00, 1.25, hip_thickness, foot_thickness);  
 
-
-       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);
+       draw (0, 0) .. (0,-2 interline);
        y_mirror_char;
 fet_endchar;
 
-fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
-       save flare,  flagspace,
-       hip_depth, hip_width, 
-       foot_depth, foot_width;
+fet_beginchar("32nd (down)", "d5", "dthirtysecondflag")
+       save flare, 
+               hip_depth_ratio, hip_width,
+               foot_depth, foot_width_ratio;
+       save flagspace, total_depth, flag_count;
+       
+       flag_count = 3;
+       flare# = .84 interline#;
+       flagspace# = .9 interline#;     
+       hip_depth_ratio = .85 ;
+       hip_width# = downflag_width# - hip_thickness#/2;
+       total_depth# = 3.85 interline#;
+       (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
-       flare# = 0.85 interline#;
-       flagspace# = .9 interline#;
-       hip_depth# = 8/15 foot_depth#; 
+       foot_width_ratio = .95;
 
-       3 flagspace# + flare# + foot_depth# = 5.25 interline#;
+       set_char_box(stemthickness# /2, hip_width#
+               + stemthickness#/2, 
+               total_depth# + foot_thickness#/2, stemthickness#/2)
 
-       hip_width# = upflag_width# - hip_thickness#/2;
-       foot_width# = .8 hip_width#;
+       define_pixels(flare, hip_width, hip_thickness,
+               flagspace,
+               foot_depth,  foot_thickness);
 
-       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);       
+       draw_flag((stemthickness/2,- (flag_count-1) *flagspace), flare, 
+               (hip_width, foot_depth), 
+               hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+       add_flag(flagspace, flare,
+               .97, 1.00, 1.25, hip_thickness, foot_thickness);  
 
-       pickup pencircle scaled stemthickness;
-       draw (0, 0) .. (0,-5 interline);
+       add_flag(flagspace, flare,
+               .95, 1.05, 1.25, hip_thickness, foot_thickness);  
+
+       
 
+       pickup pencircle scaled stemthickness;
+       draw (0, 0) .. (0,-2 interline);
+       y_mirror_char;
 fet_endchar;
+fet_beginchar("64th (down)", "d6", "dsixtyfourthflag")
+       save flare, 
+               hip_depth_ratio, hip_width,
+               foot_depth, foot_width_ratio;
+       save flagspace, total_depth, flag_count;
+       
+       flag_count = 4;
+       flare# = .8 interline#;
+       flagspace# = .9 interline#;     
+       hip_depth_ratio = .85 ;
+       hip_width# = downflag_width# - hip_thickness#/2;
+       total_depth# = 4.35 interline#;
+       (flag_count-1) * flagspace# + foot_depth# = total_depth#;
 
+       foot_width_ratio = .98;
 
-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#;
+       set_char_box(stemthickness# /2, hip_width#
+               + stemthickness#/2, 
+               total_depth# + foot_thickness#/2, stemthickness#/2)
 
-       lastcut = .7;
+       define_pixels(flare, hip_width, hip_thickness,
+               flagspace,
+               foot_depth,  foot_thickness);
 
-       3 flagspace# + flare# + hip_depth# + 
-               (foot_depth# - hip_depth#) * (1-lastcut) = 4.35 interline#;
-       hip_width# = upflag_width# - hip_thickness#/2;
+       draw_flag((stemthickness/2,- (flag_count-1) *flagspace), flare, 
+               (hip_width, foot_depth), 
+               hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness);
+       add_flag(flagspace, flare,
+               .97, 1.20, 1.175, hip_thickness, foot_thickness);  
+       add_flag(flagspace, flare,
+               .97, 1.10, 1.175, hip_thickness, foot_thickness);  
 
+       add_flag(flagspace, flare,
+               .95, 1.03, 1.175, hip_thickness, foot_thickness);  
 
-       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);
+       draw (0, 0) .. (0,-2 interline);
        y_mirror_char;
 fet_endchar;
-
-
 fet_endgroup("flags");
index 890c8c726f677e947acd86dd1999c029bd5c6139..03eaa36e9f809e123d36f4d65a304dadb34dcd51 100644 (file)
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 23:14:01 1997
+% on Mon Oct 27 02:45:17 1997
 % Do not edit
 % input from out/font-en-tja16.log
 % name
 
 % flags
 \fetdef\eighthflag{38}
-\fetdef\deighthflag{39}
-\fetdef\sixteenthflag{40}
-\fetdef\dsixteenthflag{41}
-\fetdef\thirtysecondflag{42}
-\fetdef\dthirtysecondflag{43}
-\fetdef\sixtyfourthflag{44}
+\fetdef\sixteenthflag{39}
+\fetdef\thirtysecondflag{40}
+\fetdef\sixtyfourthflag{41}
+\fetdef\deighthflag{42}
+\fetdef\dsixteenthflag{43}
+\fetdef\dthirtysecondflag{44}
 \fetdef\dsixtyfourthflag{45}
 
index 347abfb99882c66750028206060c190d7e50b8d7..efc3fd3a760bebad75e7bcb69085b67931c23141 100644 (file)
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 23:14:08 1997
+% on Mon Oct 27 02:45:24 1997
 % Do not edit
 % input from out/font-en-tja20.log
 % name
 
 % flags
 \fetdef\eighthflag{38}
-\fetdef\deighthflag{39}
-\fetdef\sixteenthflag{40}
-\fetdef\dsixteenthflag{41}
-\fetdef\thirtysecondflag{42}
-\fetdef\dthirtysecondflag{43}
-\fetdef\sixtyfourthflag{44}
+\fetdef\sixteenthflag{39}
+\fetdef\thirtysecondflag{40}
+\fetdef\sixtyfourthflag{41}
+\fetdef\deighthflag{42}
+\fetdef\dsixteenthflag{43}
+\fetdef\dthirtysecondflag{44}
 \fetdef\dsixtyfourthflag{45}