From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 29 Sep 2003 10:03:41 +0000 (+0000)
Subject: release commit
X-Git-Tag: release/2.0.1
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=3b397e70374b40234d2352577489f602116b8743;hp=38f531248027140d85c36b75582d079275740070;p=lilypond.git

release commit
---

diff --git a/ChangeLog b/ChangeLog
index 8e2d3d7310..46178d02e2 100644
--- 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 c52f6f1930..3b76cb1959 100644
--- 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 763d6ea095..2784ce198e 100644
--- 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 416f9940d0..38d72b2a5c 100644
--- 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];
 }