Hi,
Included is a patch with a few fixes, too small to make do new release
i guess. I'll be off-line for about two weeks, i hope; Han-Wen will
should take over in a few day's time.
Have Fun,
Jan.
Generated by [EMAIL PROTECTED] using package-diff 0.62,
>From = lilypond-1.0.5, To = lilypond-1.0.5.jcn1
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-1.0.5.jcn1.diff
Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.
--state
1.0.5
1.0.5.jbr1
1.0.5.jcn1
++state
diff -urN ../lilypond-1.0.5/Documentation/GNUmakefile ./Documentation/GNUmakefile
--- ../lilypond-1.0.5/Documentation/GNUmakefile Tue Aug 25 23:28:09 1998
+++ ./Documentation/GNUmakefile Thu Aug 27 10:29:55 1998
@@ -6,8 +6,7 @@
SUBDIRS=man tex pictures topdocs ntweb
STEPMAKE_TEMPLATES=documentation
README_TOP_FILES=NEWS DEDICATION TODO ANNOUNCE-0.1
-INFO_FILES = $(outdir)/$(package).info $(wildcard $(outdir)/$(package).info-*)
-# OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo
+INFO_FILES = $(wildcard $(outdir)/$(package).info*)
EXTRA_DIST_FILES = gnu-music-history TODO
diff -urN ../lilypond-1.0.5/Documentation/TODO ./Documentation/TODO
--- ../lilypond-1.0.5/Documentation/TODO Sun Jul 26 14:33:30 1998
+++ ./Documentation/TODO Fri Aug 28 16:30:00 1998
@@ -1,10 +1,6 @@
# Documentation/TODO
- * write toplevel info file
-
- * yodl2texinfo: automatic nodes and menus?
+ * overview and index of features
* get rid of pod manpage layout legacy
-
-
diff -urN ../lilypond-1.0.5/Documentation/faq.yo ./Documentation/faq.yo
--- ../lilypond-1.0.5/Documentation/faq.yo Thu Aug 13 23:08:33 1998
+++ ./Documentation/faq.yo Fri Aug 28 17:19:37 1998
@@ -69,14 +69,31 @@
includefile(../stepmake/Documentation/layout.yo)
)
-~/usr/src/bin is in the PATH, and contains symlinks to the
-compiled executables.
+~/usr/src/bin is in the PATH, and contains symbolic links to the
+compiled executables.
question(Is there an emacs mode?)
Yes. It is included with the source archive as mudela-mode.el. If
you have an rpm it is in /usr/doc/lilypond-X/. You have to install it
yourself.
+
+question(How do i create the tfm files?)
+
+You don't. The tfm files should be generated automatically, by Metafont
+when you run TeX(). Check or upgrade your TeX() installation, or ask your
+local TeX() guru.
+
+sect(Documentation)
+
+question(Why is the documentation/website/etc. so lousy?)
+
+LilyPond development is moving quite fast, documentation will often
+lag a bit behind. We must always make the choice, write more doco or
+write more code (or answer emails :-)...
+
+If you think you can make a correction, or devised a solution that
+should be documented, please do so and send a patch.
sect(Language: mudela)
diff -urN ../lilypond-1.0.5/Documentation/ntweb/GNUmakefile
./Documentation/ntweb/GNUmakefile
--- ../lilypond-1.0.5/Documentation/ntweb/GNUmakefile Tue Aug 25 10:18:48 1998
+++ ./Documentation/ntweb/GNUmakefile Fri Aug 28 17:21:36 1998
@@ -13,7 +13,8 @@
$(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@ $<.out
rm -f $<.out
$(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) \
- --index=index.html --news=$(depth)/NEWS $@
+ --index=http://www.cs.ruu.nl/people/hanwen/lilypond/index.html \
+ --news=$(depth)/NEWS $@
local-WWW:
diff -urN ../lilypond-1.0.5/Documentation/ntweb/index.yo ./Documentation/ntweb/index.yo
--- ../lilypond-1.0.5/Documentation/ntweb/index.yo Wed Aug 26 08:41:32 1998
+++ ./Documentation/ntweb/index.yo Fri Aug 28 17:21:36 1998
@@ -49,18 +49,8 @@
subsect(Download) label(download)
-COMMENT(
- i'd really like the name to represent the fact that this is a
- binary distribution, but i don't want to break the webpage.
-
- something like
- it()lurl(lilypond-@TOPLEVEL_VERSION@.exe.zip), or
- it()lurl(lilypond-@[EMAIL PROTECTED])
- whatever...
-)
-
itemize(
- it()lurl(lilypond-@TOPLEVEL_VERSION@.zip)
+ it()lurl(lilypond-@TOPLEVEL_VERSION@.bin.zip)
)
link(Back to top)(contents)
diff -urN ../lilypond-1.0.5/Documentation/tex/tutorial.yo
./Documentation/tex/tutorial.yo
--- ../lilypond-1.0.5/Documentation/tex/tutorial.yo Tue Aug 25 14:22:33 1998
+++ ./Documentation/tex/tutorial.yo Fri Aug 28 16:24:38 1998
@@ -696,7 +696,7 @@
dit(code(\time) var(numerator)code(/)var(denominator))
- This command chages the current time signature. LilyPond uses the
+ This command changes the current time signature. LilyPond uses the
time signature to
calculate where to place the bars that start a measure. These bars
in turn are the places where a system can be broken into lines.
diff -urN ../lilypond-1.0.5/Documentation/topdocs/INSTALL.yo
./Documentation/topdocs/INSTALL.yo
--- ../lilypond-1.0.5/Documentation/topdocs/INSTALL.yo Fri Jul 31 00:04:07 1998
+++ ./Documentation/topdocs/INSTALL.yo Fri Aug 28 15:52:11 1998
@@ -28,7 +28,9 @@
NT/95/98 as well. See Section ref(w32).
it() GNU C++ version 2.7 or newer (2.8 and egcs are also fine).
-it() Python 1.5
+it() Python 1.5 (Strictly speaking, you shouldn't need Python for
+ compiling and installing, but you'll need it to regenerate the font
+ tables, e.g.).
)
sect(RUNNING)
diff -urN ../lilypond-1.0.5/NEWS ./NEWS
--- ../lilypond-1.0.5/NEWS Wed Aug 26 08:38:35 1998
+++ ./NEWS Fri Aug 28 17:45:54 1998
@@ -1,3 +1,12 @@
+pl 5.jcn1
+ - (step)make fixes from yodl
+ - minor doco fixes
+ - bf: patch in website after 'make release'
+
+pl 5.jbr1
+ - Documentation/ntweb/Makefile: Used absolute url for LilyPond Homepage
+ - Documentation/ntweb/index.yo: Minor mods per Jan's suggestions
+
pl 5
pl 4.jcn1
diff -urN ../lilypond-1.0.5/TODO ./TODO
--- ../lilypond-1.0.5/TODO Wed Aug 26 08:38:57 1998
+++ ./TODO Fri Aug 28 16:59:40 1998
@@ -13,6 +13,10 @@
* zip target for binary windows dist (JBR)
+ * repeat bars: need distance after ":|" and before "|:"
+
+ * doco should not depend on a4
+
* text continuationss
* fix plain tex footer line.
@@ -156,6 +160,7 @@
- plet -> tuplet
- measure -> bar
- abbreviation-beam -> (measured/unmeasured) tremolo
+ - partial -> anacrouse
* libtoolize flowerlib
diff -urN ../lilypond-1.0.5/VERSION ./VERSION
--- ../lilypond-1.0.5/VERSION Tue Aug 25 17:55:42 1998
+++ ./VERSION Fri Aug 28 17:21:36 1998
@@ -2,7 +2,7 @@
MAJOR_VERSION=1
MINOR_VERSION=0
PATCH_LEVEL=5
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
# use the above to send patches, always empty for released version:
# please don't move these comments up; the patch should fail if
diff -urN ../lilypond-1.0.5/aclocal.m4 ./aclocal.m4
--- ../lilypond-1.0.5/aclocal.m4 Tue Aug 25 17:29:11 1998
+++ ./aclocal.m4 Thu Aug 27 11:28:56 1998
@@ -237,18 +237,21 @@
AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python)
if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then
- LN=cp # hard link does not work under cygnus-nt (yet?)
+ LN=cp # hard link does not work under cygnus-nt
+ LN_S=cp # symbolic link does not work for native nt
ZIP="zip -r -9" #
DOTEXE=.exe
INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c"
else
LN=ln
+ LN_S='ln -s'
ZIP="zip -r -9"
INSTALL="\$(stepdir)/../bin/install-sh -c"
fi
AC_SUBST(DOTEXE)
AC_SUBST(ZIP)
AC_SUBST(LN)
+ AC_SUBST(LN_S)
AC_SUBST(INSTALL)
AC_STEPMAKE_DATADIR
diff -urN ../lilypond-1.0.5/config.make.in ./config.make.in
--- ../lilypond-1.0.5/config.make.in Tue Aug 25 10:43:38 1998
+++ ./config.make.in Thu Aug 27 11:29:12 1998
@@ -45,6 +45,7 @@
FIND = @FIND@
FLEX = @FLEX@
LN = @LN@
+LN_S = @LN_S@
MSGFMT = @MSGFMT@
PERL = @PERL@
PYTHON = @PYTHON@
diff -urN ../lilypond-1.0.5/lily/VERSION ./lily/VERSION
--- ../lilypond-1.0.5/lily/VERSION Tue Aug 25 17:55:54 1998
+++ ./lily/VERSION Fri Aug 28 17:21:36 1998
@@ -2,7 +2,7 @@
MAJOR_VERSION=1
MINOR_VERSION=0
PATCH_LEVEL=5
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jbr1
# use the above to send patches, always empty for released version:
# please don't move these comments up; the patch should fail if
diff -urN ../lilypond-1.0.5/make/STATE-VECTOR ./make/STATE-VECTOR
--- ../lilypond-1.0.5/make/STATE-VECTOR Tue Aug 25 17:55:46 1998
+++ ./make/STATE-VECTOR Fri Aug 28 17:45:17 1998
@@ -66,3 +66,5 @@
1.0.3
1.0.4.jcn1
1.0.5
+1.0.5.jbr1
+1.0.5.jcn1
diff -urN ../lilypond-1.0.5/stepmake/NEWS ./stepmake/NEWS
--- ../lilypond-1.0.5/stepmake/NEWS Tue Aug 25 10:39:32 1998
+++ ./stepmake/NEWS Thu Aug 27 10:29:01 1998
@@ -1,3 +1,8 @@
+pl 47
+ - bf: patch in website after 'make release'
+ - windows ln -> cp
+ - bf: texinfo build
+
pl 46
- bf: versioning typo: topleveL_MAJOR
- bf: reincluded optional STATE-VECTOR
diff -urN ../lilypond-1.0.5/stepmake/VERSION ./stepmake/VERSION
--- ../lilypond-1.0.5/stepmake/VERSION Mon Aug 24 22:38:32 1998
+++ ./stepmake/VERSION Thu Aug 27 10:19:33 1998
@@ -1,7 +1,7 @@
PACKAGE_NAME=StepMake
MAJOR_VERSION=0
MINOR_VERSION=1
-PATCH_LEVEL=46
+PATCH_LEVEL=47
MY_PATCH_LEVEL=
# use the above to send patches, always empty for released version:
diff -urN ../lilypond-1.0.5/stepmake/aclocal.m4 ./stepmake/aclocal.m4
--- ../lilypond-1.0.5/stepmake/aclocal.m4 Tue Aug 25 15:33:39 1998
+++ ./stepmake/aclocal.m4 Thu Aug 27 10:23:40 1998
@@ -237,18 +237,21 @@
AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python)
if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then
- LN=cp # hard link does not work under cygnus-nt (yet?)
+ LN=cp # hard link does not work under cygnus-nt
+ LN_S=cp # symbolic link does not work for native nt
ZIP="zip -r -9" #
DOTEXE=.exe
INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c"
else
LN=ln
+ LN_S='ln -s'
ZIP="zip -r -9"
INSTALL="\$(stepdir)/../bin/install-sh -c"
fi
AC_SUBST(DOTEXE)
AC_SUBST(ZIP)
AC_SUBST(LN)
+ AC_SUBST(LN_S)
AC_SUBST(INSTALL)
AC_STEPMAKE_DATADIR
diff -urN ../lilypond-1.0.5/stepmake/config.make.in ./stepmake/config.make.in
--- ../lilypond-1.0.5/stepmake/config.make.in Tue Aug 25 10:43:28 1998
+++ ./stepmake/config.make.in Thu Aug 27 10:17:44 1998
@@ -45,6 +45,7 @@
FIND = @FIND@
FLEX = @FLEX@
LN = @LN@
+LN_S = @LN_S@
MSGFMT = @MSGFMT@
PERL = @PERL@
PYTHON = @PYTHON@
diff -urN ../lilypond-1.0.5/stepmake/stepmake/documentation-targets.make
./stepmake/stepmake/documentation-targets.make
--- ../lilypond-1.0.5/stepmake/stepmake/documentation-targets.make Tue Aug 25
23:11:52 1998
+++ ./stepmake/stepmake/documentation-targets.make Thu Aug 27 10:02:20 1998
@@ -24,13 +24,13 @@
doc: do-doc
+$(outdir)/$(package).info: $(outdir)/topinfo.texinfo $(OUTTEXINFO_FILES)
+ $(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo
+
# what to do here?
ifneq ($(strip $(INFO_FILES)),)
INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth)
INSTALLATION_OUT_FILES="$(INFO_FILES)" -f $(stepdir)/install-outfiles.sub.make $@
-
-$(outdir)/$(package).info: $(outdir)/topinfo.texinfo $(OUTTEXINFO_FILES)
- $(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo
localinstall: # $(INFO_FILES)
-$(INSTALL) -d $(infodir)
diff -urN ../lilypond-1.0.5/stepmake/stepmake/yolily-toplevel-targets.make
./stepmake/stepmake/yolily-toplevel-targets.make
--- ../lilypond-1.0.5/stepmake/stepmake/yolily-toplevel-targets.make Mon Aug 24
22:18:52 1998
+++ ./stepmake/stepmake/yolily-toplevel-targets.make Thu Aug 27 10:28:08 1998
@@ -17,6 +17,7 @@
$(MAKE) CONFIGSUFFIX='www' -C Documentation WWW
rm -f `find . -name \*.html~ -print`
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
Jan Nieuwenhuizen <[EMAIL PROTECTED]> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien | http://www.xs4all.nl/~jantien/lilypond
