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

	pass inf/nan into slur scoring.

diff --git a/ChangeLog b/ChangeLog
index 6880b96a4ad779543933738d6e0f48a41a28c01c..e237214d3c46e7fc1c3c48004984a45eb3ad2b0b 100644 (file)
--- 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 a1233307ccdef4263fa2fdbe4932511d4104e0e5..8e155815eae9006a4c3be1244b2f2b4f7ccbeb21 100644 (file)
--- 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 28c5fec42b4ae61ce31e2e8a7d9cb9b46c1d7b84..aec6fe62dac30ce5c22b3b696641ffc144622078 100644 (file)
--- 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 f4f552b140ba6708402dd8a299bb94807c444c2c..dacf385be083daf9496a01182ef5ac172a031e0e 100644 (file)
--- 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