patch::: 1.0.8.jcn3: png

pl 8.jcn3
	- gif -> png
	    * ps-to-pngs.sh
	    * stepmake
	    * website
	    * yodl-1.31.4 (to be released)
	- target 'texinfo' -> 'info'

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 22da57bfe083c6f62987df1e8e581af375ef6890..76f54de9717399c37d4f927f798df6e7d3eb6660 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -16,5 +16,5 @@ include $(depth)/make/stepmake.make
 
 default: do-doc
 
-texinfo: $(outdir)/$(package).info
+info: $(outdir)/$(package).info
 

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index a4fceddda318824c217bb12c1b1cc9b8e9ce8c79..488c762d9be8f7dec00cd36514f87e60a26bcef2 100644 (file)
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -3,14 +3,17 @@ depth = ../..
 STEPMAKE_TEMPLATES=documentation
 XPM_FILES=$(wildcard *.xpm)
 OUTGIF_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.gif))
+OUTPNG_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.png))
 
 EXTRA_DIST_FILES= $(XPM_FILES)
 
 include $(depth)/make/stepmake.make
 
 gifs: $(OUTGIF_FILES)
+pngs: $(OUTPNG_FILES)
 
-local-WWW: $(OUTGIF_FILES)
+# local-WWW: $(OUTGIF_FILES)
+local-WWW: $(OUTPNG_FILES)
 
 icon: $(outdir)/lelie_icon.gif
        cp $< $(depth)/$(outdir)/$(package)-icon.gif

diff --git a/NEWS b/NEWS
index 1f7ae3d063768f5ecae5306a26f4dd54bf08fa1a..b3d7bc26f342e75f54f82f12f9635c8759b9c275 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+pl 8.jcn3
+       - gif -> png
+           * ps-to-pngs.sh
+           * stepmake
+           * website
+           * yodl-1.31.4 (to be released)
+       - target 'texinfo' -> 'info'
+
 pl 8.jcn2
        - more doco in texinfo (with yodl pl3)
        - bf's: package-diff

diff --git a/VERSION b/VERSION
index bac268857a551d28914cddfd0292099e287baf01..e11ea79acb582e55653c39270621862697756925 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=8
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/aclocal.m4 b/aclocal.m4
index 3f1287644c1be58dd7b23dc973f50c7f373f58b4..03df5805abc9a7d13ecd141139e017f8e5d18510 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -264,8 +264,9 @@ dnl    fi
     AC_SUBST(LN)
     AC_SUBST(LN_S)
     AC_SUBST(INSTALL)
-   AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
-     AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
+    AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
+    AC_SUBST(PATHSEP)
+    AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
   
    
     AC_STEPMAKE_DATADIR

diff --git a/buildscripts/ps-to-gifs.sh b/buildscripts/ps-to-gifs.sh
index 675d40e91f4ca12ce5dd393f0379d7b3c20daa64..12ea5773394b804cd289b824d70f766026ea7835 100755 (executable)
--- a/buildscripts/ps-to-gifs.sh
+++ b/buildscripts/ps-to-gifs.sh
@@ -1,14 +1,16 @@
 #!/bin/sh
-# ps-to-gifs, convert PS to multiple gifs
-  
+# 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
   -t, --transparent  change white to transparent
 EOF
 }
@@ -18,6 +20,8 @@ if [ $# -lt 1 ]; then
     exit 2;
 fi
 CROP=cat
+GIF=gif
+PNMTOGIF=ppmtogif
 
 while [ $# -gt 0 ]; do
 opt=$1
@@ -37,6 +41,10 @@ shift
         ;;
     --o*=*) OUTFILE=`echo $opt | sed -e s/"^.*="//`
         ;;
+    -p|--p*)
+       GIF=png
+       PNMTOGIF=pnmtopng
+       ;;
     -*)
         echo "ps-to-gifs: unknown option: \`$opt'"
        exit 1
