X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=e0117c1da197fd42c14a82a51c20c1f83008c5ec;hb=bfc7fdae57842d561568d1516337ce60e9aa8be0;hp=7b63b83111e4ccf9000710f087d526453c2d1176;hpb=35725a573e47be7c02c51964641ea534fb88be6b;p=lilypond.git

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 7b63b83111..e0117c1da1 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -174,6 +174,9 @@ Lookup::round_filled_box (Box b, Real blotdiameter)
   if (b.y ().length () < blotdiameter)
     blotdiameter = b.y ().length ();
 
+  if (b.x ().is_empty () || b.y ().is_empty ())
+    return Stencil (b, SCM_EOL);
+
   SCM at = (scm_list_n (ly_symbol2scm ("round-filled-box"),
                         scm_from_double (-b[X_AXIS][LEFT]),
                         scm_from_double (b[X_AXIS][RIGHT]),
@@ -333,11 +336,10 @@ Stencil
 Lookup::frame (Box b, Real thick, Real blot)
 {
   Stencil m;
-  Direction d = LEFT;
   for (Axis a = X_AXIS; a < NO_AXES; a = Axis (a + 1))
     {
       Axis o = Axis ((a + 1) % NO_AXES);
-      do
+      for (LEFT_and_RIGHT (d))
         {
           Box edges;
           edges[a] = b[a][d] + 0.5 * thick * Interval (-1, 1);
@@ -346,7 +348,6 @@ Lookup::frame (Box b, Real thick, Real blot)
 
           m.add_stencil (round_filled_box (edges, blot));
         }
-      while (flip (&d) != LEFT);
     }
   return m;
 }
@@ -449,25 +450,25 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick,
 Stencil
 Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve, Real thickness)
 {
-  SCM commands  = scm_list_n (ly_symbol2scm ("moveto"),
-                              scm_from_double (top_curve.control_[0][X_AXIS]),
-                              scm_from_double (top_curve.control_[0][Y_AXIS]),
-                              ly_symbol2scm ("curveto"),
-                              scm_from_double (top_curve.control_[1][X_AXIS]),
-                              scm_from_double (top_curve.control_[1][Y_AXIS]),
-                              scm_from_double (top_curve.control_[2][X_AXIS]),
-                              scm_from_double (top_curve.control_[2][Y_AXIS]),
-                              scm_from_double (top_curve.control_[3][X_AXIS]),
-                              scm_from_double (top_curve.control_[3][Y_AXIS]),
-                              ly_symbol2scm ("curveto"),
-                              scm_from_double (bottom_curve.control_[2][X_AXIS]),
-                              scm_from_double (bottom_curve.control_[2][Y_AXIS]),
-                              scm_from_double (bottom_curve.control_[1][X_AXIS]),
-                              scm_from_double (bottom_curve.control_[1][Y_AXIS]),
-                              scm_from_double (bottom_curve.control_[0][X_AXIS]),
-                              scm_from_double (bottom_curve.control_[0][Y_AXIS]),
-                              ly_symbol2scm ("closepath"),
-                              SCM_UNDEFINED);
+  SCM commands = scm_list_n (ly_symbol2scm ("moveto"),
+                             scm_from_double (top_curve.control_[0][X_AXIS]),
+                             scm_from_double (top_curve.control_[0][Y_AXIS]),
+                             ly_symbol2scm ("curveto"),
+                             scm_from_double (top_curve.control_[1][X_AXIS]),
+                             scm_from_double (top_curve.control_[1][Y_AXIS]),
+                             scm_from_double (top_curve.control_[2][X_AXIS]),
+                             scm_from_double (top_curve.control_[2][Y_AXIS]),
+                             scm_from_double (top_curve.control_[3][X_AXIS]),
+                             scm_from_double (top_curve.control_[3][Y_AXIS]),
+                             ly_symbol2scm ("curveto"),
+                             scm_from_double (bottom_curve.control_[2][X_AXIS]),
+                             scm_from_double (bottom_curve.control_[2][Y_AXIS]),
+                             scm_from_double (bottom_curve.control_[1][X_AXIS]),
+                             scm_from_double (bottom_curve.control_[1][Y_AXIS]),
+                             scm_from_double (bottom_curve.control_[0][X_AXIS]),
+                             scm_from_double (bottom_curve.control_[0][Y_AXIS]),
+                             ly_symbol2scm ("closepath"),
+                             SCM_UNDEFINED);
 
   SCM horizontal_bend = scm_list_n (ly_symbol2scm ("path"),
                                     scm_from_double (thickness),
@@ -490,21 +491,32 @@ Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve, Real thickness)
 Stencil
 Lookup::repeat_slash (Real w, Real s, Real t)
 {
-#if 0 /*  TODO */
-  vector<Offset> points;
-  Real blotdiameter = 0.0;
-
-  Offset p1 (0, 0);
-  Offset p2 (w, w * s);
-
-  return Lookup::round_filled_polygon (points, blotdiameter);
-#endif
 
-  SCM wid = scm_from_double (w);
-  SCM sl = scm_from_double (s);
-  SCM thick = scm_from_double (t);
-  SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"),
-                               wid, sl, thick, SCM_UNDEFINED);
+  Real x_width = sqrt ((t * t) + ((t / s) * (t / s)));
+  Real height = w * s;
+
+  SCM controls = scm_list_n (ly_symbol2scm ("moveto"),
+                             scm_from_double (0),
+                             scm_from_double (0),
+                             ly_symbol2scm ("rlineto"),
+                             scm_from_double (x_width),
+                             scm_from_double (0),
+                             ly_symbol2scm ("rlineto"),
+                             scm_from_double (w),
+                             scm_from_double (height),
+                             ly_symbol2scm ("rlineto"),
+                             scm_from_double (-x_width),
+                             scm_from_double (0),
+                             ly_symbol2scm ("closepath"),
+                             SCM_UNDEFINED);
+
+  SCM slashnodot = scm_list_n (ly_symbol2scm ("path"),
+                               scm_from_double (0),
+                               ly_quote_scm (controls),
+                               ly_quote_scm (ly_symbol2scm ("round")),
+                               ly_quote_scm (ly_symbol2scm ("round")),
+                               SCM_BOOL_T,
+                               SCM_UNDEFINED);
 
   Box b (Interval (0, w + sqrt (sqr (t / s) + sqr (t))),
          Interval (0, w * s));