release commit

diff --git a/ChangeLog b/ChangeLog
index 4ad20ba5cfd674440da954785a3e9441f2898f7b..7e8644cd295e6ead044982afd93089d5112d58bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-30  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scripts/lilypond-book.py (make_pixmap): don't produce empty pages.
+
 2002-09-28  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * scm/translator-property-description.scm (voltaOnThisStaff): add
@@ -154,6 +158,8 @@
 
 2002-09-21  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * VERSION: 1.6.4 released
+       
        * scm/tex.scm (header-end): enclose lily output in begingroup/endgroup.
 
        * tex/lilyponddefs.tex: set hsize for plain tex, but only for

diff --git a/VERSION b/VERSION
index eb76589529ceacc0a72707a6ae9214e1665182d5..be801bdeb29e7128184f2ee263d6d8ff47942f7e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=6
-PATCH_LEVEL=4
+PATCH_LEVEL=5
 MY_PATCH_LEVEL=
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/input/sondag-morgen/GNUmakefile b/input/sondag-morgen/GNUmakefile
index debf2fa468f866975640111bafdb3063a3d3bbf6..e367d4aa01f3df2552732897735fce11d6011a63 100644 (file)
--- a/input/sondag-morgen/GNUmakefile
+++ b/input/sondag-morgen/GNUmakefile
@@ -1,6 +1,6 @@
 depth = ../..
 
-examples=sondag-morgen
+examples=
 LOCALSTEPMAKE_TEMPLATES=ly mutopia
 
 include $(depth)/make/stepmake.make

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 9764e880853bd399a3fd11049e4fa56cb7f80fe0..5aa91fc0aecdd3c38b5233b545cbd0430eeb0408 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1135,6 +1135,8 @@ def get_bbox (filename):
 
 def make_pixmap (name):
        bbox = get_bbox (name + '.eps')
+
+
        margin = 0
        fo = open (name + '.trans.eps' , 'w')
        fo.write ('%d %d translate\n' % (-bbox[0]+margin, -bbox[1]+margin))
@@ -1144,6 +1146,10 @@ def make_pixmap (name):
 
        x = (2* margin + bbox[2] - bbox[0]) * res / 72.
        y = (2* margin + bbox[3] - bbox[1]) * res / 72.
+       if x == 0:
+               x = 1
+       if y == 0:
+               y = 1
 
        cmd = r'''gs -g%dx%d -sDEVICE=pnggray  -dTextAlphaBits=4 -dGraphicsAlphaBits=4  -q -sOutputFile=%s -r%d -dNOPAUSE %s %s -c quit '''
 
@@ -1284,7 +1290,6 @@ def option_help_str (o):
                arg = arg + o[0]
        return '  ' + sh + sep + long + arg
 
-
 def options_help_str (opts):
        "Convert a list of options into a neatly formatted string"
        w = 0
@@ -1312,7 +1317,6 @@ Options:
 Warning: All output is written in the CURRENT directory.
 
 
-
 Report bugs to bug-lilypond@gnu.org.
 
 Written by Tom Cato Amundsen <tca@gnu.org> and