* GNUmakefile.in (web-ext): distribute .ly with web tarball too.

This means that the 1.6 binaries must be rebuilt.

* make/lilypond-vars.make: banish ps-to-X scripts

* make/generic-rules.make: remove blurb rule.

* GNUmakefile.in: make lilypond-fource file, so PK fonts are not
removed every make-run.

* make/ly-rules.make: don't remove .tely file.

* input/test/chords.ly (scales): whole notes only. Prevents
weird breaks.

* VERSION: release 1.6.0

* Documentation/user/latex-example.latex: restore from old version

diff --git a/ChangeLog b/ChangeLog
index 6c889e0eb2c26b330cfa9d6575126ab283a6c7fc..789526ad4ec0c960eb07586994f7d136c4993dfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2002-08-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * GNUmakefile.in (web-ext): distribute .ly with web tarball too.
+       This means that the 1.6 binaries must be rebuilt.
+
+       * make/lilypond-vars.make: banish ps-to-X scripts
+
+       * make/generic-rules.make: remove blurb rule.
+
+       * GNUmakefile.in: make lilypond-fource file, so PK fonts are not
+       removed every make-run.
+ 
+       * make/ly-rules.make: don't remove .tely file.
+
+       * input/test/chords.ly (scales): whole notes only. Prevents
+       weird breaks.
+
        * VERSION: release 1.6.0 
 
        * make/lilypond.redhat.spec.in: don't dist input/ separately

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 38851b89da5f247f28e2276c8529f58d7b216d04..ebd21f699dd5d0b927924cbba7053efc2096b66e 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -89,7 +89,7 @@ lily/$(outdir)/lilypond:
 
 local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
-web-ext = gz html midi pdf png txt
+web-ext = gz html midi pdf png txt ly
 top-web:
        cd $(builddir) && rm -f `find . -name \*.html~ -print`
        cd $(builddir) && find Documentation input \
@@ -126,12 +126,11 @@ builddir-setup: $(builddir)/share/lilypond-force
 
 $(builddir)/share/lilypond-force:
 # Preparing LilyPond tree for builddir exec
-       @echo Making $(builddir)/share 
-       @cd $(builddir) && rm -rf share
-       @mkdir -p $(builddir)/share/lilypond
-       @mkdir -p $(builddir)/share/lilypond/fonts
-       @mkdir -p $(builddir)/share/lilypond/tex
-       @cd $(builddir)/share/lilypond && \
+       cd $(builddir) && rm -rf share
+       mkdir -p $(builddir)/share/lilypond
+       mkdir -p $(builddir)/share/lilypond/fonts
+       mkdir -p $(builddir)/share/lilypond/tex
+       cd $(builddir)/share/lilypond && \
                ln -s $(abs-srcdir)/ly ly && \
                ln -s ../../mf/$(outconfbase) dvips && \
                ln -s ../../mf/$(outconfbase) afm && \
@@ -140,18 +139,19 @@ $(builddir)/share/lilypond-force:
                ln -s $(abs-srcdir)/ps && \
                ln -s ../../python/$(outconfbase) python && \
                ln -s $(abs-srcdir)/scm
-       @cd $(builddir)/share/lilypond/tex && \
+       cd $(builddir)/share/lilypond/tex && \
                ln -s $(abs-srcdir)/tex source && \
                ln -s ../../../mf/$(outconfbase) generate
-       @cd $(builddir)/share/lilypond/fonts && \
+       cd $(builddir)/share/lilypond/fonts && \
                ln -s $(abs-srcdir)/mf source && \
                ln -s ../../../mf/$(outconfbase) afm && \
                ln -s ../../../mf/$(outconfbase) tfm && \
                ln -s ../../../mf/$(outconfbase) type1
+       touch $@
 
 local-clean: builddir-setup-clean
 builddir-setup-clean:
-       @cd $(builddir) && rm -rf share
+       cd $(builddir) && rm -rf share
 
 $(config_h): configure.in aclocal.m4
 #

