From 166b618065caa177005063b838f452ed801f20fe Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 31 Mar 2001 15:28:39 +0200
Subject: [PATCH] patch::: 1.3.144.jcn6

---
 Documentation/user/tutorial.itely | 18 ++++++++++++++----
 VERSION                           |  2 +-
 make/ly.make                      |  3 ++-
 scripts/update-lily.py            |  8 +++++---
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 1076987247..d6e7a59342 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -25,7 +25,6 @@ package.
 yourself, to get a feel for how the program behaves.
 
 @menu
-* Introduction::                
 * Running LilyPond::            Getting started
 * The first tune::              The first tune
 * Lyrics and chords::           Lyrics and chords
@@ -35,7 +34,6 @@ yourself, to get a feel for how the program behaves.
 * Part extraction::             
 * Latex and texinfo integration::  
 * end of tutorial::             The end
-* Pre-cooked makefile::         
 @end menu
 
 
@@ -2159,11 +2157,23 @@ Music (TM), have a look at the @ref{Mutopia project}.
 
 this should be on mutopia website.
 
+Ja, inderdaad: OOK on mutopia website.
+
+This helps people to generate .ps from .ly in general, create booklets
+etc, use dependencies.  Figure out where to include this.  Refman?
+
+
+Zie makefile rm lily-* discussies op gmd.
+
+
+
 ]
 
+@c UGH UGH: emacs' texinfo-all-menus-update also parses inside @ignore
+@c blocks.
 
-@node Pre-cooked makefile
-@section Pre-cooked makefile
+@c @no de Pre-cooked makefile
+@c @s ection Pre-cooked makefile
 
 @c waar deze info?  is uiteindelijk wel handig, schat ik.
 [TODO: cut blabla]
diff --git a/VERSION b/VERSION
index 8d1a602cb2..cd920cd455 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=144
-MY_PATCH_LEVEL=hwn2
+MY_PATCH_LEVEL=jcn6
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/make/ly.make b/make/ly.make
index 8355a3dc65..3e8824f810 100644
--- a/make/ly.make
+++ b/make/ly.make
@@ -62,7 +62,8 @@ mutopia-examples=$(name) $(parts)
 #
 $(outdir)/%-book.ps: $(outdir)/%.ps
 	psbook $< $<.tmp
-	pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.tmp $@
+#	pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.tmp $@
+	pstops  '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@
 
 #
 # Catch-all target: type `make foo' to make out/foo.ps,
diff --git a/scripts/update-lily.py b/scripts/update-lily.py
index b683bab2ff..99e7c68cfd 100644
--- a/scripts/update-lily.py
+++ b/scripts/update-lily.py
@@ -50,8 +50,10 @@ patch_dir = build_root + '/patches'
 notify = 0
 
 build_command = '''
+set -x
 cd %b &&
 [ -d %n-%v ] && exit 1 || true;
+mkdir -p %n-%v
 (
 tar xzf %r/%t &&
 rm -f building &&
@@ -243,7 +245,7 @@ option_definitions = [
 	 ),
 	('', 'h', 'help', _ ("this help")),
         ('', 'k', 'keep', _ ("keep all output, and name the directory %s") % temp_dir),
-        ('EMAIL', 'n', 'notify', _ ("upon failure notify EMAIL[,EMAIL]"),
+        ('EMAIL', 'n', 'notify', _ ("upon failure notify EMAIL[,EMAIL]")),
 	('', 'r', 'remove-previous', _ ("remove previous build")),
 	('', 'V', 'verbose', _ ("verbose")),
 	('', 'v', 'version', _ ("print version number")),
@@ -445,11 +447,11 @@ if 1:
 
 	progress (_ ("building %s...") % latest)
 	os.chdir (build_root)
-	if build (latest) previous and remove_previous_p:
+	if build (latest) and previous and remove_previous_p:
 		system ('rm -rf %s' % os.path.join (build_root, previous))
 	else:
 		if notify:
-			system ('(date; uname -a) | mail -s "%s failed" %s' % (program_name, notify)
+			system ('(date; uname -a) | mail -s "%s failed" %s' % (program_name, notify))
 		sys.exit (1)
 		
 	os.chdir (original_dir)
-- 
2.39.2