* lily/system-start-delimiter.cc (staff_bracket): use glyphs.

* mf/feta-haak.mf: rewrite. Make separate glyphs for the tips

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index de5a0d927f7bb2f7777f3b879e9b95bb56898a76..baf3fb208686d119f1603e2f4ff4cfae80c77a37 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -69,18 +69,20 @@ System_start_delimiter::staff_bracket (Grob *me, Real height)
 
   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;
 }
 

diff --git a/mf/feta-haak.mf b/mf/feta-haak.mf
index 795952304f1fe1aa892934a7a67342a375406577..807a4d9de2557b4025c2862e4a5e157cf41f3153 100644 (file)
--- a/mf/feta-haak.mf
+++ b/mf/feta-haak.mf
@@ -21,9 +21,11 @@ begingroup;
        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 @@ begingroup;
        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;
 
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e745f4a9c3c95aed20798a634bf038b86646717e..fc5be554fe6beaa62dd646a28e4ff4be942af8cc 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -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)