Corrections and updates to music glossary

[lilypond.git] / lily / lookup.cc

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 1a34881d80929daf2bb5a38c59f11d518372a685..0050002223848461c7adfed53f0f1ac5bf07cc6a 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
@@ -106,7 +106,7 @@ Lookup::dashed_slur (Bezier b, Real thick, Real dash_period, Real dash_fraction)
                        ly_quote_scm (l),
                        SCM_UNDEFINED));
 
-  Box box (Interval (0, 0), Interval (0, 0));
+  Box box (b.extent (X_AXIS), b.extent (Y_AXIS));
   return Stencil (box, at);
 }
 
@@ -256,8 +256,8 @@ Lookup::round_filled_polygon (vector<Offset> const &points,
   /* remove consecutive duplicate points */
   for (vsize i = 0; i < points.size (); i++)
     {
-      int next_i = (i + 1) % points.size ();
-      Real d = (points[i] - points[next_i]).length ();
+      int next = (i + 1) % points.size ();
+      Real d = (points[i] - points[next]).length ();
       if (d < epsilon)
        programming_error ("Polygon should not have duplicate points");
     }
@@ -731,7 +731,7 @@ 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 ())
+      if (points[i-1].is_sane () && points[i].is_sane ())
        {
          Stencil line
            = Line_interface::make_line (thick, points[i-1], points[i]);