From: hanwen <hanwen>
Date: Sun, 27 Mar 2005 16:27:01 +0000 (+0000)
Subject: 	* lily/slur-scoring.cc (get_base_attachments): robustness. Don't
X-Git-Tag: release/2.5.23~304
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8ad57dfd284f3705077cdf57ebc68e3d5447c7eb;p=lilypond.git

	* lily/slur-scoring.cc (get_base_attachments): robustness. Don't
	pass inf/nan into slur scoring.
---

diff --git a/ChangeLog b/ChangeLog
index 6880b96a4a..e237214d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,12 @@
 
 2005-03-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/slur-scoring.cc (get_base_attachments): robustness. Don't
+	pass inf/nan into slur scoring.
+
+	* ly/titling-init.ly (oddHeaderMarkup): don't show page no. on 1st
+	page.
+
 	* scripts/lilypond-book.py (main): add png for HTML too, guess
 	only if necessary. Thanks to John Williams.
 
diff --git a/THANKS b/THANKS
index a1233307cc..8e155815ea 100644
--- a/THANKS
+++ b/THANKS
@@ -18,9 +18,11 @@ Carl Sorensen
 Christian Hitz
 Erlend Aasland
 Heikki Junes
+Jeff Smith
 John Williams
 Juergen Reuter
 Juliusz Chroboczek
+Matthias Neeracher
 Mats Bengtsson
 Nicolas Sceaux
 Pal Benko
@@ -57,6 +59,8 @@ Richard Schoeller
 Tapio Tuovila
 Will Oram
 Wolfgang Hoffmann
+David Rogers
+
 
 Release 2.4
 ***********
diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 28c5fec42b..aec6fe62da 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -563,6 +563,24 @@ Slur_score_state::get_base_attachments () const
     }
   while (flip (&d) != LEFT);
 
+
+  do
+    {
+      for (int a = X_AXIS; a < NO_AXES; a++)
+	{
+	  Real &b = base_attachment[d][Axis (a)];
+
+	  if (isinf (b) || isnan (b))
+	    {
+	      b = 0.0;
+	      programming_error ("Slur attachment is inf/nan");
+	    }
+	    
+	}
+    }
+  while (flip (&d) != LEFT);
+  
+  
   return base_attachment;
 }
 
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index f4f552b140..dacf385be0 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -83,7 +83,7 @@ oddHeaderMarkup = \markup
 \fill-line {
   ""
   \on-the-fly #not-first-page \fromproperty #'header:instrument
-  \fromproperty #'page:page-number-string
+  \on-the-fly #not-first-page \fromproperty #'page:page-number-string
 }
 
 evenHeaderMarkup = \markup