From: Jan Nieuwenhuizen Date: Tue, 14 Aug 2001 14:30:11 +0000 (+0200) Subject: patch::: 1.5.6.jcn1 X-Git-Tag: release/1.5.7~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1ab20317f9aaac1ffb949169c98e0cc948a8f715;p=lilypond.git patch::: 1.5.6.jcn1 1.5.6.jcn1 ========= * Include make/lilypond.mandrake.spec (unchecked!) and README.mandrake. * Comment out two non existing examples in regression test, add one missing from 1.5.5 distribution. * Revert silly grace-with-braces stuff in tutorial. * Add short crescendo bug to input/bugs. * Update and bit more verbose download instructions in INSTALL, fix some links on ftp.lilypond.org. 1.5.6 ===== --- diff --git a/CHANGES b/CHANGES index 70dd2d3d06..3a965fee61 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,21 @@ +1.5.6.jcn1 +========= + +* Include make/lilypond.mandrake.spec (unchecked!) and README.mandrake. + +* Comment out two non existing examples in regression test, add one +missing from 1.5.5 distribution. + +* Revert silly grace-with-braces stuff in tutorial. + +* Add short crescendo bug to input/bugs. + +* Update and bit more verbose download instructions in INSTALL, + fix some links on ftp.lilypond.org. + +1.5.6 +===== + 1.4.6.mb1 ========= diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index b91c7158a0..95d2347def 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -212,13 +212,9 @@ Grace note do weird things with timing. Fragile. @lilypondfile[printfilename]{spacing-loose.ly} -@lilypondfile[printfilename]{spacing-accidentals.ly} +@c not found @lilypondfile[printfilename]{spacing-accidentals.ly} -@lilypondfile[printfilename]{spacing-accidentals-staff.ly} - -@lilypondfile[printfilename]{spacing-accidentals.ly} - -@lilypondfile[printfilename]{spacing-accidentals-staff.ly} +@c not found @lilypondfile[printfilename]{spacing-accidentals-staff.ly} @lilypondfile[printfilename]{lyrics-bar.ly} diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 75aece1741..dee4bec5f1 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -28,8 +28,7 @@ servers}. Big enhancements go into the latest odd numbered version (1.3), whose webpages are on @uref{http://www.lilypond.org/,the lilypond site}. -@subsection source code - +@subsection Source code If you want to compile LilyPond from source, download here: @itemize @bullet @@ -44,25 +43,42 @@ If you want to compile LilyPond from source, download here: @uref{http://www.lilypond.org/ftp/} by HTTP. @end itemize +Of course, if your platform supports LilyPond, such as Debian GNU/Linux, +FreeBSD, OpenBSD or NetBSD, you're encouraged to use the native build +from source drill. + +For Red Hat Linux and SuSE Linux, @file{.spec} files are included in the +tarball; see instructions below. + @html @end html -@subsection Binaries +@subsection Precompiled binaries + +If you want to track bleeding edge development, try: + +@itemize @bullet +@item @uref{ftp://ftp.debian.org/debian/pool/main/l/lilypond/, Debian +GNU/Linux} usually has the latest binaries for the most useful stable +and development versions, while +@item @uref{http://rpmfind.net/linux/mandrake/cooker/contrib/RPMS/, +Mandrake Cooker} also provides fairly recent versions. +@end itemize + +Binaries are made available for other popular platforms, but as we need +to compile them ourselves, they are not updated for every version +released. -Binaries are available, but are not updated for every version released. @itemize @bullet @item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/RedHat/RPMS/, Red Hat i386} -@item @uref{ftp://ftp.lilypond.org/pub/LilyPond/binaries/linuxppc/, LinuxPPC} -@item @uref{ftp://ftp.debian.org/debian/pool/main/l/lilypond/, Debian GNU/Linux} +@item @uref{ftp://ftp.lilypond.org/pub/LilyPond/binaries/SuSE, SuSE} +@item @uref{ftp://ftp.lilypond.org/pub/LilyPond/binaries/linuxppc/, +LinuxPPC} @item -@c @uref{http://home.austin.rr.com/jbr/jeff/lilypond/, Windows Stable} -@c @item @uref{ftp://ftp.lilypond.org/pub/lilypond/gnu-windows, Windows -@c Testing} -@uref{http://www.lilypond.org/gnu-windows/, Windows Testing} - +@uref{http://www.lilypond.org/gnu-windows/, Windows} @end itemize @subsection Upgrading @@ -374,18 +390,34 @@ platform. @subsection Mandrake Some binaries are available at rpmfind.net. Refer to -@uref{ftp://ftp.rpmfind.net/linux/Mandrake-devel/cooker/contrib/RPMS/}. +@uref{http://rpmfind.net/linux/mandrake/cooker/contrib/RPMS/}. +You can also compile a RPM for Mandrake yourself. A spec file is in +@file{make/out/lilypond.mandrake.spec}, see the instructions for building +the Red Hat RPM. @subsection Debian GNU/Linux A Debian package is also available. You may install it easily by running @command{apt-get} as root: - @example + apt-get install lilypond lilypond-doc @end example +You can also compile the .deb for Debian yourself, do: +@example + + apt-get -b source lilypond +@end example + +If you're real impatient, you may even do: +@example + + cd lilypond-x.y.z # a previous version + uscan # download and build latest directly from upstream +@end example + Debian's @TeX{} installation is a bit short on memory, you may want to increase it like this: diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 6076e1a9ce..4ac0a5679f 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1830,7 +1830,7 @@ viola = \notes \relative c' \context Voice = viola { oboes = \notes \relative c'' \context Voice = oboe { \stemUp s4 g8. b,16 c8 r - \grace { } + \grace \times 2/3 { } < { \times 2/3 { a8 g c } \! c2 } @@ -1845,7 +1845,7 @@ oboes = \notes \relative c'' \context Voice = oboe { } > \stemBoth - \grace { } <)b8. d8.-\trill> | + \grace <)b8. d8.-\trill> | [ < )f8. a>] <)b,8 d> r [ ] r | [ < )e8. g>] } @@ -1990,13 +1990,11 @@ these notes are indeed processed by precisely one context with defined above. @separate @example -\grace @{ @} < d4 f> +\grace < d4 f> @end example @cindex @code{\grace} @cindex ornaments @cindex grace notes - -[FIXME] @code{\grace} introduces grace notes. It takes one argument, in this case a chord. @@ -2055,9 +2053,8 @@ We can't share stems with the other voice, so we have to create a new it from the other context. Stems go down in this voice. @separate @example -\grace @{ +\grace @end example -[FIXME] @cindex Grace context When a grace section is processed, a @code{Grace} context is created. This context acts like a miniature score of its own. It has @@ -2088,7 +2085,7 @@ This ends the two-part section. @separate @example \stemBoth -\grace @{ @} <)b8. d8.-\trill> | +\grace <)b8. d8.-\trill> | @end example @cindex trill @cindex stemBoth diff --git a/GNUmakefile.in b/GNUmakefile.in index 6240b6bcc9..e5db868e71 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -17,7 +17,7 @@ SUBDIRS = buildscripts scripts flower lily \ # SCRIPTS = configure aclocal.m4 -README_FILES = DEDICATION COPYING NEWS CHANGES ROADMAP +README_FILES = CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt IN_FILES := $(wildcard *.in) EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch mktexnam.patch lexer-gcc-3.0.patch diff --git a/README.mandrake b/README.mandrake new file mode 100644 index 0000000000..bf4d3cf233 --- /dev/null +++ b/README.mandrake @@ -0,0 +1,54 @@ +README.first +============ + +This file created for Linux-Mandrake distribution by Michael Brown + + +LilyPond is a music typesetter. It produces beautiful sheet music using a +high level description file as input. + +LilyPond is split into two packages. The package "lilypond" provides the +core package, containing the utilities for converting the music source +(.ly) files into printable output. The package "lilypond-extras" provides +the full documentation, example .ly files for various features and the +Mutopia project files (musical equivalent of the Gutenberg project - see +http://www.mutopiaproject.org for details). + +If you are new to lilypond, you will almost certainly want to install the +"lilypond-extras" package in addition to the "lilypond" package. + +You may also wish to investigate the "denemo" package, which provides a +graphical front end to lilypond. + + + +Quick Start Guide +================= + +To run lilypond: + +Create a lilypond source (.ly) file in a directory that you can write +to. (The easiest way to do this is to copy a .ly file from +/usr/share/doc/lilypond-1.4.2/Examples or one of the Mutopia files +from /usr/share/doc/lilypond-1.4.2/Mutopia - note that these folders +are part of the lilypond-extras package). + +Run "ly2dvi -P input_file.ly" (replacing input_file as appropriate). This +will create a file called input_file.ps, which you can then view using +Ghostscript ("gv input_file.ps"). + +For an easier way to use lilypond, try the graphical front-end denemo. + + + +Points to note +============== + +DO NOT use the "lilypond -f ps" option to generate a PostScript file. It +is included as an experimental feature, or for platforms that do not have +a working TeX setup (that's not Mandrake). +Use "ly2dvi -P" instead. + +[ Addendum: the "lilypond -f ps" option is now broken in this package, + due to the new, improved way of handling the via-LaTeX method. It won't + work. Use "ly2dvi -P" instead. ] diff --git a/ROADMAP b/ROADMAP index 3befc63473..d4ce13d7a5 100644 --- a/ROADMAP +++ b/ROADMAP @@ -10,12 +10,14 @@ LilyPond's source files. topdocs/ sources for the toplevel files (README.txt, INSTALL.txt, etc.) user/ User manuals buildscripts/ Scripts used during the build process - debian/ Files for building .deb packages. - flower/ A generic library. + debian/ Files for building .deb packages + flower/ A generic library include/ input/ Various input files test/ Test features: one file per feature bugs/ Show bugs + no-notation/ Examples or bugs that do not produce output + regression/ Various features for regression test tutorial/ Examples from the tutorial lily/ Source code for LilyPond include/ @@ -33,5 +35,6 @@ LilyPond's source files. ports/ ps/ postscript library files tex/ TeX library files + scm/ Scheme initialisation and subroutine files scripts/ User scripts stepmake/ Generic make subroutine files diff --git a/VERSION b/VERSION index 05d768bbe8..bf480a3bcb 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=6 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly new file mode 100644 index 0000000000..71ca4b43e3 --- /dev/null +++ b/input/regression/grace-nest.ly @@ -0,0 +1,12 @@ +\header { +texidoc = "grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." + +} +\score{ +\notes + +{ c''2 { \grace b'16 c''2 } \bar "|." } + \paper { +} + } + diff --git a/input/tutorial/sammartini.ly b/input/tutorial/sammartini.ly index 1975a1cadb..c8ff8a10f0 100644 --- a/input/tutorial/sammartini.ly +++ b/input/tutorial/sammartini.ly @@ -1,9 +1,9 @@ \include "paper16.ly" -stemdown = \property Voice.Stem \override #'direction = #-1 -stemup = \property Voice.Stem \override #'direction = #1 -stemboth = \property Voice.Stem \revert #'direction +stemDown = \property Voice.Stem \override #'direction = #-1 +stemUp = \property Voice.Stem \override #'direction = #1 +stemBoth = \property Voice.Stem \revert #'direction viola = \notes \relative c' \context Voice = viola { diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in new file mode 100644 index 0000000000..6765e199b9 --- /dev/null +++ b/make/lilypond.mandrake.spec.in @@ -0,0 +1,169 @@ +%define name lilypond +%define version @TOPLEVEL_VERSION@ +%define release 1mdk + +Name: %{name} +Summary: A program for printing sheet music. +Version: %{version} +Release: %{release} +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-%{version}.tar.gz +## Patch0: lilypond-GNUmakefile.in.patch.bz2 +License: GPL +Group: Publishing +URL: http://www.lilypond.org/ +BuildRoot: %{_tmppath}/%{name}-buildroot +BuildRequires: guile guile-devel +Requires: tetex + +%description +LilyPond is a music typesetter. It produces beautiful sheet music using a +high level description file as input. Lilypond is part of the GNU project. + +LilyPond is split into two packages. The package "lilypond" provides the +core package, containing the utilities for converting the music source +(.ly) files into printable output. The package "lilypond-extras" provides +the full documentation, example .ly files for various features and the +Mutopia project files (musical equivalent of the Gutenberg project - see +http://www.mutopiaproject.org for details). + +If you are new to lilypond, you will almost certainly want to install the +"lilypond-extras" package in addition to the "lilypond" package. + +You may also wish to investigate the "denemo" package, which provides a +graphical front end to lilypond. + +See the file README.first for more information. + + +%package extras +Summary: LilyPond documentation, examples and Mutopia files. +Group: Publishing +Requires: lilypond + +%description extras +The documentation of LilyPond, both in HTML and PostScript, along with +example input files and the files from the Mutopia project. + +%prep +%setup -a 1 +## % patch0 -b .orig + +%build +# DO NOT use % { configure } , it hardcodes all paths, runs libtool, +# so we can't do make prefix=/tmp/ install. +# -- not sure what this comment means; it's a relic from the PPC spec file -- mbrown@fensystems.co.uk +./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared +make +make local-web + +%install + +# Create installation root folders +rm -rf $RPM_BUILD_ROOT +RPM_DOC_ROOT=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +rm -rf $RPM_DOC_ROOT +mkdir -p $RPM_DOC_ROOT + +make prefix="$RPM_BUILD_ROOT%{_prefix}" install +%{find_lang} %{name} + +# Move info and man files into correct locations +mv $RPM_BUILD_ROOT/usr/info $RPM_BUILD_ROOT%{_infodir} +mv $RPM_BUILD_ROOT/usr/man $RPM_BUILD_ROOT%{_mandir} + +# Move TeX font files into system TeX tree locations +mkdir -p $RPM_BUILD_ROOT%{_datadir}/texmf/fonts/{afm,source,tfm} +mv $RPM_BUILD_ROOT%{_datadir}/lilypond/afm $RPM_BUILD_ROOT%{_datadir}/texmf/fonts/afm/lilypond +mv $RPM_BUILD_ROOT%{_datadir}/lilypond/mf $RPM_BUILD_ROOT%{_datadir}/texmf/fonts/source/lilypond +mv $RPM_BUILD_ROOT%{_datadir}/lilypond/tfm $RPM_BUILD_ROOT%{_datadir}/texmf/fonts/tfm/lilypond +mkdir -p $RPM_BUILD_ROOT%{_datadir}/texmf/tex +mv $RPM_BUILD_ROOT%{_datadir}/lilypond/tex $RPM_BUILD_ROOT%{_datadir}/texmf/tex/lilypond + +# Copy emacs mode files into %{_datadir}/lilypond/emacs +mkdir -p $RPM_BUILD_ROOT%{_datadir}/lilypond/emacs +cp *.el $RPM_BUILD_ROOT%{_datadir}/lilypond/emacs/ + +# Create documentation tree in %{_docdir} +mkdir -p $RPM_DOC_ROOT/HTML +tar -C $RPM_DOC_ROOT/HTML -xzf out/web.tar.gz +ln -s HTML/input $RPM_DOC_ROOT/Examples +ln -s HTML/input/test $RPM_DOC_ROOT/Tricks +ln -s HTML/mutopia $RPM_DOC_ROOT/Mutopia +mkdir -p $RPM_DOC_ROOT/Printable +ln -s ../HTML/Documentation/user/out-www/lilypond.ps.gz $RPM_DOC_ROOT/Printable/Manual.ps.gz +ln -s ../HTML/Documentation/user/out-www/glossary.ps.gz $RPM_DOC_ROOT/Printable/Glossary.ps.gz +cp AUTHORS.txt CHANGES COPYING DEDICATION FAQ.txt NEWS README.txt VERSION README.mandrake $RPM_DOC_ROOT/README.first + +%post +touch /tmp/.lilypond-install +rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install +/usr/bin/mktexlsr +%_install_info lilypond.info +%_install_info lilypond-internals.info + +%preun +%_remove_install_info lilypond.info +%_remove_install_info lilypond-internals.info + +%postun +/usr/bin/mktexlsr + + +%files -f %{name}.lang +%defattr(-,root,root,0755) +%{_bindir}/* +%{_datadir}/lilypond/ +%{_datadir}/texmf/fonts/afm/lilypond +%{_datadir}/texmf/fonts/source/lilypond +%{_datadir}/texmf/fonts/tfm/lilypond +%{_datadir}/texmf/tex/lilypond + +%doc %{_infodir}/* +%doc %{_mandir}/man1/* +%doc %{_docdir}/%{name}-%{version}/AUTHORS.txt +%doc %{_docdir}/%{name}-%{version}/CHANGES +%doc %{_docdir}/%{name}-%{version}/COPYING +%doc %{_docdir}/%{name}-%{version}/DEDICATION +%doc %{_docdir}/%{name}-%{version}/FAQ.txt +%doc %{_docdir}/%{name}-%{version}/NEWS +%doc %{_docdir}/%{name}-%{version}/README.txt +%doc %{_docdir}/%{name}-%{version}/VERSION +%doc %{_docdir}/%{name}-%{version}/README.first + +%files extras +%defattr(-,root,root,0755) +%doc %{_docdir}/%{name}-%{version}/HTML +%doc %{_docdir}/%{name}-%{version}/Mutopia +%doc %{_docdir}/%{name}-%{version}/Printable +%doc %{_docdir}/%{name}-%{version}/Tricks +%doc %{_docdir}/%{name}-%{version}/Examples + + +%changelog +* Fri Jun 01 2001 Lenny Cartier 1.4.2-1mdk +- updated by Michael Brown : + - Upgraded to 1.4.2 + - Changed URL + - Removed /etc/profile.d scripts: all TeX bits are now located properly + - Rearranged documentation + - Tidied spec file + - Updated README.first + +* Mon Feb 26 2001 Lenny Cartier 1.3.129-1mdk +- added in contribs by Michael Brown : + - Removed info files completely (couldn't get info reader to read them) + - TODO: Get this to work at some point (in the meantime, use documentation in lilypond-extras) + +* Sat Feb 17 2001 Michael Brown +- Moved TeX font folders into the system TeX tree (this ensures that the /var/lib/texmf font cache is used instead of current folder) +- Added mktexlsr to post-install and post-uninstall scripts +- Patched scripts in /etc/profile.d to reflect changes to font locations +- Added QuickStart guide and Points to note sections to README.first (well worth reading) +- Fixed install-info and uninstall-info sections to use Mandrake's RPM macros :-) + +* Tue Feb 13 2001 Michael Brown +- First Mandrake package +- spec file heavily adapted from PowerPC contribs. +- Note HTML documentation may contain duff links and may be incomplete. Lots of warnings appear when building HTML docs. +- PostScript documentation is duplicated (how do you get an rpm package to contain a symlink?) +- Created README.first file diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 6eeba3c36d..7f047cda27 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -7,7 +7,7 @@ License: GPL Group: Applications/Publishing Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz Summary: Create and print music notation -URL: http://www.cs.uu.nl/~hanwen/lilypond +URL: http://www.lilypond.org/ BuildRoot: /tmp/lilypond-install # add lots of Buildreq: flex, bison, tetex, tetex-devel, tetex-latex, texinfo # better prereqs: tetex-latex, python, (mpost?) etc.