@@ -54,24 +62,24 @@ fi
 if [ "x$OUTFILE" = "x" ]; then
        BASE=`dirname $FILE`/`basename $FILE .ps`
 else
-       BASE=`dirname $OUTFILE`/`basename $OUTFILE .gif`
+       BASE=`dirname $OUTFILE`/`basename $OUTFILE .$GIF`
 fi
 
 # urg, pipe breaks
-rm -f $BASE{.ppm,.gif} $BASE-page*{.ppm,.gif}
+rm -f $BASE{.ppm,.$GIF} $BASE-page*{.ppm,.$GIF}
 
 # generate the pixmap at twice the size, then rescale (for antialiasing)
 cat $FILE | gs -sDEVICE=ppmraw -sOutputFile="$BASE-page%d.ppm" -r200 -dNOPAUSE - -c quit $FILE
 # quant is soo slow
-# cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | ppmtogif $color > $OUTFILE
+# 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 | pnmscale 0.5 | $CROP | ppmtogif $color > $o
+    o=`dirname $i`/`basename $i .ppm`.$GIF
+    cat $i | pnmscale 0.5 | $CROP | $PNMTOGIF $color > $o
     rm $i
 done
 
 if [ "x$OUTFILE" != "x" ]; then
-       mv $BASE-page1.gif $BASE.gif
+       mv $BASE-page1.$GIF $BASE.$GIF
 fi
 

diff --git a/buildscripts/ps-to-pngs.sh b/buildscripts/ps-to-pngs.sh
new file mode 100644 (file)
index 0000000..2a3f363
--- /dev/null
+++ b/buildscripts/ps-to-pngs.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# ps-to-pngs, convert PS to multiple pngs
+  
+ps-to-gifs --png $*

diff --git a/config.make.in b/config.make.in
index b0f83348dd54fca2febd4b6b3af6ea1323e06768..1cc983d7c58531a06d853054f26b76685b48fc8b 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -48,6 +48,7 @@ FLEX = @FLEX@
 LN = @LN@
 LN_S = @LN_S@
 MSGFMT = @MSGFMT@
+PATHSEP = @PATHSEP@
 PERL = @PERL@
 PYTHON = @PYTHON@
 TAR= @TAR@
@@ -60,5 +61,4 @@ YODL2MSLESS= @YODL2MSLESS@
 YODL2TEXINFO= @YODL2TEXINFO@
 YODL2TXT= @YODL2TXT@
 ZIP = @ZIP@
-PATHSEP = @PATHSEP@
 

diff --git a/lily/VERSION b/lily/VERSION
index bac268857a551d28914cddfd0292099e287baf01..e11ea79acb582e55653c39270621862697756925 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=8
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index cc142821257db670cab696166bba45f8e8231edb..fa757cbc1e8ef793e559c99bdc7900817963fe74 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -79,3 +79,4 @@
 1.0.8
 1.0.8.jcn1
 1.0.8.jcn2
+1.0.8.jcn3

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 4f47dcb672c4b3731fca470fb9b7277608b52f79..1864cc4b325bfbbd877f836cbe2717e27401ab77 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -19,7 +19,7 @@ Prereq: tetex
 %build
 ./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --enable-optimise --enable-shared --enable-tex-dir='${prefix}/lib/texmf/texmf/tex/generic' --enable-mf-dir='${prefix}/lib/texmf/texmf/fonts/source/'
 make all
-make -C Documentation texinfo || true
+make -C Documentation info || true
 make htmldoc
 
 %install

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 0b16e7e68a694829e3f5b383b228132490d6ab40..23887b901c61acb09e03c518de03ad14ffaabf27 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -5,6 +5,11 @@ $(outdir)/%.gif: $(outdir)/%.ps
        -mv $(name-stem)-page*.gif $(outdir)/
        touch $@
 