diff --git a/VERSION b/VERSION
index 2d5bb873fa67272fe3b27808b5fd666038660246..3e8670d24255195f2f64443f2484df63fd11b156 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=6
 PATCH_LEVEL=0
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=uu1
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/ps-to-gifs.sh b/buildscripts/ps-to-gifs.sh
deleted file mode 100644 (file)
index e2a3da8..0000000
--- a/buildscripts/ps-to-gifs.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-# ps-to-gifs, convert PS to multiple gifs or other bitmaps
-
-usage()
-{
-    cat <<EOF
-Convert PS to multiple gifs or other bitmaps
-Usage: ps-to-gifs.sh [OPTION]... [FILE]
-Options:
-  -h, --help         this help
-  -c, --crop         crop output
-  -o, --output=NAME  set output base
-  -p, --png          convert to png
-  -s, --size=SIZE    set papersize
-  -t, --transparent  change white to transparent
-EOF
-}
-
-if [ $# -lt 1 ]; then
-    usage;
-    exit 2;
-fi
-CROP=cat
-GIF=gif
-PNMTOGIF=ppmtogif
-
-while [ $# -gt 0 ]; do
-opt=$1
-shift
-    case $opt in
-    -t|--t*)
-       color='-transparent white'
-       ;;
-    -h|--h*)
-       usage;
-       exit 0
-       ;;
-    -c|--c*)
-       CROP=" pnmcrop "
-       ;;
-    -o) OUTFILE=$2; shift
-        ;;
-    --o*=*) OUTFILE=`echo $opt | sed -e s/"^.*="//`
-        ;;
-    -p|--p*)
-       GIF=png
-       PNMTOGIF=pnmtopng
-       ;;
-    -s) SIZE="-sPAPERSIZE=$2"; shift
-        ;;
-    --s*=*)
-        SIZE="-sPAPERSIZE=`echo $opt | sed -e s/"^.*="//`"
-       ;;
-    -*)
-        echo "ps-to-gifs: unknown option: \`$opt'"
-       exit 1
-       ;;
-    *)
-       FILE=$opt
-       ;;
-    esac
-done
-
-if [ "x$TRANSPARENT_IS_BROKEN" != "x" ]; then
-       color=
-fi
-
-if [ "x$OUTFILE" = "x" ]; then
-       BASE=`dirname $FILE`/`basename $FILE .ps`
-else
-       BASE=`dirname $OUTFILE`/`basename $OUTFILE .$GIF`
-fi
-
-# urg, pipe breaks
-rm -f $BASE{.ppm,.$GIF} $BASE-page*{.ppm,.$GIF}
-
-cat $FILE | gs -sDEVICE=pgm $SIZE -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sOutputFile="$BASE-page%d.ppm" -r90 -dNOPAUSE - -c quit $FILE
-# quant is soo slow
-# cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | $PNMTOGIF $color > $OUTFILE
-PPMS=`ls $BASE*ppm`
-for i in $PPMS; do
-    o=`dirname $i`/`basename $i .ppm`.$GIF
-    cat $i | $CROP | $PNMTOGIF $color > $o
-    rm $i
-done
-
-if [ "x$OUTFILE" != "x" ]; then
-       mv $BASE-page1.$GIF $BASE.$GIF
-fi
-

diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index 0fdaa320570d999baa9b619be8d51cf652218864..0bf13d689476f20b0fb63fc62e79eab5d6726130 100644 (file)
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -20,9 +20,8 @@
     ".\\\\Unrestricted modification and redistribution is permitted
     and encouraged---copy this music and share it.}"
   tagline = \mutopiapublicdomain
-  lastupdated = "2002/July/7"
-  footer = "Mutopia-2002/07/07-6"
-
+  lastupdated = "2002/August/19"
+  footer = "Mutopia-2002/08/19-6"
 }
 
 
@@ -33,11 +32,12 @@
 
  the few forced linebreaks were an earlier attempt to get the spacing
  to match up.
- 
+
+%\include "paper19.ly" 
 %}
 
