CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/28 01:12:41
Modified files:
lily : system-start-delimiter.cc
mf : feta-haak.mf
scm : define-grobs.scm
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.97&tr2=1.98&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/feta-haak.mf.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.202&tr2=1.203&r1=text&r2=text
Patches:
Index: lilypond/lily/system-start-delimiter.cc
diff -u lilypond/lily/system-start-delimiter.cc:1.97
lilypond/lily/system-start-delimiter.cc:1.98
--- lilypond/lily/system-start-delimiter.cc:1.97 Sat May 28 00:57:28 2005
+++ lilypond/lily/system-start-delimiter.cc Sat May 28 01:12:41 2005
@@ -69,18 +69,20 @@
Real thickness = robust_scm2double (me->get_property ("thickness"), 0.25);
+
+ Real overlap = 0.1 * thickness;
Stencil bracket = Lookup::filled_box (Box (Interval (0, thickness),
- Interval (-height/2, height/2)));
+ Interval (-1, 1)
+ * (height/2 + overlap)));
Direction d = DOWN;
do
{
- bracket.add_at_edge (Y_AXIS, d, tips[d], 0.0, 0.0);
+ bracket.add_at_edge (Y_AXIS, d, tips[d], -overlap, 0.0);
}
while (flip (&d) != DOWN);
- bracket.translate_axis (-1.0, X_AXIS); // ugh.
return bracket;
}
Index: lilypond/mf/feta-haak.mf
diff -u lilypond/mf/feta-haak.mf:1.6 lilypond/mf/feta-haak.mf:1.7
--- lilypond/mf/feta-haak.mf:1.6 Sat May 28 00:57:28 2005
+++ lilypond/mf/feta-haak.mf Sat May 28 01:12:41 2005
@@ -21,9 +21,11 @@
fi;
thin = 2 linethickness;
- hair = linethickness;
+ hair = 1.25 linethickness;
pickup pencircle scaled thin;
+ z7 = z1 + (thick,0);
+ z2 = z4r + (thin, 0);
penpos3(thin, 0);
@@ -37,33 +39,35 @@
y1 = -0.5 thick;
- save tight;
- tight := 1.3;
- z5 = .5 [z1, z3] + (width - thin, flattening * width - .5 thin);
- p := .5 [z1, z3]{right}
- .. tension tight
- .. z5;
+ z8 = .5 [z2, z7];
+ top y5 = h;
+ rt x5 = w;
+
+ save leave_angle;
+ leave_angle = 10;
+
+ p := z8{dir(leave_angle)}
+ .. z5{curl 0};
tipdir := (direction 1 of p);
- penpos5 (hair, angle (tipdir));
- penpos6 (hair, 90 + angle (tipdir));
+ save tip_angle;
+ tip_angle := 50;
+ penpos5 (hair, tip_angle);
+ penpos6 (hair, 90 + tip_angle);
z5 = z6;
- z7 = z1 + (thick,0);
- z2 = z4r + (thin, 0);
-
pickup pencircle scaled 1;
- % draw p;
- fill (z1{up} .. z3l{up}
+ %draw p;
+ fill
+ %draw
+ (z1{up} .. z3l{up}
.. z4r{right}
.. z2{right}
- .. tension tight
.. z6r{tipdir}
.. z5r .. z6l{-tipdir}
- .. tension tight
- .. z7{left} .. z1{left} & cycle)
+ .. z7{dir(180 + leave_angle)} & z7 .. z1{left} & cycle)
yscaled updown;
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.202 lilypond/scm/define-grobs.scm:1.203
--- lilypond/scm/define-grobs.scm:1.202 Sat May 28 00:47:04 2005
+++ lilypond/scm/define-grobs.scm Sat May 28 01:12:41 2005
@@ -1200,6 +1200,7 @@
(SystemStartBracket
. (
(Y-extent-callback . #f)
+ (X-offset-callbacks . (,(lambda (g a) -0.8)))
(print-function . ,System_start_delimiter::print)
(glyph . "bracket")
(arch-height . 1.5)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