+$(outdir)/%.png: $(outdir)/%.ps
+       sh $(buildscripts)/ps-to-pngs.sh $<
+       -mv $(name-stem)-page*.png $(outdir)/
+       touch $@
+
 $(outdir)/%.ly.txt: %.ly
        ln -f $< $@
 

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index 541d10b0168d4a77607f181647193ecd542c3822..11b4a35299335c16fabe98790a729b4b760d13c8 100644 (file)
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -3,7 +3,7 @@
 all: $(OUT_FILES)
 
 
-local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(gif_examples)
+local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
        (cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --package=$(topdir) --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples))
        $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/$(outdir)/index.html $(outdir)/index.html
        echo $^ > $(depth)/wwwlist

diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make
index 92ef7c0e5a478863cdf90bfeae5594fb587954ef..d140f286cf24d9dbe250c5b5347f9df84196280a 100644 (file)
--- a/make/mutopia-vars.make
+++ b/make/mutopia-vars.make
@@ -17,6 +17,7 @@ all_examples=$(flexamples) $(examples)
 
 ps_examples=$(addprefix $(outdir)/, $(addsuffix .ps.gz, $(all_examples)))
 gif_examples=$(addprefix $(outdir)/, $(addsuffix .gif, $(all_examples)))
+png_examples=$(addprefix $(outdir)/, $(addsuffix .png, $(all_examples)))
 
 html_subdirs=$(addprefix --subdirs ,$(SUBDIRS))
 

diff --git a/make/substitute.make b/make/substitute.make
index 92df5d2cef3ed7038281ed88534d3a202c2a27ca..0a11afa384f9e0732fb4db059c1069e1a122d18a 100644 (file)
--- a/make/substitute.make
+++ b/make/substitute.make
@@ -11,6 +11,7 @@ ATVARIABLES = \
   DIR_DATADIR\
   PACKAGE\
   package\
+  PATHSEP\
   PERL\
   PYTHON\
   SHELL\

diff --git a/stepmake/NEWS b/stepmake/NEWS
index cc68cff9219b8df90aa424a2c41755c5e553f272..ac662d058d1e9e02e5b84a7d9a11e28218f01649 100644 (file)
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,3 +1,7 @@
+pl 50
+       - bf's: PATHSEP
+       - png
+
 pl 49
        - use yodl2ms and striproff for txt conversion
        - bf: chmod fail

diff --git a/stepmake/VERSION b/stepmake/VERSION
index eb46477624aaff48f97d76730100a90fdf81b8b0..a044234f747d838df61fb135d6321692de2ee207 100644 (file)
--- a/stepmake/VERSION
+++ b/stepmake/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=49
+PATCH_LEVEL=50
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 89c324e3d06fe3e5ae09261ce61f3377847d783f..fc6b9f387c6231d340ea5174b1f56698d331ee7e 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -262,8 +262,9 @@ dnl    fi
     AC_SUBST(LN)
     AC_SUBST(LN_S)
     AC_SUBST(INSTALL)
-   AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
-     AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
+    AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
+    AC_SUBST(PATHSEP)
+    AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
   
    
     AC_STEPMAKE_DATADIR

diff --git a/stepmake/bin/package-zip.sh b/stepmake/bin/package-zip.sh
index f8c800118afe8ffb64b03e8489d7b69dce73ed03..e325688fdd5c679ee17911687dc02f432aa60f1e 100644 (file)
--- a/stepmake/bin/package-zip.sh
+++ b/stepmake/bin/package-zip.sh
@@ -44,6 +44,7 @@ export PATH=/usr/doos/bin:$PATH
 ./configure --host=i386-pc-linux --target=i386-pc-cygwin32 --prefix=/usr --enable-debugging --enable-printing --enable-checking
 
 make
+make -C Documentation info || true
 rm -rf $builddir
 make prefix="$builddir/usr" DOTEXE=.exe install
 make prefix="$builddir/usr" installextradoc