-\include "paper19.ly"
-\version "1.5.68"
+
+\version "1.6.0"
 
 
 

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

diff --git a/input/test/chords.ly b/input/test/chords.ly
index aea0e8f94374759c767383eaa6029e542287a562..d92f586bd7cc7caf487d28f2e7ef9a0f7a9cc7a0 100644 (file)
--- a/input/test/chords.ly
+++ b/input/test/chords.ly
@@ -17,12 +17,13 @@ Would this be acceptable/good enough/convenient for entry?
 
 %}
 
+% used to be quarter notes here. Why? --hwn 
 scales =  \notes \transpose c'' \chords{
                %<c1 e g>
-               c1:m c:min c4:dim c:aug c:sus c:maj
-                c1:6 c4:7 c:9 c:11 c:13
+               c1:m c:min c:dim c:aug c:sus c:maj
+                c1:6 c:7 c:9 c:11 c:13
                c:m7 c:m.sus c:m7.sus
-               c4:dim7 c:dim9 c2:7^5 
+               c:dim7 c:dim9 c2:7^5 
                c:13^5.7.9.11
                % c1:7^5 c:13^5
                c1 g d a e b fis

diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly
index fc318070900caae8883c30372a3b6d6fc5ea91d3..bf552b641175054f5292806840c68f07489734f7 100644 (file)
--- a/input/test/stem-extend.ly
+++ b/input/test/stem-extend.ly
@@ -6,7 +6,7 @@ extension can be controlled through @code{Voice.Stem}'s grob-property
 "}
 
 \paper { linewidth = -1.}
-\score {\notes \relative c {
+\score {\notes \relative c \context Voice {
   \grace a'8 a4
   \property Voice.Stem \set #'no-stem-extend = ##t
   \grace g8 g4 [g8 g]

diff --git a/make/generic-rules.make b/make/generic-rules.make
index e81890bf2da83a707bad08164fca5c3acf15e5c1..b41e4846f0c37755aa969dbe0c2d17b8e2b22664 100644 (file)
--- a/make/generic-rules.make
+++ b/make/generic-rules.make
@@ -14,10 +14,4 @@ $(outdir)/%: %.in
 include $(depth)/make/substitute.make
 
 
-# HUH???
-$(outdir)/%.hh: $(doc-dir)/%.in
-       rm -f $@
-       echo '_(' > $@
-       cat $< | $(sed-quotes) | $(sed-newline) | $(sed-quote-line) >> $@
-       echo ');' >> $@
 

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 516f519719e86875aa285eb3e97053bf530db47b..7d0d40cd6f1b9d50312799cd1698c9ea614b0902 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -46,8 +46,7 @@ LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/  -I $(builddir)/mf/out/
 LY2DVI = $(script-dir)/ly2dvi.py
 LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
-PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh
-PS_TO_PNGS = $(buildscript-dir)/ps-to-pngs.sh
+
 
 else
 ### some versions apparently choke on $(message)
@@ -60,8 +59,6 @@ LILYPOND_BOOK = $(shell $(SHELL) -c 'type -p lilypond-book')
 LILYPOND_BOOK_INCLUDES = -I. -I.. -I$(outdir)
 LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi')
 LYS_TO_TELY = $(shell $(SHELL) -c 'type -p lys-to-tely')
-PS_TO_GIFS = $(shell $(SHELL) -c 'type -p ps-to-gifs')
-PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pngs')
 
 endif
 

diff --git a/make/lilypond.lsm.in b/make/lilypond.lsm.in
index 71bf18e624d504b7328f758a8fb114373f0e1445..8b8d1b9577289f54744bccf54ac58734f3cbdad0 100644 (file)
--- a/make/lilypond.lsm.in
+++ b/make/lilypond.lsm.in
@@ -2,14 +2,16 @@ Begin3
 Title: LilyPond
 Version: @TOPLEVEL_VERSION@
 Entered-date: @DATE@
-Description: @BLURB@
+Description: LilyPond  is a music  typesetter.  It  produces beautiful  sheet music
+using  a description  file as  input.   LilyPond  is  part of  the  GNU
+Project.
 Keywords: music notation typesetting midi fonts engraving
 Author: hanwen@cs.uu.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
-Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
-Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-       1000k @package@-@TOPLEVEL_VERSION@.tar.gz 
-Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
-       1000k @package@-@TOPLEVEL_VERSION@.tar.gz 
+Maintained-by: hanwen@cs.uu.nl (Han-Wen Nienhuys)
+Primary-site: ftp.lilypond.org /pub/LilyPond/v1.6/
+       1500k @package@-@TOPLEVEL_VERSION@.tar.gz 
+Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/v1.6/
+       1500k @package@-@TOPLEVEL_VERSION@.tar.gz 
 Copying-policy: GPL
 End

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 4d5590f2dadd23755dfa2454141b6a743c560ffd..f36ae8d718c0a2844207f76b17456d82c2c66cf3 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -4,7 +4,7 @@
 
 
 $(outdir)/%.latex: %.doc
-       rm -f $@
+       -chmod a+w $@
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES)\
 $(LILYPOND_BOOK_FLAGS) --verbose --dependencies --outdir=$(outdir) $<
        chmod -w $@
@@ -12,22 +12,25 @@ $(LILYPOND_BOOK_FLAGS) --verbose --dependencies --outdir=$(outdir) $<
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
-       rm -f $@
+       -chmod a+w $@
        set|egrep '(TEX|LILY)'  # ugh, what's this?
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --verbose $(LILYPOND_BOOK_FLAGS) $<
        chmod -w $@
 
 $(outdir)/%.texi: $(outdir)/%.tely
-       rm -f $@
-       set|egrep '(TEX|LILY)'  # ugh, what's this?
+       -chmod a+w $@
+# debugging:
+#      set|egrep '(TEX|LILY)'
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --verbose $(LILYPOND_BOOK_FLAGS) $<
-       rm -f $<
+#
+# DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
+#      rm -f $<
        chmod -w $@
 
 # nexi: no-lily texi
 # for plain info doco: don't run lily
 $(outdir)/%.nexi: %.tely
-       rm -f $@
+       chmod a+w $@
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --no-lily $(LILYPOND_BOOK_FLAGS) $<
        mv $(@D)/$(*F).texi $@
        chmod -w $@

diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make
index 6c7f72bdf2b66e9ca2e5b8e5d50c194fb92baad9..b41e4c7892223087414aa9d8f6656328d999a539 100644 (file)
--- a/make/lysdoc-rules.make
+++ b/make/lysdoc-rules.make
@@ -1,3 +1,6 @@
 
+
+
 $(outdir)/$(NAME).tely: $(LY_FILES)
        $(PYTHON) ../../buildscripts/lys-to-tely.py --name=$(outdir)/$(NAME) --title="$(TITLE)" $(LY_FILES)
+

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 85ad7707676ba605fda8561e50340c1815efc925..8320ee47cc71917f8d463c46e077442436dbecde 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,12 +1,8 @@
 
 
-$(outdir)/%.gif: $(outdir)/%.ps
-       sh $(PS_TO_GIFS) $<
-       -mv $(name-stem)-page*.gif $(outdir)/
-       ln -s $(name-stem)-page1.gif $@
-
 $(outdir)/%.png: $(outdir)/%.ps
-       sh $(PS_TO_PNGS) $<
+       gs -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sOutputFile="$(name-stem)-page%d.png" -r90 -dNOPAUSE $< -c quit
+
        -mv $(name-stem)-page*.png $(outdir)/
        ln -s $(name-stem)-page1.png $@
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index a2d6dd846a0918734a7e651007acd4efbf77fb6a..c308b5a001c797d0a0d7fda0b85c9a60fad795a9 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -417,7 +417,7 @@ output_dict= {
 <p>
 <a href="%(fn)s.png">
 <img border=0 src="%(fn)s.png" alt="[picture of music]">
-</a>
+</a><p>
 @end html
 ''',
                }