From: Han-Wen Nienhuys Date: Thu, 10 May 2001 09:52:50 +0000 (+0200) Subject: release: 1.4.0 X-Git-Tag: release/1.4.0 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=741f8b531d5ffafc1cae3d2bd3f4faf64a118442;p=lilypond.git release: 1.4.0 ============ * RedHat .spec tweaks. * Bugfix: ly2dvi -o directory/ foo now works. 1.3.153.l --- diff --git a/CHANGES b/CHANGES index 34e8f6be1d..4bb2139b08 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +1.3.154.hwn1 +============ + +* RedHat .spec tweaks. + +* Bugfix: ly2dvi -o directory/ foo now works. + +1.3.153.lec1 +============ + +* abc2ly fixes: + - names in multi-voice music also don't have numbers in them. + - No longer using staff_margin_engraver + 1.3.154.jcn1 ============ @@ -27,7 +41,7 @@ dvips are stored in outdir. * PO updates. * petite-ouverture-a-danser.ly bugfix, twinkle.ly bugfix - +V 1.3.153 ======= diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 18d1639a02..e3a24669aa 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -35,8 +35,8 @@ site}. If you want to compile LilyPond from source, download here: @itemize @bullet @item Download development releases from -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/} by FTP and -@uref{http://ftp.cs.uu.nl/pub/GNU/LilyPond/development/}, by HTTP. +@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/} by FTP and +@uref{http://ftp.cs.uu.nl/pub/GNU/LilyPond/}, by HTTP. @item @uref{ftp://sca.uwaterloo.ca/pub/} by FTP (Canadian mirror) @item at @code{lilypond.org} @uref{ftp://ftp.lilypond.org/pub/LilyPond/} by FTP and diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi index ba1f8b870b..ba3de47ea6 100644 --- a/Documentation/topdocs/README.texi +++ b/Documentation/topdocs/README.texi @@ -15,27 +15,21 @@ the GNU Project. LilyPond uses a versioning scheme similar to the Linux kernel. In a version "x.y.z", an even second number 'y' denotes a stable version. -For development versions 'y' is odd. So, in theory, version 1.2 is stable, -which means that there are no glaring errors in it. In practice 1.2.x is also -unmaintained. +For development versions 'y' is odd. -1.3.x is in healthy development: lots of problems turn up, but they're -fixed quickly. Therefore we recommend you try 1.2.x, if you have any -problem with it, upgrade to the latest 1.3.x release. +Version 1.4 is the latest stable release. -@section Requirements -For the compilation and running of LilyPond you need some additional -packages. Please refer to the installation instructions in -@file{INSTALL.txt}. +@section Compilation + +For compiling and running LilyPond please refer to the installation +instructions. These instructions can be found when you unpack lilypond, +as @file{lilypond-x.y.z/INSTALL.txt}. + NOTE: If you downloaded a binary (.rpm or a W95/NT .zip file), you don't have to compile LilyPond. -@section Installation - -For your convenience, a formatted copy of the INSTALL instructions are -in the toplevel directory, as INSTALL.txt @section Documentation diff --git a/INSTALL.txt b/INSTALL.txt index 69302af91e..1129221854 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -53,8 +53,8 @@ source code If you want to compile LilyPond from source, download here: * Download development releases from - `ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/' by FTP and - `http://ftp.cs.uu.nl/pub/GNU/LilyPond/development/', by HTTP. + `ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/' by FTP and + `http://ftp.cs.uu.nl/pub/GNU/LilyPond/', by HTTP. * `ftp://sca.uwaterloo.ca/pub/' by FTP (Canadian mirror) diff --git a/NEWS b/NEWS index 8c743166b0..12c621b564 100644 --- a/NEWS +++ b/NEWS @@ -5,8 +5,6 @@ New features in 1.4 DESIGN -cocentric - * More pervasive GUILE integration resulting in improved design and implementation. LilyPond is smaller, cleaner, more flexible, etc. diff --git a/README.txt b/README.txt index c71e734e5f..23568d4d61 100644 --- a/README.txt +++ b/README.txt @@ -12,30 +12,20 @@ Versioning LilyPond uses a versioning scheme similar to the Linux kernel. In a version "x.y.z", an even second number 'y' denotes a stable version. -For development versions 'y' is odd. So, in theory, version 1.2 is -stable, which means that there are no glaring errors in it. In practice -1.2.x is also unmaintained. +For development versions 'y' is odd. - 1.3.x is in healthy development: lots of problems turn up, but -they're fixed quickly. Therefore we recommend you try 1.2.x, if you -have any problem with it, upgrade to the latest 1.3.x release. + Version 1.4 is the latest stable release. -Requirements -============ +Compilation +=========== - For the compilation and running of LilyPond you need some additional -packages. Please refer to the installation instructions in -`INSTALL.txt'. + For compiling and running LilyPond please refer to the installation +instructions. These instructions can be found when you unpack lilypond, +as `lilypond-x.y.z/INSTALL.txt'. NOTE: If you downloaded a binary (.rpm or a W95/NT .zip file), you don't have to compile LilyPond. -Installation -============ - - For your convenience, a formatted copy of the INSTALL instructions -are in the toplevel directory, as INSTALL.txt - Documentation ============= diff --git a/VERSION b/VERSION index 5f2294a9f9..9e7991ce73 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 -MINOR_VERSION=3 -PATCH_LEVEL=154 -MY_PATCH_LEVEL=jcn1 +MINOR_VERSION=4 +PATCH_LEVEL=0 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh index 2bd2c005bb..ec2dac64df 100755 --- a/buildscripts/lilypond-login.sh +++ b/buildscripts/lilypond-login.sh @@ -10,9 +10,11 @@ set datadir="@datadir@" setenv GS_FONTPATH "$datadir/afm:@datadir@/pfa:$GS_FONTPATH" setenv GS_LIB "$datadir/ps:$GS_LIB" -# bit silly. for ly2dvi, overrules compiled-in datadir... # setenv LILYPONDPREFIX "$datadir" +# bit silly. for ly2dvi, overrules compiled-in datadir... +# setenv LILYPONDPREFIX "@datadir@" + # include an empty path component for the system wide includes. if ($?MFINPUTS) then setenv MFINPUTS "$datadir/mf:${MFINPUTS}::" diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh index 576a30b9fe..880b6a5d2c 100755 --- a/buildscripts/lilypond-profile.sh +++ b/buildscripts/lilypond-profile.sh @@ -28,7 +28,10 @@ MFINPUTS="$datadir/mf:"${MFINPUTS:=":"} TEXINPUTS="$datadir/tex:$datadir/ps:"${TEXINPUTS:=":"} TFMFONTS="$datadir/tfm:"${TFMFONTS:=":"} -export MFINPUTS TEXINPUTS TFMFONTS GS_LIB GS_FONTPATH +# LILYPONDPREFIX="$datadir" +# export LILYPONDPREFIX + +export MFINPUTS TEXINPUTS TFMFONTS GS_LIB GS_FONTPATH diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index ec35a366e4..26caf0622e 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.154 -Entered-date: 09MAY01 +Version: 1.4.0 +Entered-date: 10MAY01 Description: @BLURB@ 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 lilypond-1.3.154.tar.gz + 1000k lilypond-1.4.0.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.154.tar.gz + 1000k lilypond-1.4.0.tar.gz Copying-policy: GPL End diff --git a/make/out/redhat.spec b/make/out/redhat.spec index 4024db266c..ed8481bb77 100644 --- a/make/out/redhat.spec +++ b/make/out/redhat.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.3.154 +Version: 1.4.0 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.154.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.0.tar.gz Summary: Create and print music notation URL: http://www.cs.uu.nl/~hanwen/lilypond BuildRoot: /tmp/lilypond-install @@ -38,14 +38,15 @@ The documentation of LilyPond, both in HTML and PostScript. # In fact, do not take out the spaces between % and { in the above comment, # because RPM will gladly do a substitution anyway. -./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared +./configure --disable-checking --prefix=%{_prefix} --enable-optimise make all -# ok, now make sure that lilypond package will succeed, -# even if documentation fails to build -make -C Documentation || true -make web || true +# make info +make -C Documentation + +# make html +make web-doc top-web %install @@ -57,14 +58,14 @@ strip lily/out/lilypond midi2ly/out/midi2ly make prefix="$RPM_BUILD_ROOT%{_prefix}" install %if info=="yes" -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* %endif mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d install -m 644 lilypond-mode.el lilypond-font-lock.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ install -m 644 lilypond-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh @@ -73,7 +74,7 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/li # again, make sure that main package installs even if doco fails mkdir -p web/out -tar -C web -xzf out/web.tar.gz || true +tar -C web -xzf out/web.tar.gz %post @@ -82,14 +83,14 @@ touch /tmp/.lilypond-install rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install %if info=="yes" -/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir %endif %preun %if info=="yes" if [ $1 = 0 ]; then - /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true + /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir fi %endif diff --git a/make/out/suse.spec b/make/out/suse.spec index 64f3f6c7fb..a0ece8b2e1 100644 --- a/make/out/suse.spec +++ b/make/out/suse.spec @@ -14,11 +14,11 @@ Distribution: SuSE Linux 7.0 (i386) Name: lilypond -Version: 1.3.154 +Version: 1.4.0 Release: 2 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.154.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.0.tar.gz # music notation software for.. ? Summary: A program for printing sheet music. URL: http://www.lilypond.org/ @@ -103,7 +103,7 @@ make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all # even if documentation fails to build make -C Documentation || true -make web || true +make web-doc top-web || true %install diff --git a/make/redhat.spec.in b/make/redhat.spec.in index 13408aa544..c096df8dae 100644 --- a/make/redhat.spec.in +++ b/make/redhat.spec.in @@ -38,14 +38,15 @@ The documentation of LilyPond, both in HTML and PostScript. # In fact, do not take out the spaces between % and { in the above comment, # because RPM will gladly do a substitution anyway. -./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared +./configure --disable-checking --prefix=%{_prefix} --enable-optimise make all -# ok, now make sure that lilypond package will succeed, -# even if documentation fails to build -make -C Documentation || true -make web || true +# make info +make -C Documentation + +# make html +make web-doc top-web %install @@ -57,14 +58,14 @@ strip lily/out/lilypond midi2ly/out/midi2ly make prefix="$RPM_BUILD_ROOT%{_prefix}" install %if info=="yes" -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* %endif mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d install -m 644 lilypond-mode.el lilypond-font-lock.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ install -m 644 lilypond-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh @@ -73,7 +74,7 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/li # again, make sure that main package installs even if doco fails mkdir -p web/out -tar -C web -xzf out/web.tar.gz || true +tar -C web -xzf out/web.tar.gz %post @@ -82,14 +83,14 @@ touch /tmp/.lilypond-install rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install %if info=="yes" -/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir %endif %preun %if info=="yes" if [ $1 = 0 ]; then - /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true + /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir fi %endif diff --git a/make/suse.spec.in b/make/suse.spec.in index fbd7e425ba..4c3253f95b 100644 --- a/make/suse.spec.in +++ b/make/suse.spec.in @@ -103,7 +103,7 @@ make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all # even if documentation fails to build make -C Documentation || true -make web || true +make web-doc top-web || true %install diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index ed92da172a..c76574eba3 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -174,9 +174,13 @@ def dump_slyrics (outf): ks = voice_idx_dict.keys() ks.sort () for k in ks: + if re.match('[1-9]', k): + m = alphabet[string.atoi(k)] + else: + m = k for i in range (len(slyrics[voice_idx_dict[k]])): l=alphabet[i] - outf.write ("\nwords%sV%s = \\lyrics {" % (k, l)) + outf.write ("\nwords%sV%s = \\lyrics {" % (m, l)) outf.write ("\n" + slyrics [voice_idx_dict[k]][i]) outf.write ("\n}") @@ -185,7 +189,11 @@ def dump_voices (outf): ks = voice_idx_dict.keys() ks.sort () for k in ks: - outf.write ("\nvoice%s = \\notes {" % k) + if re.match ('[1-9]', k): + m = alphabet[string.atoi(k)] + else: + m = k + outf.write ("\nvoice%s = \\notes {" % m) dump_default_bar(outf) if repeat_state[voice_idx_dict[k]]: outf.write("\n\\repeat volta 2 {") @@ -205,6 +213,10 @@ def dump_score (outf): ks = voice_idx_dict.keys (); ks.sort () for k in ks: + if re.match('[1-9]', k): + m = alphabet[string.atoi(k)] + else: + m = k if k == 'default' and len (voice_idx_dict) > 1: break if len ( slyrics [voice_idx_dict[k]] ): @@ -212,20 +224,24 @@ def dump_score (outf): outf.write ("\n\t\\context Staff=\"%s\"\n\t{\n" %k ) if k != 'default': outf.write ("\t \\voicedefault\n") - outf.write ("\t \\voice%s " % k) + outf.write ("\t \\voice%s " % m) outf.write ("\n\t}\n") if len ( slyrics [voice_idx_dict[k]] ): outf.write ("\n\t\\context Lyrics=\"%s\" \n\t<\t" % k) + if re.match('[1-9]',k): + m = alphabet[string.atoi(k)] + else: + m = k for i in range (len(slyrics[voice_idx_dict[k]])): l=alphabet[i] - outf.write("\n\t { \\words%sV%s }" % ( k, l) ) + outf.write("\n\t { \\words%sV%s }" % ( m, l) ) outf.write ( "\n\t>\n" ) outf.write ("\n >") outf.write ("\n\t\\paper {\n") if part_names: outf.write ("\t \\translator \n\t {\n") outf.write ("\t\t\\StaffContext\n") - outf.write ("\t\t\\consists Staff_margin_engraver\n") +# outf.write ("\t\t\\consists Staff_margin_engraver\n") outf.write ("\t }\n") outf.write ("\t}\n\t\\midi {}\n}\n") diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index b6d3ee6a26..5b5da01925 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -562,10 +562,12 @@ def compose_full_body (body, opts): optstring = re.sub ('\n', ' ', optstring) body = r""" %% Generated automatically by: lilypond-book.py -%% options are %s %%ughUGH not original options +%% options are %s \include "paper%d.ly" \paper { linewidth = %f \pt } """ % (optstring, music_size, l) + body + + # ughUGH not original options return body def parse_options_string(s): diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 9fbb072fef..26823c489f 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -135,7 +135,8 @@ if program_version == '@' + 'TOPLEVEL_VERSION' + '@': original_dir = os.getcwd () -temp_dir = '%s.dir' % program_name +temp_dir = os.path.join (original_dir, '%s.dir' % program_name) + keep_temp_dir_p = 0 verbose_p = 0 @@ -282,7 +283,7 @@ def setup_temp (): os.mkdir (temp_dir, 0777) except OSError: pass - + return temp_dir @@ -297,6 +298,8 @@ def system (cmd, ignore_error = 0): if ( os.name != 'posix' ): cmd = re.sub (r'''\\''', r'''\\\\\\''', cmd) cmd = "sh -c \'%s\'" % cmd + + if verbose_p: progress (_ ("Invoking `%s\'") % cmd) st = os.system (cmd) @@ -728,8 +731,15 @@ if files and files[0] != '-': files = map (lambda x: strip_extension (x, '.ly'), files) + (outdir, outbase) = ('','') if not output_name: - output_name = os.path.basename (files[0]) + outbase = os.path.basename (files[0]) + outdir = abspath('.') + elif output_name[-1] == os.sep: + outdir = abspath (output_name) + outbase = os.path.basename (files[0]) + else: + (outdir, outbase) = os.path.split (abspath (output_name)) for i in ('.dvi', '.latex', '.ly', '.ps', '.tex'): output_name = strip_extension (output_name, i) @@ -742,8 +752,6 @@ if files and files[0] != '-': dep_prefix = 0 reldir = os.path.dirname (output_name) - - (outdir, outbase) = os.path.split (abspath (output_name)) if outdir != '.' and (track_dependencies_p or targets.keys ()): mkdir_p (outdir, 0777) diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make index 9f62f66f81..caf13194e9 100644 --- a/stepmake/stepmake/package.make +++ b/stepmake/stepmake/package.make @@ -25,6 +25,13 @@ release: $(PYTHON) $(step-bindir)/release.py --outdir=$(topdir)/$(outdir) --package=$(topdir) # rpm: $(depth)/$(package-icon) dist -rpm: dist - su -c 'rpm -tb $(depth)/$(outdir)/$(distname).tar.gz' +rpm: + @echo The \"rpm\" target is deprecated. + @echo Please select the .spec appropriate for your distribution and run + @echo + @echo " rpm -bb SPEC-FILE" + @echo + @echo different SPEC-FILEs may be found in $(depth)/make/out/ + +# su -c 'rpm -tb $(depth)/$(outdir)/$(distname).tar.gz'