release commit

diff --git a/ChangeLog b/ChangeLog
index 8e2d3d7310ea437232a0a75880d472f4e04120ae..46178d02e286beabc76d4bc6b9d2605042490925 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-29  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/bezier.cc (get_other_coordinate): change assert into
+       warning.
+
        * lily/note-head.cc (internal_brew_molecule): make left protusion
        smaller, to accomodate for natural sign.
        (internal_brew_molecule): only do this when the accidental is

diff --git a/VERSION b/VERSION
index c52f6f19308b12432e60ce0b136a361bb2d6e10d..3b76cb1959bbbf62fefb673fd78e4d6a911724e8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=0
-PATCH_LEVEL=0
-MY_PATCH_LEVEL=hwn1
+PATCH_LEVEL=1
+MY_PATCH_LEVEL=
 

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index 763d6ea0951ba152a931ba900d790c4262a5513a..2784ce198e668e2ceb72cc7becff1be9519c6ea5 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -387,7 +387,7 @@ Accidental_placement::position_accidentals (Grob * me)
       Real offset =
        -skyline_meshing_distance (apes[i]->right_skyline_, left_skyline);
       if (isinf (offset))
-       offset = (i < apes.size ()) ? apes[i+1]->offset_ : 0.0;
+       offset = (i < apes.size () - 1) ? apes[i+1]->offset_ : 0.0;
       else
        offset -= padding;
 

diff --git a/lily/bezier.cc b/lily/bezier.cc
index 416f9940d022c92d29f8549ae02f51d0e1df94c7..38d72b2a5c0b444bc90201332916af9b1540a24c 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -74,7 +74,9 @@ Bezier::get_other_coordinate (Axis a,  Real x) const
     }
   
   Offset c = curve_point (ts[0]);
-  assert (fabs (c[a] - x) < 1e-8);
+
+  if (fabs (c[a] - x) > 1e-8)
+    programming_error ("Bezier intersection not correct?");
   
   return c[other];
 }