X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=1acb34f783cf83dab6b0cc503f8d55fb47852a0e;hb=e8fc7813b17822c138150807484197ef8d4e7c21;hp=671c0da04e38e93c0e12f418f79bc9db92e9bcbd;hpb=f7836bbd7dc03e7173590a76e419a5e826b1d689;p=lilypond.git

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 671c0da04e..1acb34f783 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -1,11 +1,22 @@
 /*
-  lookup.cc -- implement simple Lookup methods.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "lookup.hh"
@@ -22,20 +33,6 @@ using namespace std;
 #include "main.hh"
 #include "lily-guile.hh"
 
-Stencil
-Lookup::dot (Offset p, Real radius)
-{
-  SCM at = (scm_list_n (ly_symbol2scm ("dot"),
-			scm_from_double (p[X_AXIS]),
-			scm_from_double (p[Y_AXIS]),
-			scm_from_double (radius),
-			SCM_UNDEFINED));
-  Box box;
-  box.add_point (p - Offset (radius, radius));
-  box.add_point (p + Offset (radius, radius));
-  return Stencil (box, at);
-}
-
 Stencil
 Lookup::beam (Real slope, Real width, Real thick, Real blot)
 {
@@ -50,38 +47,38 @@ Lookup::beam (Real slope, Real width, Real thick, Real blot)
   SCM points = SCM_EOL;
 
   points = scm_cons (scm_from_double (p[X_AXIS]),
-		     scm_cons (scm_from_double (p[Y_AXIS]),
-			       points));
+                     scm_cons (scm_from_double (p[Y_AXIS]),
+                               points));
 
   p = Offset (0, -thick / 2);
   b.add_point (p);
   p += Offset (1, 1) * (blot / 2);
 
   points = scm_cons (scm_from_double (p[X_AXIS]),
-		     scm_cons (scm_from_double (p[Y_AXIS]),
-			       points));
+                     scm_cons (scm_from_double (p[Y_AXIS]),
+                               points));
 
   p = Offset (width, width * slope - thick / 2);
   b.add_point (p);
   p += Offset (-1, 1) * (blot / 2);
 
   points = scm_cons (scm_from_double (p[X_AXIS]),
-		     scm_cons (scm_from_double (p[Y_AXIS]),
-			       points));
+                     scm_cons (scm_from_double (p[Y_AXIS]),
+                               points));
 
   p = Offset (width, width * slope + thick / 2);
   b.add_point (p);
   p += Offset (-1, -1) * (blot / 2);
 
   points = scm_cons (scm_from_double (p[X_AXIS]),
-		     scm_cons (scm_from_double (p[Y_AXIS]),
-			       points));
+                     scm_cons (scm_from_double (p[Y_AXIS]),
+                               points));
 
   SCM expr = scm_list_n (ly_symbol2scm ("polygon"),
-			 ly_quote_scm (points),
-			 scm_from_double (blot),
-			 SCM_BOOL_T,
-			 SCM_UNDEFINED);
+                         ly_quote_scm (points),
+                         scm_from_double (blot),
+                         SCM_BOOL_T,
+                         SCM_UNDEFINED);
 
   return Stencil (b, expr);
 }
@@ -92,9 +89,9 @@ Lookup::rotated_box (Real slope, Real width, Real thick, Real blot)
   vector<Offset> pts;
   Offset rot (1, slope);
 
-  thick -= 2*blot;
-  width -= 2*blot;
-  rot /= sqrt (1 + slope*slope);
+  thick -= 2 * blot;
+  width -= 2 * blot;
+  rot /= sqrt (1 + slope * slope);
   pts.push_back (Offset (0, -thick / 2) * rot);
   pts.push_back (Offset (width, -thick / 2) * rot);
   pts.push_back (Offset (width, thick / 2) * rot);
@@ -106,12 +103,12 @@ Stencil
 Lookup::horizontal_line (Interval w, Real th)
 {
   SCM at = scm_list_n (ly_symbol2scm ("draw-line"),
-		       scm_from_double (th),
-		       scm_from_double (w[LEFT]),
-		       scm_from_double (0),
-		       scm_from_double (w[RIGHT]),
-		       scm_from_double (0),
-		       SCM_UNDEFINED);
+                       scm_from_double (th),
+                       scm_from_double (w[LEFT]),
+                       scm_from_double (0),
+                       scm_from_double (w[RIGHT]),
+                       scm_from_double (0),
+                       SCM_UNDEFINED);
 
   Box box;
   box[X_AXIS] = w;
@@ -126,6 +123,16 @@ Lookup::blank (Box b)
   return Stencil (b, scm_from_locale_string (""));
 }
 
+Stencil
+Lookup::circle (Real rad, Real thick, bool filled)
+{
+  Box b (Interval (-rad, rad), Interval (-rad, rad));
+  return Stencil (b, scm_list_4 (ly_symbol2scm ("circle"),
+                                 scm_from_double (rad),
+                                 scm_from_double (thick),
+                                 scm_from_bool (filled)));
+}
+
 Stencil
 Lookup::filled_box (Box b)
 {
@@ -168,12 +175,12 @@ Lookup::round_filled_box (Box b, Real blotdiameter)
     blotdiameter = b.y ().length ();
 
   SCM at = (scm_list_n (ly_symbol2scm ("round-filled-box"),
-			scm_from_double (-b[X_AXIS][LEFT]),
-			scm_from_double (b[X_AXIS][RIGHT]),
-			scm_from_double (-b[Y_AXIS][DOWN]),
-			scm_from_double (b[Y_AXIS][UP]),
-			scm_from_double (blotdiameter),
-			SCM_UNDEFINED));
+                        scm_from_double (-b[X_AXIS][LEFT]),
+                        scm_from_double (b[X_AXIS][RIGHT]),
+                        scm_from_double (-b[Y_AXIS][DOWN]),
+                        scm_from_double (b[Y_AXIS][UP]),
+                        scm_from_double (blotdiameter),
+                        SCM_UNDEFINED));
 
   return Stencil (b, at);
 }
@@ -220,7 +227,7 @@ Lookup::round_filled_box (Box b, Real blotdiameter)
  */
 Stencil
 Lookup::round_filled_polygon (vector<Offset> const &points,
-			      Real blotdiameter)
+                              Real blotdiameter)
 {
   /* TODO: Maybe print a warning if one of the above limitations
      applies to the given polygon.  However, this is quite complicated
@@ -235,7 +242,7 @@ Lookup::round_filled_polygon (vector<Offset> const &points,
       int next = (i + 1) % points.size ();
       Real d = (points[i] - points[next]).length ();
       if (d < epsilon)
-	programming_error ("Polygon should not have duplicate points");
+        programming_error ("Polygon should not have duplicate points");
     }
 #endif
 
@@ -243,7 +250,11 @@ Lookup::round_filled_polygon (vector<Offset> const &points,
   if (points.size () == 0)
     return Stencil ();
   if (points.size () == 1)
-    return dot (points[0], 0.5 * blotdiameter);
+    {
+      Stencil circ = circle (0.5 * blotdiameter, 0, true);
+      circ.translate (points[0]);
+      return circ;
+    }
   if (points.size () == 2)
     return Line_interface::make_line (blotdiameter, points[0], points[1]);
 
@@ -262,17 +273,18 @@ Lookup::round_filled_polygon (vector<Offset> const &points,
       Offset p10 = p0 - p1;
       Offset p12 = p2 - p1;
       if (p10.length () != 0.0)
-	{ // recompute ccw
-	  Real phi = p10.arg ();
-	  // rotate (p2 - p0) by (-phi)
-	  Offset q = complex_multiply (p2 - p0, complex_exp (Offset (1.0, -phi)));
-
-	  if (q[Y_AXIS] > 0)
-	    ccw = 1;
-	  else if (q[Y_AXIS] < 0)
-	    ccw = 0;
-	  else {} // keep ccw unchanged
-	}
+        {
+          // recompute ccw
+          Real phi = p10.arg ();
+          // rotate (p2 - p0) by (-phi)
+          Offset q = complex_multiply (p2 - p0, complex_exp (Offset (1.0, -phi)));
+
+          if (q[Y_AXIS] > 0)
+            ccw = 1;
+          else if (q[Y_AXIS] < 0)
+            ccw = 0;
+          else {} // keep ccw unchanged
+        }
       else {} // keep ccw unchanged
       Offset p10n = (1.0 / p10.length ()) * p10; // normalize length to 1.0
       Offset p12n = (1.0 / p12.length ()) * p12;
@@ -281,15 +293,15 @@ Lookup::round_filled_polygon (vector<Offset> const &points,
       Offset p13;
       Real d = p13n.length () * p14n.length (); // distance p3n to line (p1..p0)
       if (d < epsilon)
-	// special case: p0, p1, p2 are on a single line => build
-	// vector orthogonal to (p2-p0) of length 0.5 blotdiameter
-	{
-	  p13[X_AXIS] = p10[Y_AXIS];
-	  p13[Y_AXIS] = -p10[X_AXIS];
-	  p13 = (0.5 * blotdiameter / p13.length ()) * p13;
-	}
+        // special case: p0, p1, p2 are on a single line => build
+        // vector orthogonal to (p2-p0) of length 0.5 blotdiameter
+        {
+          p13[X_AXIS] = p10[Y_AXIS];
+          p13[Y_AXIS] = -p10[X_AXIS];
+          p13 = (0.5 * blotdiameter / p13.length ()) * p13;
+        }
       else
-	p13 = (0.5 * blotdiameter / d) * p13n;
+        p13 = (0.5 * blotdiameter / d) * p13n;
       shrunk_points[i1] = p1 + ((ccw) ? p13 : -p13);
     }
 
@@ -304,10 +316,10 @@ Lookup::round_filled_polygon (vector<Offset> const &points,
       box.add_point (points[i]);
     }
   SCM polygon_scm = scm_list_n (ly_symbol2scm ("polygon"),
-				ly_quote_scm (shrunk_points_scm),
-				scm_from_double (blotdiameter),
-				SCM_BOOL_T,
-				SCM_UNDEFINED);
+                                ly_quote_scm (shrunk_points_scm),
+                                scm_from_double (blotdiameter),
+                                SCM_BOOL_T,
+                                SCM_UNDEFINED);
 
   Stencil polygon = Stencil (box, polygon_scm);
   shrunk_points.clear ();
@@ -321,20 +333,18 @@ 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
-	{
-	  Box edges;
-	  edges[a] = b[a][d] + 0.5 * thick * Interval (-1, 1);
-	  edges[o][DOWN] = b[o][DOWN] - thick / 2;
-	  edges[o][UP] = b[o][UP] + thick / 2;
-
-	  m.add_stencil (round_filled_box (edges, blot));
-	}
-      while (flip (&d) != LEFT);
+      Axis o = Axis ((a + 1) % NO_AXES);
+      for (LEFT_and_RIGHT (d))
+        {
+          Box edges;
+          edges[a] = b[a][d] + 0.5 * thick * Interval (-1, 1);
+          edges[o][DOWN] = b[o][DOWN] - thick / 2;
+          edges[o][UP] = b[o][UP] + thick / 2;
+
+          m.add_stencil (round_filled_box (edges, blot));
+        }
     }
   return m;
 }
@@ -348,7 +358,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick,
 {
   Stencil return_value;
 
-  /* 
+  /*
       calculate the offset for the two beziers that make the sandwich
       for the slur
   */
@@ -360,47 +370,47 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick,
 
   curve.control_[1] -= perp;
   curve.control_[2] -= perp;
- 
+
   if (!scm_is_pair (dash_details))
-    { 
+    {
       /* solid slur  */
       return_value = bezier_sandwich (back, curve, linethick);
     }
   else
-    { 
+    {
       /* dashed or combination slur */
       int num_segments = scm_to_int (scm_length (dash_details));
-      for (int i=0; i<num_segments; i++)
+      for (int i = 0; i < num_segments; i++)
         {
           SCM dash_pattern = scm_list_ref (dash_details, scm_from_int (i));
           Real t_min = robust_scm2double (scm_car (dash_pattern), 0);
           Real t_max = robust_scm2double (scm_cadr (dash_pattern), 1.0);
-          Real dash_fraction = 
-            robust_scm2double (scm_caddr (dash_pattern), 1.0);
-          Real dash_period = 
-            robust_scm2double (scm_cadddr (dash_pattern), 0.75);
+          Real dash_fraction
+            = robust_scm2double (scm_caddr (dash_pattern), 1.0);
+          Real dash_period
+            = robust_scm2double (scm_cadddr (dash_pattern), 0.75);
           Bezier back_segment = back.extract (t_min, t_max);
           Bezier curve_segment = curve.extract (t_min, t_max);
-          if (dash_fraction == 1.0) 
-              return_value.add_stencil (bezier_sandwich (back_segment,
-                                                         curve_segment,
-                                                         linethick));
+          if (dash_fraction == 1.0)
+            return_value.add_stencil (bezier_sandwich (back_segment,
+                                                       curve_segment,
+                                                       linethick));
           else
             {
               Bezier back_dash, curve_dash;
-              Real seg_length = (back_segment.control_[3] - 
-                                 back_segment.control_[0]).length ();
-              int pattern_count = seg_length / dash_period;
+              Real seg_length = (back_segment.control_[3]
+                                 - back_segment.control_[0]).length ();
+              int pattern_count = (int) (seg_length / dash_period);
               Real pattern_length = 1.0 / (pattern_count + dash_fraction);
               Real start_t, end_t;
               for (int p = 0; p <= pattern_count; p++)
                 {
                   start_t = p * pattern_length;
                   end_t = (p + dash_fraction) * pattern_length;
-                  back_dash = 
-                    back_segment.extract (start_t, end_t);
-                  curve_dash =
-                    curve_segment.extract (start_t, end_t);
+                  back_dash
+                    = back_segment.extract (start_t, end_t);
+                  curve_dash
+                    = curve_segment.extract (start_t, end_t);
                   return_value.add_stencil (bezier_sandwich (back_dash,
                                                              curve_dash,
                                                              linethick));
@@ -411,7 +421,6 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick,
   return return_value;
 }
 
-
 /*
  * Bezier Sandwich:
  *
@@ -438,23 +447,33 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick,
 Stencil
 Lookup::bezier_sandwich (Bezier top_curve, Bezier bottom_curve, Real thickness)
 {
-  /*
-    Need the weird order b.o. the way PS want its arguments
-  */
-  SCM list = SCM_EOL;
-  list = scm_cons (ly_offset2scm (bottom_curve.control_[3]), list);
-  list = scm_cons (ly_offset2scm (bottom_curve.control_[0]), list);
-  list = scm_cons (ly_offset2scm (bottom_curve.control_[1]), list);
-  list = scm_cons (ly_offset2scm (bottom_curve.control_[2]), list);
-  list = scm_cons (ly_offset2scm (top_curve.control_[0]), list);
-  list = scm_cons (ly_offset2scm (top_curve.control_[3]), list);
-  list = scm_cons (ly_offset2scm (top_curve.control_[2]), list);
-  list = scm_cons (ly_offset2scm (top_curve.control_[1]), list);
-
-  SCM horizontal_bend = scm_list_n (ly_symbol2scm ("bezier-sandwich"),
-				    ly_quote_scm (list),
-				    scm_from_double (thickness),
-				    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),
+                                    ly_quote_scm (commands),
+                                    ly_quote_scm (ly_symbol2scm ("round")),
+                                    ly_quote_scm (ly_symbol2scm ("round")),
+                                    SCM_BOOL_T,
+                                    SCM_UNDEFINED);
 
   Interval x_extent = top_curve.extent (X_AXIS);
   x_extent.unite (bottom_curve.extent (X_AXIS));
@@ -469,24 +488,35 @@ 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));
+         Interval (0, w * s));
 
   return Stencil (b, slashnodot); //  http://slashnodot.org
 }
@@ -495,7 +525,7 @@ Stencil
 Lookup::bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot)
 {
   Box b;
-  Axis other = Axis ((a + 1)%2);
+  Axis other = Axis ((a + 1) % 2);
   b[a] = iv;
   b[other] = Interval (-1, 1) * thick * 0.5;
 
@@ -523,25 +553,24 @@ Lookup::triangle (Interval iv, Real thick, Real protrude)
   points.push_back (Offset (iv[LEFT], 0));
   points.push_back (Offset (iv[RIGHT], 0));
   points.push_back (Offset (iv.center (), protrude));
+  points.push_back (Offset (iv[LEFT], 0));  // close triangle
 
   return points_to_line_stencil (thick, points);
 
 }
 
-
-
 Stencil
 Lookup::points_to_line_stencil (Real thick, vector<Offset> const &points)
 {
   Stencil ret;
   for (vsize i = 1; i < points.size (); i++)
     {
-      if (points[i-1].is_sane () && points[i].is_sane ())
-	{
-	  Stencil line
-	    = Line_interface::make_line (thick, points[i-1], points[i]);
-	  ret.add_stencil (line);
-	}
+      if (points[i - 1].is_sane () && points[i].is_sane ())
+        {
+          Stencil line
+            = Line_interface::make_line (thick, points[i - 1], points[i]);
+          ret.add_stencil (line);
+        }
     }
   return ret;
 }