CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/05/28 12:09:37

Modified files:
        .              : ChangeLog 
        mf             : feta-haak.mf 

Log message:
        * mf/feta-haak.mf: further tweaks.
        
        * mf/feta-haak.mf: rewrite. Make separate glyphs for the tips

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3670&tr2=1.3671&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/feta-haak.mf.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3670 lilypond/ChangeLog:1.3671
--- lilypond/ChangeLog:1.3670   Sat May 28 00:47:03 2005
+++ lilypond/ChangeLog  Sat May 28 12:09:37 2005
@@ -1,5 +1,7 @@
 2005-05-28  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+       * mf/feta-haak.mf: further tweaks.
+
        * lily/system-start-delimiter.cc (staff_bracket): use glyphs.
 
        * mf/feta-generic.mf: include feta-haak.
Index: lilypond/mf/feta-haak.mf
diff -u lilypond/mf/feta-haak.mf:1.7 lilypond/mf/feta-haak.mf:1.8
--- lilypond/mf/feta-haak.mf:1.7        Sat May 28 01:12:41 2005
+++ lilypond/mf/feta-haak.mf    Sat May 28 12:09:37 2005
@@ -3,28 +3,29 @@
 
 def draw_bracket(expr thick_sharp, width_sharp, updown) =
 begingroup;
-       save p, thin, thick, flattening, width, hair;
+       save p, thin, thick, flattening, width, hair, flare;
        path p;
        pair tipdir;
 
-       flattening = 0.70;
-       thick# := thick_sharp;
-       width# := width_sharp;
+       flattening = 0.72;
+       thick# = thick_sharp;
+       flare# = flattening * width#;
+       width# = width_sharp;
 
-       define_pixels (thick, width);
+       define_pixels (thick, width, flare);
        if updown = 1:
                set_char_box (0, width#,
-                             .5 thick# , flattening * width#);
+                             .5 thick# , flare#);
        else:
                set_char_box (0, width#,
-                               flattening * width#, .5 thick#);
+                               flare#, .5 thick#);
        fi;
 
        thin = 2 linethickness;
        hair = 1.25 linethickness;
 
        pickup pencircle scaled thin;
-       z7 = z1 + (thick,0); 
+       z7 = z1 + (3/4 thick,0); 
        z2 = z4r + (thin, 0);
 
 
@@ -40,8 +41,8 @@
 
 
        z8 = .5  [z2, z7];
-       top y5 = h;
-       rt x5 = w;
+       top y5 = flare;
+       rt x5 = width;
 
        save leave_angle;
        leave_angle = 10;
@@ -79,11 +80,11 @@
 enddef;
 
 fet_beginchar ("bracket tip up", "up");
-   draw_bracket (0.45 staff_space#, 2.0 staff_space#, 1);
+   draw_bracket (0.45 staff_space#, 1.9 staff_space#, 1);
 fet_endchar;
 
 fet_beginchar ("bracket tip down", "down"); 
-   draw_bracket (0.45 staff_space#, 2.0 staff_space#, -1);
+   draw_bracket (0.45 staff_space#, 1.9 staff_space#, -1);
 fet_endchar;
 
 fet_endgroup ("brackettips");


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to