lilypond-1.3.120

diff --git a/CHANGES b/CHANGES
index 48dd80cd3eb3b267c44697b098fcbff63b812b6a..3a368ff58774f2db7ae43364c98cc12cedd8482b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,43 @@
+1.3.120
+=======
+
+* Removed texi->dvi cancellation and removed --clean option from texi2dvi
+command line; this fixes generation of dvi files in Documentation/user.
+Strange bug in texi2dvi.
+
+* Fixed bibtex url (reported David Raleigh Arnold), added support for
+bibtex2html, which is in Debian.
+
+* Added direntries to toplevel texi documents, for info files
+(reported Thomas Klausner).
+
+* Removed some empty files.
+
+* Make a Stem::height callback, to prevent early brew_molecule
+call. This fixes input/bugs/triplet.ly.
+
+* Manual fix for generated -interfaces documentation.
+
+* Small changes for texinfo-4.0a prerelease.
+
+* Added a --force option for makeinfo .txt generation.
+
+* Changed debian ftp urls according to new package pools layout.
+
+* Debian update, including menu/node fixes to development.texi (Anthony Fok).
+
+* Bugfix: lilypond-book (Tom Cato Amundsen).
+
+* Increase the size of dynamics, adding new sizes of feta-din (Mats Bengtsson).
+
+* \clef "none"; no clef, but whitespace (Mark Hindley).
+
+* Website fix: don't mv but cp .pngs do deep-html dirs.
+
+* Bugfix: chords examples (James Hammons).
+
+* Warning fix.
+
 1.3.119
 =======
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index d8d035834e74c555c8e2e22da39f17a726957ec5..a4101cc14afaf27dc36fea58341883a97fe59785 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -42,28 +42,31 @@ default:
 info: $(INFO_FILES)
 
 
-# The next version of makeinfo should split html files into their own
-# directory.  For now available only as patches from
-# http://appel.lilypond.org/software
-SPLITTING_MAKEINFO = $(shell makeinfo --version | grep '4.0.jcn[2,3]')
+# The new pretest version of makeinfo, 4.0a splits html files into their own
+# directory.  Available from
+# ftp://texinfo.org/texinfo/pretests/texinfo-4.0a.tar.gz
+SPLITTING_MAKEINFO = $(shell makeinfo --version | egrep '4.0((.jcn[2,3])|a)')
 
 
 # Generic rule using % twice not possible?
 # $(outdir)/%/%.html: $(outdir)/%.texi
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi
        -$(MAKEINFO) --force --output=$@ --html $<
-       -mv -f $(outdir)/*.png $(outdir)/lilypond
-       $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+       -cp -f $(outdir)/*.png $(outdir)/lilypond
+       -cp -f $(outdir)/lilypond/index.html $@
+       $(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
        -$(MAKEINFO) --force --output=$@ --html $<
-       -mv -f $(outdir)/*.png $(outdir)/lilypond-internals
-       $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+       -cp -f $(outdir)/*.png $(outdir)/lilypond-internals
+       -cp -f $(outdir)/lilypond-internals/index.html $@
+       $(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
 $(outdir)/features/features.html: $(outdir)/features.texi
        -$(MAKEINFO) --force --output=$@ --html $<
-       -mv -f $(outdir)/*.png $(outdir)/features
-       $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+       -cp -f $(outdir)/*.png $(outdir)/features
+       -cp -f $(outdir)/features/index.html $@
+       $(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
 ifneq ($(SPLITTING_MAKEINFO),)
 
@@ -77,7 +80,7 @@ endif
 
 
 local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES)
-       $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
+       $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals features
        $(MAKE) footify
        $(MAKE) deep-footify
 
@@ -94,6 +97,7 @@ $(outdir)/%.bib: %.bib
 
 localclean:
        rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
+       rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals $(outdir)/features
 
 backdoc-WWW: $(outdir)/lilypond-internals/lilypond-internals.html
        $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals

diff --git a/VERSION b/VERSION
index 7b3b1cf65f5ab65c20f4be66e91266b0eebf790b..1d20a8cc0015b1df59d6218af77fb81354655ebb 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
-PATCH_LEVEL=119
+PATCH_LEVEL=120
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index e24d66435a36b6768e59fc617645c0b8dcfe4dbc..bec07af2d41bf67ae240672530f4d8a8ed41f512 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -16,13 +16,13 @@ $(outdir)/%/%.html: $(outdir)/%.texi
 # we want footers even if website builds (or is built) partly
        $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
 
-$(outdir)/%.dvi:       $(outdir)/%.texi
-# --clean only in >= 3.12s
-# cd $(outdir); texi2dvi --clean ../$< 
-       cd $(outdir); texi2dvi ../$< 
+$(outdir)/%.dvi: $(outdir)/%.texi
+# ugh, --clean removes .. from TEXINPUTS?
+#      cd $(outdir); texi2dvi --batch --clean ../$< 
+       cd $(outdir); texi2dvi --batch ../$< 
 
 $(outdir)/%.txt: $(outdir)/%.texi
-       $(MAKEINFO) -I../ -I $(outdir) --no-split --no-headers --output $@ $<
+       $(MAKEINFO) --force -I../ -I $(outdir) --no-split --no-headers --output $@ $<
 
 $(outdir)/%.texi: %.texi
        rm -f $@