uhh

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index a5a338239788ba7728da8766830077d59a7c47dd..c690d4e9b3786b3025075dcf0470973304b0a9ad 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -5,7 +5,7 @@ SUBDIRS=user bibliography pictures topdocs misc windows
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(set-lily-option (quote internal-type-checking) \#t)"'
-README_TOP_FILES=NEWS DEDICATION CHANGES 
+README_TOP_FILES=NEWS DEDICATION ChangeLog
 EXTRA_DIST_FILES=
 
 include $(depth)/make/stepmake.make 

diff --git a/Documentation/index.texi b/Documentation/index.texi
index b4c0b0cf220fe525d93ef6bc28d0544a06e0b35a..d626d01d59db6d3de058551b4a775c98e08b8aca 100644 (file)
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -81,7 +81,7 @@ the mailing lists.
 
 
 @itemize @bullet
-@item @uref{CHANGES.html, CHANGES} Things recently done.
+@item @uref{ChangeLog.html, ChangeLog} Things recently done.
 
 @c download sites?
 

diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index 7b1274f03f4922d9faaf4c2c5e19e11c564c0438..e7778c4faa1c0f17f8caf56f288cd7de905689fc 100644 (file)
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -1,6 +1,6 @@
 
 @node Preface
-@unnumberedchapter Preface
+@chapter Preface
 
 
 It must have been during a rehearsal of the EJE (Eindhoven Youth

diff --git a/VERSION b/VERSION
index aa342fef9947520731ea0479e59c03cf6cf6e655..cbea8b5041d2c15887c69b0306fb5fbb4c594ef7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=66
-MY_PATCH_LEVEL=jcn1
+PATCH_LEVEL=67
+MY_PATCH_LEVEL=
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 74736942d19a0bad546520915ff81c7c082f5f0d..effee3ff5f435e83dd24f68916fd5a9b2c33a44c 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -17,6 +17,10 @@ else
     else
        eval `cat $LILYPONDPREFIX/VERSION`
        FULLVERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL"
+       if [ "" != "$MY_PATCH_LEVEL" ]; then
+           FULLVERSION="$FULLVERSION.$MY_PATCH_LEVEL"
+       fi 
+       
        datadir="$LILYPONDPREFIX/share/lilypond/$FULLVERSION"
     fi
     echo "Setting tree to $datadir"

diff --git a/lily/beam.cc b/lily/beam.cc
index f505f25743b7d2b036372f157de2a3d45cf5b1eb..22880a15ac979b4f1020c5cc6b28497a97f26ebc 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -18,8 +18,12 @@ TODO:
 
   * cross staff 
   
+  - Determine auto knees based on positions if it's set by the user.
+
+
 Notes:
 
+
  - Stems run to the Y-center of the beam.
   
  - beam_space is the offset between Y centers of the beam.

diff --git a/lily/grob.cc b/lily/grob.cc
index ff3130c57fa39506f03026dd7083fb65c6e469b3..9394dac32181363a9915fff4424874843b8f4beb 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -18,6 +18,7 @@
 #include "paper-score.hh"
 #include "molecule.hh"
 #include "grob.hh"
+#include "warn.hh"
 #include "spanner.hh"
 #include "system.hh"
 #include "item.hh"

diff --git a/lily/include/rod.hh b/lily/include/rod.hh
index bde8351a2e6ca9bae69b8d028b6bd756dac65a33..a493cd5ba6a902c7ca013664378bcd486451c524 100644 (file)
--- a/lily/include/rod.hh
+++ b/lily/include/rod.hh
@@ -9,12 +9,11 @@
 
 #ifndef ROD_HH
 #define ROD_HH
+
 #include "lily-proto.hh"
 #include "direction.hh"
 #include "drul-array.hh"
 
-
-
 struct Rod
 {
   Drul_array <Item*> item_l_drul_;
@@ -29,5 +28,6 @@ struct Rod
 
   Rod ();
 };
+
 #endif /* ROD_HH */