From: Han-Wen Nienhuys Date: Mon, 6 Dec 2004 23:21:10 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.5.14~469 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b782f68f927fa02b3ea895dd1bd801082e5bda6e;p=lilypond.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index 85123c80c2..baefbfc0ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,55 @@ +2004-12-05 Christian Hitz + + * configure.in: + * lily/accidental-placement.cc: + * lily/bar-line.cc: + * lily/beam-concave.cc: + * lily/beam-quanting.cc: + * lily/beam.cc: + * lily/bezier-bow.cc: + * lily/bezier.cc: + * lily/break-align-interface.cc: + * lily/custos.cc: + * lily/dimension-cache.cc: + * lily/dot-column.cc: + * lily/font-metric.cc: + * lily/font-select.cc: + * lily/gourlay-breaking.cc: + * lily/grob-property.cc: + * lily/grob.cc: + * lily/lily-guile.cc: + * lily/line-spanner.cc: + * lily/lookup.cc: + * lily/lyric-extender.cc: + * lily/lyric-hyphen.cc: + * lily/mensural-ligature.cc: + * lily/midi-def.cc: + * lily/misc.cc: + * lily/note-collision.cc: + * lily/note-column.cc: + * lily/note-head.cc: + * lily/paper-outputter.cc: + * lily/percent-repeat-item.cc: + * lily/rest-collision.cc: + * lily/side-position-interface.cc: + * lily/simple-spacer.cc: + * lily/slur-configuration.cc: + * lily/slur-scoring.cc: + * lily/slur.cc: + * lily/spaceable-grob.cc: + * lily/spacing-spanner.cc: + * lily/spanner.cc: + * lily/staff-symbol-referencer.cc: + * lily/stem.cc: + * lily/stencil.cc: + * lily/system-start-delimiter.cc: + * lily/system.cc: + * lily/text-item.cc: + * lily/tie.cc: + * lily/tuplet-bracket.cc: + * lily/vaticana-ligature.cc: Fix for MacOS X: use instead of + beacause isinf/isnan is undefined in + 2004-12-03 Mats Bengtsson * cygwin/lily-wins.py (stat): remove old flag -p when calling lilypond. diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index e39acda076..2a60f3f0b9 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -7,6 +7,10 @@ @unnumbered New features in 2.5 since 2.4 @itemize @bullet +@item +A new script, @code{\espressivo} has been added, for a combination of +crescendo and decrescendo on a single note. + @item In markups, expressions stacked with @code{\column}, @code{\center-align}, etc, are not grouped with @code{< ... >} anymore, diff --git a/VERSION b/VERSION index 5935b6cb11..49dba83996 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=5 -PATCH_LEVEL=2 +PATCH_LEVEL=3 MY_PATCH_LEVEL= diff --git a/configure.in b/configure.in index 83ea307aa1..ab5bfc079a 100644 --- a/configure.in +++ b/configure.in @@ -13,8 +13,6 @@ AC_CONFIG_AUX_DIR([stepmake/bin]) STEPMAKE_INIT - - # List a file that identifies your package. AC_CONFIG_SRCDIR([lily/main.cc]) @@ -84,7 +82,6 @@ else fi fi - # This is developer only anyway, help pkgconfig a bit export PKG_CONFIG_PATH PKG_CONFIG_PATH=/usr/lib/pkgconfig:$PKG_CONFIG_PATH @@ -117,7 +114,6 @@ if test "$optimise_b" = yes; then AC_DEFINE(STRINGS_UTILS_INLINED) fi - AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index b81e4d5702..1051f0ada4 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -7,7 +7,7 @@ */ -#include +#include #include "accidental-placement.hh" diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 3489aff6be..42f03f423c 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -7,7 +7,7 @@ */ -#include +#include #include "bar-line.hh" #include "lookup.hh" diff --git a/lily/beam-concave.cc b/lily/beam-concave.cc index bb956f5ade..367a1a4990 100644 --- a/lily/beam-concave.cc +++ b/lily/beam-concave.cc @@ -2,7 +2,7 @@ Determine whether a beam is concave. */ -#include +#include #include "group-interface.hh" #include "array.hh" diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index 2075eb76d3..ae8730daba 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -12,7 +12,7 @@ -#include +#include #include "warn.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/beam.cc b/lily/beam.cc index 92d9f4979e..127054c7e8 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -27,7 +27,7 @@ Notes: -#include // tanh. +#include // tanh. #include "beam.hh" #include "interval-set.hh" diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc index 70072356ed..044a898d07 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -6,7 +6,7 @@ (c) 1998--2004 Jan Nieuwenhuizen */ -#include +#include #include "misc.hh" #include "bezier.hh" diff --git a/lily/bezier.cc b/lily/bezier.cc index 806d385531..5b815e6b76 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -7,7 +7,7 @@ */ -#include +#include #include "bezier.hh" #include "warn.hh" diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index b3f5a786a9..1d302e6aea 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -7,7 +7,7 @@ */ -#include +#include #include "break-align-interface.hh" #include // isinf diff --git a/lily/custos.cc b/lily/custos.cc index 758890fdf1..bdc155fb89 100644 --- a/lily/custos.cc +++ b/lily/custos.cc @@ -15,7 +15,7 @@ */ #include -#include // rint +#include // rint #include "custos.hh" #include "direction.hh" diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc index 0527642325..8fe7318f81 100644 --- a/lily/dimension-cache.cc +++ b/lily/dimension-cache.cc @@ -7,7 +7,7 @@ */ -#include +#include #include "dimension-cache.hh" #include "warn.hh" diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 47052f2549..d44c11ef6d 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -9,7 +9,7 @@ #include "dot-column.hh" #include -#include +#include #include #include "dots.hh" diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 8a11c911a2..acd2d3b5f6 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -10,7 +10,7 @@ #include "font-metric.hh" -#include +#include #include #include "modified-font-metric.hh" diff --git a/lily/font-select.cc b/lily/font-select.cc index 713ee93b4f..3b17dedc25 100644 --- a/lily/font-select.cc +++ b/lily/font-select.cc @@ -6,7 +6,7 @@ (c) 2003--2004 Han-Wen Nienhuys */ -#include +#include #include "all-font-metrics.hh" #include "output-def.hh" diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index 62d134c00a..1c6fa03f27 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -8,7 +8,7 @@ #include "gourlay-breaking.hh" -#include // rint +#include // rint #include #include "warn.hh" diff --git a/lily/grob-property.cc b/lily/grob-property.cc index f8ebf1fc35..ddba069a2e 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -3,7 +3,7 @@ */ #include -#include +#include #include "main.hh" #include "input-smob.hh" diff --git a/lily/grob.cc b/lily/grob.cc index 030ce6ce6b..978fb1a345 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -9,7 +9,7 @@ #include "grob.hh" #include -#include +#include #include "main.hh" #include "input-smob.hh" diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index d7c8c39cb3..f907fef758 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -11,7 +11,7 @@ #include #include -#include /* isinf */ +#include /* isinf */ #include /* strdup, strchr */ #include @@ -21,11 +21,11 @@ /* MacOS S fix: source-file.hh includes cmath which undefines isinf and isnan - - FIXME: #ifdef MACOS_X? */ +#ifdef MACOS_X inline int my_isinf (Real r) { return isinf (r); } inline int my_isnan (Real r) { return isnan (r); } +#endif #include "libc-extension.hh" #include "main.hh" @@ -386,8 +386,11 @@ LY_DEFINE (ly_number2string, "ly:number->string", if (scm_exact_p (s) == SCM_BOOL_F) { Real r (scm_to_double (s)); - +#ifdef MACOS_X if (my_isinf (r) || my_isnan (r)) +#else + if (isinf (r) || isnan (r)) +#endif { programming_error ("Infinity or NaN encountered while converting Real number; setting to zero."); r = 0.0; diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index aa517a77ea..201df916f0 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -8,7 +8,7 @@ #include "line-spanner.hh" -#include +#include #include "spanner.hh" #include "output-def.hh" diff --git a/lily/lookup.cc b/lily/lookup.cc index 2a46069662..dd82090959 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -10,7 +10,7 @@ #include "lookup.hh" -#include +#include #include #include "line-interface.hh" diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index 5776e88486..cf258e01bd 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -8,7 +8,7 @@ #include "lyric-extender.hh" -#include +#include #include "warn.hh" #include "lookup.hh" diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index 62bcce8a54..39cd7555f5 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -8,7 +8,7 @@ #include "lyric-hyphen.hh" -#include +#include #include "lookup.hh" #include "output-def.hh" diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index bcb05b8977..7c3889e12d 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -8,7 +8,7 @@ #include "mensural-ligature.hh" -#include +#include #include "item.hh" #include "font-interface.hh" diff --git a/lily/midi-def.cc b/lily/midi-def.cc index 0d3122b7ba..341ff00e26 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -7,7 +7,7 @@ */ -#include +#include #include "misc.hh" #include "output-def.hh" diff --git a/lily/misc.cc b/lily/misc.cc index 036cbd7e50..95d730b9e7 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -9,7 +9,7 @@ #include "misc.hh" -#include +#include /* Return the 2-log, rounded down diff --git a/lily/note-collision.cc b/lily/note-collision.cc index 0aef74e9b8..dcb43adc85 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -8,7 +8,7 @@ #include "note-collision.hh" -#include +#include #include "warn.hh" #include "note-column.hh" diff --git a/lily/note-column.cc b/lily/note-column.cc index c88f9b3e8a..b44e7be487 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -8,7 +8,7 @@ #include "note-column.hh" -#include // ceil +#include // ceil #include "axis-group-interface.hh" #include "stem.hh" diff --git a/lily/note-head.cc b/lily/note-head.cc index 8e8da2d500..211e3d7b43 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -8,7 +8,7 @@ #include "note-head.hh" -#include +#include #include #include "directional-element-interface.hh" diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 23e5f9cfc6..72135b9138 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -9,7 +9,7 @@ #include "paper-outputter.hh" -#include +#include #include #include "dimensions.hh" diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc index eddb2656a9..f7b553b206 100644 --- a/lily/percent-repeat-item.cc +++ b/lily/percent-repeat-item.cc @@ -9,7 +9,7 @@ #include "percent-repeat-item.hh" -#include +#include #include "lookup.hh" #include "font-interface.hh" diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 7661707ade..679a942621 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -8,7 +8,7 @@ #include "rest-collision.hh" -#include // ceil. +#include // ceil. #include "warn.hh" #include "note-column.hh" diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index deaaf5f3aa..832cdae645 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -9,7 +9,7 @@ #include "side-position-interface.hh" -#include // ceil. +#include // ceil. #include "note-head.hh" #include "warn.hh" diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 515d3c0eeb..590cbbf58d 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -13,7 +13,7 @@ #include "simple-spacer.hh" #include -#include +#include #include // isinf diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index 4889c9c920..d13f96f8e2 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -9,7 +9,7 @@ #include "slur-configuration.hh" -#include +#include #include "stem.hh" #include "warn.hh" diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index 3d381d09aa..999fd3f7dc 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -9,7 +9,7 @@ #include "slur-scoring.hh" -#include +#include #include "libc-extension.hh" #include "slur-configuration.hh" diff --git a/lily/slur.cc b/lily/slur.cc index c1a0c96c2e..5f42e7c688 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -9,7 +9,7 @@ #include "slur.hh" -#include +#include #include "beam.hh" #include "bezier.hh" diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 2dc389736c..99b87cd242 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -10,7 +10,7 @@ #include "spaceable-grob.hh" #include -#include +#include #include "warn.hh" #include "spring.hh" diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index e01511538f..14aeee2d7d 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -7,7 +7,7 @@ */ -#include +#include #include #include "main.hh" diff --git a/lily/spanner.cc b/lily/spanner.cc index 69251e2a2a..3f7ebd7e4b 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -8,7 +8,7 @@ #include "spanner.hh" -#include +#include #include diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index b02e7620f4..1e4238fef1 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -8,7 +8,7 @@ #include "staff-symbol-referencer.hh" -#include +#include #include "staff-symbol.hh" #include "output-def.hh" diff --git a/lily/stem.cc b/lily/stem.cc index 940284971a..69453f6cdc 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -15,7 +15,7 @@ #include "stem.hh" -#include // rint +#include // rint #include "lookup.hh" #include "directional-element-interface.hh" diff --git a/lily/stencil.cc b/lily/stencil.cc index 35338f0b6c..c684dcb31c 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -8,7 +8,7 @@ #include "stencil.hh" -#include +#include #include // isinf diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 9062e6c37d..d6aea8a81f 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -9,7 +9,7 @@ #include "system-start-delimiter.hh" -#include +#include #include "spanner.hh" #include "axis-group-interface.hh" diff --git a/lily/system.cc b/lily/system.cc index 7c3d287cca..cf8854825d 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -8,7 +8,7 @@ #include "system.hh" -#include +#include #include "align-interface.hh" #include "axis-group-interface.hh" diff --git a/lily/text-item.cc b/lily/text-item.cc index 758252f32b..47cfa06269 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -9,7 +9,7 @@ #include "text-item.hh" -#include +#include #include "warn.hh" #include "grob.hh" diff --git a/lily/tie.cc b/lily/tie.cc index 36db5cb037..c23b51af45 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -8,7 +8,7 @@ #include "tie.hh" -#include +#include #include "spanner.hh" #include "lookup.hh" diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index dd1fda286d..c011f2e369 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -25,7 +25,7 @@ #include "tuplet-bracket.hh" -#include +#include #include "line-interface.hh" #include "beam.hh" diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc index 90fffe0174..b10d197230 100644 --- a/lily/vaticana-ligature.cc +++ b/lily/vaticana-ligature.cc @@ -8,7 +8,7 @@ #include "vaticana-ligature.hh" -#include +#include #include "item.hh" #include "font-interface.hh"