diff --git a/stepmake/bin/package-zip32.sh b/stepmake/bin/package-zip32.sh
index 0c2556ca511e7e28478aa05c71cd53c6e9a3dde4..60174c018cccdf5694eea26c633d1e180d15d4d3 100644 (file)
--- a/stepmake/bin/package-zip32.sh
+++ b/stepmake/bin/package-zip32.sh
@@ -50,6 +50,9 @@ if ! make ; then
     exit 1
 fi
 
+# failure allowed
+make -C Documentation info
+
 if ! make install ; then
     echo "make install failed"
     exit 1

diff --git a/stepmake/config.make.in b/stepmake/config.make.in
index 5ab98dd83adaadaaf1cfe405004815180ab4f772..1cc983d7c58531a06d853054f26b76685b48fc8b 100644 (file)
--- a/stepmake/config.make.in
+++ b/stepmake/config.make.in
@@ -48,6 +48,7 @@ FLEX = @FLEX@
 LN = @LN@
 LN_S = @LN_S@
 MSGFMT = @MSGFMT@
+PATHSEP = @PATHSEP@
 PERL = @PERL@
 PYTHON = @PYTHON@
 TAR= @TAR@

diff --git a/stepmake/stepmake/documentation-rules.make b/stepmake/stepmake/documentation-rules.make
index e7ac7462470d4b4b630b3fc42fb56a56d1b60920..2cb0849430f4a3bad87d57b146532fec04e7a41d 100644 (file)
--- a/stepmake/stepmake/documentation-rules.make
+++ b/stepmake/stepmake/documentation-rules.make
@@ -3,11 +3,14 @@
 # special rules for the documentation section.
 # There are too many to add to the general rules
 
-.SUFFIXES: .1 .data .html .gif .xpm .tex .txt
+.SUFFIXES: .1 .data .html .gif .png .tex .txt .xpm
 
 $(outdir)/%.gif: %.xpm
        xpmtoppm $< | ppmtogif > $@
 
+$(outdir)/%.png: %.xpm
+       xpmtoppm $< | pnmtopng > $@
+
 # use striproff?
 $(outdir)/%.txt: $(outdir)/%.1
        troff -man -Tascii $< | grotty -b -u -o > $@

diff --git a/stepmake/stepmake/yolily-topdoc-targets.make b/stepmake/stepmake/yolily-topdoc-targets.make
index 447b7e43166522fb3d8971541ee3b5110187f533..19fcff909b16c2c9026eca13a01c1db1bec5f409 100644 (file)
--- a/stepmake/stepmake/yolily-topdoc-targets.make
+++ b/stepmake/stepmake/yolily-topdoc-targets.make
@@ -10,7 +10,7 @@ $(outdir)/%.html: %.yo
        $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=index.html --news=$(depth)/NEWS $@
 
 local-WWW:
-       -cp $(outdir)/*gif $(outdir)/index.html $(depth)  # don't fail if not making website
+       -cp $(outdir)/*png $(outdir)/index.html $(depth)  # don't fail if not making website
 
 
 copy-to-top: 

diff --git a/stepmake/stepmake/yolily-toplevel-targets.make b/stepmake/stepmake/yolily-toplevel-targets.make
index c41b64867c284e091de76103d2d521836042bfb7..a11f4896c176c3272f0a2911e3e2d9d7603018f4 100644 (file)
--- a/stepmake/stepmake/yolily-toplevel-targets.make
+++ b/stepmake/stepmake/yolily-toplevel-targets.make
@@ -19,7 +19,7 @@ htmldoc:
        find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist
        -ln -f $(patch-dir)/$(distname).diff.gz out-www
        -ln -f $(depth)/$(distname).diff.gz out-www
-       tar cfz $(outdir)/htmldoc.tar.gz  `cat wwwlist` `ls *.gif out-www/$(distname).diff.gz $(ERRORLOG)`  index.html
+       tar cfz $(outdir)/htmldoc.tar.gz  `cat wwwlist` `ls *.png out-www/$(distname).diff.gz $(ERRORLOG)`  index.html
 
 
 # if you fix this, please fix yodl too!