From eac6d173ba4c6c4dc5ff44f542ca1c629524f5ff Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 13 Jul 2002 18:47:17 +0000
Subject: [PATCH] uhh

---
 Documentation/GNUmakefile        | 2 +-
 Documentation/index.texi         | 2 +-
 Documentation/user/preface.itely | 2 +-
 VERSION                          | 4 ++--
 buildscripts/lilypond-profile.sh | 4 ++++
 lily/beam.cc                     | 4 ++++
 lily/grob.cc                     | 1 +
 lily/include/rod.hh              | 4 ++--
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index a5a3382397..c690d4e9b3 100644
--- 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 b4c0b0cf22..d626d01d59 100644
--- 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 7b1274f03f..e7778c4faa 100644
--- 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 aa342fef99..cbea8b5041 100644
--- 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 74736942d1..effee3ff5f 100644
--- 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 f505f25743..22880a15ac 100644
--- 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 ff3130c57f..9394dac321 100644
--- 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 bde8351a2e..a493cd5ba6 100644
--- 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 */
 
-- 
2.39.5