CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/28 00:57:28
Modified files:
lily : system-start-delimiter.cc
mf : feta-haak.mf
Log message:
* lily/system-start-delimiter.cc (staff_bracket): use glyphs.
* mf/feta-haak.mf: rewrite. Make separate glyphs for the tips
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/system-start-delimiter.cc.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/feta-haak.mf.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: lilypond/lily/system-start-delimiter.cc
diff -u lilypond/lily/system-start-delimiter.cc:1.96
lilypond/lily/system-start-delimiter.cc:1.97
--- lilypond/lily/system-start-delimiter.cc:1.96 Sat May 28 00:47:53 2005
+++ lilypond/lily/system-start-delimiter.cc Sat May 28 00:57:28 2005
@@ -68,6 +68,7 @@
fm->find_by_name ("brackettips.up"));
Real thickness = robust_scm2double (me->get_property ("thickness"), 0.25);
+
Stencil bracket = Lookup::filled_box (Box (Interval (0, thickness),
Interval (-height/2, height/2)));
Index: lilypond/mf/feta-haak.mf
diff -u lilypond/mf/feta-haak.mf:1.5 lilypond/mf/feta-haak.mf:1.6
--- lilypond/mf/feta-haak.mf:1.5 Sat May 28 00:47:04 2005
+++ lilypond/mf/feta-haak.mf Sat May 28 00:57:28 2005
@@ -3,7 +3,7 @@
def draw_bracket(expr thick_sharp, width_sharp, updown) =
begingroup;
- save p, thin, thick, flattening, width;
+ save p, thin, thick, flattening, width, hair;
path p;
pair tipdir;
@@ -21,7 +21,8 @@
fi;
thin = 2 linethickness;
-
+ hair = linethickness;
+
pickup pencircle scaled thin;
@@ -34,25 +35,34 @@
lft x3 = 0.0;
x1 = x3l;
y1 = -0.5 thick;
-
+
+
+ save tight;
+ tight := 1.3;
z5 = .5 [z1, z3] + (width - thin, flattening * width - .5 thin);
- p := .5 [z1, z3]{right} .. z5;
+ p := .5 [z1, z3]{right}
+ .. tension tight
+ .. z5;
tipdir := (direction 1 of p);
- penpos5 (thin, angle (tipdir));
- penpos6 (thin, 90 + angle (tipdir));
+ penpos5 (hair, angle (tipdir));
+ penpos6 (hair, 90 + angle (tipdir));
z5 = z6;
z7 = z1 + (thick,0);
-
+ z2 = z4r + (thin, 0);
pickup pencircle scaled 1;
% draw p;
fill (z1{up} .. z3l{up}
- .. z4r{right} .. z6r{tipdir}
+ .. z4r{right}
+ .. z2{right}
+ .. tension tight
+ .. z6r{tipdir}
.. z5r .. z6l{-tipdir}
+ .. tension tight
.. z7{left} .. z1{left} & cycle)
yscaled updown;
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
