From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 20 Mar 2006 23:20:07 +0000 (+0000)
Subject: (option_parser): update to 2.7.40
X-Git-Tag: release/2.7.40~4
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=cd97f3fa5b1275595307e89b5b070f833adb573a

(option_parser): update to 2.7.40
---

diff --git a/ChangeLog b/ChangeLog
index e104013f54..cb464d65da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* scripts/abc2ly.py (option_parser): update to 2.7.40
+
 2006-03-20  Graham Percival  <gpermus@gmail.com>
 
 	* THANKS: move small doc contributors to SUGGESTIONS.
diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index cc79879b5f..cdd72d9e19 100644
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -766,11 +766,14 @@ The markup command @code{\slashSeparator} is provided as a sensible
 default,  for example
 
 @lilypond[ragged-right]
-\paper {
-  systemSeparatorMarkup = \slashSeparator
+\book {
+  \score {
+    \relative { c1 \break c1 }
+  }
+  \paper {
+    systemSeparatorMarkup = \slashSeparator
+  }
 }
-
-\relative { c1 \break c1 }
 @end lilypond
 
 
diff --git a/autogen.sh b/autogen.sh
index 4271d4c8a7..2fd8bebd5a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,6 @@ case $1 in
     --noconf*) NOCONFIGURE=true;;
 esac
 
-touch stepmake/bin/install-sh
 if [ ! -f aclocal.m4 -o stepmake/aclocal.m4 -nt aclocal.m4 ]; then
     echo "stepmake/aclocal.m4 is newer.  Copying file." 
     cp -f stepmake/aclocal.m4 aclocal.m4
diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index e9f842cc23..1257182f71 100644
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -1390,7 +1390,7 @@ for f in files:
 
 # don't substitute @VERSION@. We want this to reflect
 # the last version that was verified to work.
-	outf.write ('\\version "2.5.20"\n')
+	outf.write ('\\version "2.7.40"\n')
 
 #	dump_global (outf)
 	dump_header (outf, header)