patch::: 1.3.144.jcn6

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 107698724709706eb84c6fde759d45689cb6e601..d6e7a59342a1d2626a046e6c5fa0fd183d5c91bd 100644 (file)
--- 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 8d1a602cb2602ed228dd2895210629d6706c4b57..cd920cd45584941ce1f6aea59b6c5b929d8c7323 100644 (file)
--- 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 8355a3dc659c1b5daf74d396d50723a283f65f0e..3e8824f8100484c3de91581180db3646f6f3e70c 100644 (file)
--- 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 b683bab2ffb51ff01811757e112e413d6046a7cd..99e7c68cfd6608c997e454058e02b9b0cd32f9d5 100644 (file)
--- 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)