CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/09/06 15:48:23
Modified files:
. : ChangeLog VERSION
flower : offset.cc
flower/include : real.hh
lily : accidental-placement.cc
break-align-interface.cc general-scheme.cc
simple-spacer-scheme.cc stencil.cc
text-interface.cc
Log message:
* lily/general-scheme.cc: remove my_{isinf,isnan}.
* flower/include/real.hh: using std::{isnan,isinf}
* VERSION (PATCH_LEVEL): release 2.7.9
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4114&tr2=1.4115&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/VERSION.diff?tr1=1.655&tr2=1.656&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/offset.cc.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/real.hh.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/accidental-placement.cc.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/break-align-interface.cc.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/general-scheme.cc.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/simple-spacer-scheme.cc.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/stencil.cc.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/text-interface.cc.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4114 lilypond/ChangeLog:1.4115
--- lilypond/ChangeLog:1.4114 Tue Sep 6 02:18:39 2005
+++ lilypond/ChangeLog Tue Sep 6 15:48:22 2005
@@ -1,3 +1,11 @@
+2005-09-06 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/general-scheme.cc: remove my_{isinf,isnan}.
+
+ * flower/include/real.hh: using std::{isnan,isinf}
+
+ * VERSION (PATCH_LEVEL): release 2.7.9
+
2005-09-05 Graham Percival <[EMAIL PROTECTED]>
* Documentation/user/ instrument-notation.itely,
Index: lilypond/VERSION
diff -u lilypond/VERSION:1.655 lilypond/VERSION:1.656
--- lilypond/VERSION:1.655 Mon Aug 29 19:14:19 2005
+++ lilypond/VERSION Tue Sep 6 15:48:22 2005
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=7
-PATCH_LEVEL=9
+PATCH_LEVEL=10
MY_PATCH_LEVEL=
Index: lilypond/flower/include/real.hh
diff -u lilypond/flower/include/real.hh:1.21
lilypond/flower/include/real.hh:1.22
--- lilypond/flower/include/real.hh:1.21 Fri Aug 12 00:04:47 2005
+++ lilypond/flower/include/real.hh Tue Sep 6 15:48:23 2005
@@ -11,10 +11,13 @@
#include <algorithm>
#include <climits>
+#include <cmath>
typedef double Real;
extern const Real infinity_f;
using namespace std;
+using std::isnan;
+using std::isinf;
template<class T> inline T abs (T x)
{
Index: lilypond/flower/offset.cc
diff -u lilypond/flower/offset.cc:1.23 lilypond/flower/offset.cc:1.24
--- lilypond/flower/offset.cc:1.23 Mon Sep 5 14:19:56 2005
+++ lilypond/flower/offset.cc Tue Sep 6 15:48:23 2005
@@ -9,9 +9,6 @@
#include "offset.hh"
-#include <math.h>
-// #include <cmath> // undefines isnan on MacOS X.
-
#ifndef STANDALONE
String
Offset::to_string () const
Index: lilypond/lily/accidental-placement.cc
diff -u lilypond/lily/accidental-placement.cc:1.57
lilypond/lily/accidental-placement.cc:1.58
--- lilypond/lily/accidental-placement.cc:1.57 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/accidental-placement.cc Tue Sep 6 15:48:23 2005
@@ -9,7 +9,6 @@
#include <math.h>
#include "accidental-placement.hh"
-#include "libc-extension.hh" // isinf
#include "skyline.hh"
#include "music.hh"
#include "pitch.hh"
Index: lilypond/lily/break-align-interface.cc
diff -u lilypond/lily/break-align-interface.cc:1.55
lilypond/lily/break-align-interface.cc:1.56
--- lilypond/lily/break-align-interface.cc:1.55 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/break-align-interface.cc Tue Sep 6 15:48:23 2005
@@ -10,7 +10,6 @@
#include "break-align-interface.hh"
-#include "libc-extension.hh" // isinf
#include "pointer-group-interface.hh"
#include "self-alignment-interface.hh"
#include "side-position-interface.hh"
Index: lilypond/lily/general-scheme.cc
diff -u lilypond/lily/general-scheme.cc:1.24
lilypond/lily/general-scheme.cc:1.25
--- lilypond/lily/general-scheme.cc:1.24 Mon Aug 22 14:49:23 2005
+++ lilypond/lily/general-scheme.cc Tue Sep 6 15:48:23 2005
@@ -24,14 +24,6 @@
#include "main.hh"
#include "file-path.hh"
-/* MacOS S fix:
- source-file.hh includes cmath which undefines isinf and isnan
-*/
-#ifdef __APPLE__
-inline int my_isinf (Real r) { return isinf (r); }
-inline int my_isnan (Real r) { return isnan (r); }
-#endif
-
LY_DEFINE (ly_find_file, "ly:find-file",
1, 0, 0, (SCM name),
"Return the absolute file name of @var{name}, "
@@ -164,11 +156,7 @@
if (scm_exact_p (s) == SCM_BOOL_F)
{
Real r (scm_to_double (s));
-#ifdef __APPLE__
- if (my_isinf (r) || my_isnan (r))
-#else
if (isinf (r) || isnan (r))
-#endif
{
programming_error (_ ("infinity or NaN encountered while converting
Real number"));
programming_error (_ ("setting to zero"));
Index: lilypond/lily/simple-spacer-scheme.cc
diff -u lilypond/lily/simple-spacer-scheme.cc:1.4
lilypond/lily/simple-spacer-scheme.cc:1.5
--- lilypond/lily/simple-spacer-scheme.cc:1.4 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/simple-spacer-scheme.cc Tue Sep 6 15:48:23 2005
@@ -9,7 +9,6 @@
#include <cstdio>
#include <math.h>
-#include "libc-extension.hh" // isinf
#include "paper-column.hh"
#include "spring.hh"
#include "warn.hh"
Index: lilypond/lily/stencil.cc
diff -u lilypond/lily/stencil.cc:1.45 lilypond/lily/stencil.cc:1.46
--- lilypond/lily/stencil.cc:1.45 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/stencil.cc Tue Sep 6 15:48:23 2005
@@ -13,7 +13,6 @@
#include "dimensions.hh"
#include "font-metric.hh"
#include "input-smob.hh"
-#include "libc-extension.hh" // isinf
#include "string-convert.hh"
#include "warn.hh"
Index: lilypond/lily/text-interface.cc
diff -u lilypond/lily/text-interface.cc:1.7 lilypond/lily/text-interface.cc:1.8
--- lilypond/lily/text-interface.cc:1.7 Sun Sep 4 22:18:45 2005
+++ lilypond/lily/text-interface.cc Tue Sep 6 15:48:23 2005
@@ -58,7 +58,7 @@
{
programming_error ("not a markup: ");
scm_display (markup, scm_current_error_port ());
- abort();
+
Box b;
b[X_AXIS].set_empty ();
b[Y_AXIS].set_empty ();
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
