From 041d18866998b87ffceaf42812e53edc8a34b81f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 6 Apr 2002 19:31:20 +0200 Subject: [PATCH] patch::: 1.4.12.jcn2 lilypond_1_4 ============ * Documentation/windows/gs-profile.sh: * Documentation/windows/gsview-profile.sh: Remove. * lilypond-indent.el: New file, from HEAD. Fixes lilypond-mode. 1.4.12.uu1 ========== * Make Timing_engraver instantiatable, add to Score_performer. Fixes bar checks in MIDI 1.4.12.af1 ========== * Debian patches. --- .cvsignore | 15 +++++- CHANGES | 21 ++++++++ Documentation/bibliography/html-long.bst | 2 +- Documentation/topdocs/INSTALL.texi | 34 ++++++------ Documentation/windows/cygwin-installer.patch | 6 +-- Documentation/windows/gs-profile.sh | 22 -------- Documentation/windows/gsview-profile.sh | 19 ------- VERSION | 2 +- debian/changelog | 50 ++++++++++++++++-- debian/control | 12 ++--- debian/control.foka | 12 ++--- debian/control.potato | 4 +- debian/rules | 9 ++-- lily/timing-translator.cc | 2 + ly/performer.ly | 2 + ports/ports.make | 2 +- scripts/lilypond-book.py | 54 ++++++++++++-------- stepmake/GNUmakefile.in | 2 +- 18 files changed, 160 insertions(+), 110 deletions(-) diff --git a/.cvsignore b/.cvsignore index fd0c7ae134..773081c5e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,9 +10,22 @@ configure .gdbinit *~ #* -*.txt +*.aux +*.dvi +*.eps *.html +*.latex +*.log +*.ly +*.midi +*.pdf *.png +*.ps +*.tely +*.tex +*.txt +*[0-9]pk +ly2dvi.dir out out-www afm diff --git a/CHANGES b/CHANGES index d4e884ebe3..c48e091365 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +lilypond_1_4 +============ + +* Documentation/windows/gs-profile.sh: +* Documentation/windows/gsview-profile.sh: Remove. + +* lilypond-indent.el: New file, from HEAD. Fixes lilypond-mode. + +1.4.12.uu1 +========== + +* Make Timing_engraver instantiatable, add to Score_performer. Fixes bar checks +in MIDI + + +1.4.12.af1 +========== + +* Debian patches. + + 1.4.12.jcn1 =========== diff --git a/Documentation/bibliography/html-long.bst b/Documentation/bibliography/html-long.bst index 85a6163586..017451ab62 100644 --- a/Documentation/bibliography/html-long.bst +++ b/Documentation/bibliography/html-long.bst @@ -1,7 +1,7 @@ % BibTeX bibliography style `html-long' % spits out HTML-formatted bibliography in place of bbl output % by David Kotz dfk@cs.dartmouth.edu -% $Id: html-long.bst,v 1.1 1999/03/11 22:00:27 dfk Exp dfk $ +% $Id: html-long.bst,v 1.1.2.1 2001/12/29 22:51:44 fred Exp $ % modified from % BibTeX standard bibliography style `alpha' % version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index d422f4e414..a4fbda11e3 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -81,11 +81,11 @@ use @uref{ftp://ftp.xcf.berkeley.edu/pub/xdelta/, xdelta}. This is much safer than using patches, and is the recommended way. -The following command produces @file{lilypond-1.4.3.tar.gz} from -@file{lilypond-1.4.2.tar.gz} identical (up to compression dates) to the .3 +The following command produces @file{lilypond-1.4.11.tar.gz} from +@file{lilypond-1.4.10.tar.gz} identical (up to compression dates) to the .11 on the FTP site. @example - xdelta patch lilypond-1.4.2-1.4.3.xd lilypond-1.4.2.tar.gz + xdelta patch lilypond-1.4.10-1.4.11.xd lilypond-1.4.10.tar.gz @end example @end itemize @@ -99,8 +99,8 @@ You need the following packages to compile Lilypond. @item A reasonably new C++ compiler: EGCS 1.1, GCC 2.95.2 or newer. Check out @uref{ftp://ftp.gnu.org/gnu/gcc/, the gcc site}. -@item Python 1.5, -Check out @uref{http://www.python.org, the python website}. +@item Python 1.5 or 2.1 +Check out @uref{http://www.python.org/, the python website}. @item GUILE 1.3.4 or newer, check out @uref{http://www.gnu.org/software/guile/guile.html,the GUILE webpage}. @@ -115,7 +115,7 @@ make FTP directory}. Check out @uref{http://www.gnu.org/software/flex/,the Flex webpage}. @item Bison (version 1.25 or newer). -Check out @uref{http://www.gnu.org/software/bison/,the bison webpage} +Check out @uref{http://www.gnu.org/software/bison/,the bison webpage} @item @TeX{}. @@ -224,7 +224,7 @@ texinfo-4.0b} or @uref{ftp://alpha.gnu.org/gnu/texinfo-4.0b.tar.gz,texinfo-4.0b} @end itemize -@section Building LilyPond +@section Building LilyPond to install GNU LilyPond, type: @example @@ -340,10 +340,10 @@ A LinuxPPC RPM can be made using the @file{lilypond.redhat.spec} file. @subsection SuSE -Some SUSE RPMS should available from +Some SuSE RPMS should available from @uref{ftp://ftp.lilypond.org/pub/LilyPond/binaries/SuSE}. -You can also compile a RPM for SUSE yourself. A spec file is in +You can also compile a RPM for SuSE yourself. A spec file is in @file{make/out/lilypond.suse.spec}, see the instructions for building the Red Hat RPM. @@ -356,7 +356,7 @@ gs_serv gs_lib gs_fonts guile No precompiled packages for Slackware are available. Problems have been reported with Slackware 7.0; apparently, it ships -with a faulty compiler. Do not compile LilyPond with -O2 on this +with a faulty compiler. Do not compile LilyPond with -O2 on this platform. @subsection Mandrake @@ -418,12 +418,12 @@ make the .deb by doing, for example: $ su - root # dpkg --purge lilypond lilypond1.3 # exit - $ tar xzf lilypond-1.4.3.tar.gz - $ cd lilypond-1.4.3 - $ dch -p -v 1.4.3-0.local.1 "Local build." + $ tar xzf lilypond-1.4.11.tar.gz + $ cd lilypond-1.4.11 + $ dch -p -v 1.4.11-0.local.1 "Local build." $ debuild -B $ su - root - # dpkg -i ../lilypond_1.4.3*.deb + # dpkg -i ../lilypond_1.4.11*.deb # exit $ @end example @@ -445,7 +445,7 @@ in addition to the those needed for running: @item tetex-base, tetex-bin, tetex-extra, libkpathsea-dev or tetex-dev @item dpkg-dev, debhelper, fakeroot @item gs, netpbm -@item pnmtopng (only in Debian 2.2; pnmtopng has been merged with netpbm +@item pnmtopng (only in Debian 2.2: pnmtopng has been merged with netpbm in Debian testing/unstable.) @end itemize @@ -463,12 +463,12 @@ For Debian 2.2: netpbm pnmtopng m4 gettext @end example -For Debian in development ("unstable", the future 2.3 or 3.0): +For Debian in development ("unstable", the future Debian 3.0): @example apt-get install binutils cpp gcc libc6-dev \ g++ libstdc++2.10-dev \ - python-base libguile-dev tetex-bin libkpathsea-dev \ + python libguile-dev tetex-bin libkpathsea-dev \ tetex-extra flex bison texinfo bibtex2html groff gs \ netpbm m4 gettext @end example diff --git a/Documentation/windows/cygwin-installer.patch b/Documentation/windows/cygwin-installer.patch index e7c7be0b07..3fc369c7b1 100644 --- a/Documentation/windows/cygwin-installer.patch +++ b/Documentation/windows/cygwin-installer.patch @@ -23,9 +23,9 @@ diff -purN --exclude=*~ --exclude=zlib ../cinstall/ChangeLog ./ChangeLog @@ -3705,4 +3720,4 @@ Sat Apr 1 20:48:09 2000 Christopher Fa * zlib/Makefile.in: Regenerate from Makefile.am - %%% $Id: ChangeLog,v 2.194 2002/02/18 13:54:49 rbcollins Exp $ --$Revision: 2.194 $ -+$Revision: 2.194.jcn1 $ + %%% $Id: cygwin-installer.patch,v 1.3.2.3 2002/02/19 10:29:19 fred Exp $ +-$Revision: 1.3.2.3 $ ++$Revision: 1.3.2.3 $ Binary files ../cinstall/LilyPond.ico and ./LilyPond.ico differ diff -purN --exclude=*~ --exclude=zlib ../cinstall/Makefile.in ./Makefile.in --- ../cinstall/Makefile.in Mon Feb 18 14:56:38 2002 diff --git a/Documentation/windows/gs-profile.sh b/Documentation/windows/gs-profile.sh index 3e533b1f71..e69de29bb2 100644 --- a/Documentation/windows/gs-profile.sh +++ b/Documentation/windows/gs-profile.sh @@ -1,22 +0,0 @@ -#!@SHELL@ -# /etc/profile.d/gs-profile.sh -- Check for GhostScript - -gs550="/usr/windows/gstools/gs5.50" -gs650="/usr/windows/gs/gs6.50" - -# Maybe read registry, but that may be hairy? -# -# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\ -# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1" - -## we set GS_LIB although the registry keys have been set. - -if [ -e "$gs550/gswin32.exe" ]; then - PATH="$gs550:$PATH" - GS_LIB="$gs550/lib:"${GS_LIB:=""} -fi - -if [ -e "$gs650/bin/gswin32.exe" ]; then - PATH="$gs650/bin:$PATH" - GS_LIB="$gs650/lib:"${GS_LIB:=""} -fi diff --git a/Documentation/windows/gsview-profile.sh b/Documentation/windows/gsview-profile.sh index eb5aeaf8a6..e69de29bb2 100644 --- a/Documentation/windows/gsview-profile.sh +++ b/Documentation/windows/gsview-profile.sh @@ -1,19 +0,0 @@ -#!@SHELL@ -# /etc/profile.d/gsview-profile.sh Check for GhostView - -gsview26="/usr/windows/gstools/gsview" -gsview36="/usr/windows/Ghostgum/GSview" - -# Maybe read registry, but that may be hairy? -# -# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\ -# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1" - -if [ -e "$gsview26/gsview32.exe" ]; then - PATH="$gsview26:$PATH" -fi - -if [ -e "$gsview36/gsview32.exe" ]; then - PATH="$gsview36:$PATH" -fi - diff --git a/VERSION b/VERSION index e0bff46ad9..e9a8965cf7 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 PATCH_LEVEL=12 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/debian/changelog b/debian/changelog index 7329576d36..5b63b6103a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,48 @@ +lilypond (1.4.12-1) unstable; urgency=high + + * New upstream maintenance release. + * Several important fixes (including our bison-related patch added + to 1.4.10-1) are included since 1.4.11 this release. (Now, I + don't even need to increase teTeX's extra_mem_top, extra_mem_bot + or pool_size! :-) Please include in Woody. + * Fixed a typo in lilypond-doc package description: typestting -> + typesetting. Thanks, Matt Zimmerman! (Closes: Bug#125083) + + -- Anthony Fok Sun, 24 Feb 2002 02:06:15 +0800 + +lilypond (1.4.10-1) unstable; urgency=high + + * New upstream release. + * lilypond failed to build with bison >= 1.30 because bison's output file + has been renamed. Applied an upstream fix. (Closes: Bug#133692) + * lilypond's documentation also failed to build with the latest + tetex or texinfo package. Instead of increasing extra_mem_top and + extra_mem_bot, increasing pool_size does the trick. + + -- Anthony Fok Mon, 18 Feb 2002 11:41:31 +0800 + +lilypond (1.4.9-1) unstable; urgency=high + + * New upstream release. + * Oops, libc6-dev is known as libc6.1-dev and libc-dev on some + architectures. Fixed Build-Depends so that lilypond can be built + on all platforms. Thanks to Colin Watson for reporting the bug. + (Closes: Bug#120208) + + -- Anthony Fok Tue, 27 Nov 2001 23:28:11 +0800 + +lilypond (1.4.8-2) unstable; urgency=high + + * [debian/rules]: Use -s instead of -a so that lilypond would get built + on all architectures even when the dummy lilypond1.3 package isn't + built. Thanks to Ryan Murray for the report. (Closes: Bug#117622) + * Depends on python instead of python-base. The python scripts in + lilypond work with old and new Python versions. + * Build-Depends on "-z combreloc"-enabled binutils (>= 2.11.92.0.10-2) + and libc6-dev (>= 2.2.4-5) so that lily runs faster! :-) + + -- Anthony Fok Sun, 11 Nov 2001 10:45:10 +0800 + lilypond (1.4.8-1) unstable; urgency=high * New upstream release. (Closes: Bug#111132) @@ -810,8 +855,3 @@ lilypond (0.1.0-1) unstable; urgency=low * Initial Release. -- Anthony Fok Wed, 6 Aug 1997 04:40:57 -0600 - -Local variables: -mode: debian-changelog -add-log-mailing-address: "foka@debian.org" -End: diff --git a/debian/control b/debian/control index c856770ec1..e9ec2091a8 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ Source: lilypond -Build-Depends: debhelper (>= 3.0.5), python-base (>= 1.5.2-4), libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1) +Build-Depends: debhelper (>= 3.0.5), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python, libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1) Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.5.5 +Standards-Version: 3.5.6 Package: lilypond Architecture: any Replaces: lilypond1.3 Provides: lilypond1.3 -Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python-base (>= 1.5.2-4), guile +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python, guile Recommends: lilypond-doc, tetex-extra (>= 1.0-1) Conflicts: lilypond1.3 (<= 1.3.132-1), musixtex-fonts Description: A program for printing sheet music. @@ -28,14 +28,14 @@ Description: A program for printing sheet music. Package: lilypond-doc Section: doc Architecture: all -Suggests: lilypond (>= 1.4.8-1), postscript-viewer, www-browser +Suggests: lilypond (>= 1.4.11-1), postscript-viewer, www-browser Description: LilyPond Documentation in HTML, PS and DVI formats This package contains the HTML, PostScript and DVI documentation for the - LilyPond music typestting software. + LilyPond music typesetting software. Package: lilypond1.3 Architecture: arm i386 m68k powerpc sparc -Depends: lilypond (>= 1.4.8-1) +Depends: lilypond (>= 1.4.11-1) Description: Dummy package for transition to new stable lilypond. This dummy package provides a transition from the previous lilypond1.3 package back to a newer lilypond because the stable 1.4 series has arrived. diff --git a/debian/control.foka b/debian/control.foka index c856770ec1..e9ec2091a8 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -1,16 +1,16 @@ Source: lilypond -Build-Depends: debhelper (>= 3.0.5), python-base (>= 1.5.2-4), libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1) +Build-Depends: debhelper (>= 3.0.5), binutils (>= 2.11.92.0.10-2), libc6-dev (>= 2.2.4-6) | libc6.1-dev (>= 2.2.4-6) | libc0.2-dev (>= 2.2.4-6), python, libguile-dev (>= 1:1.4-9), tetex-bin, libkpathsea-dev, tetex-extra, flex (>= 2.5.4a-14), bison, texinfo (>= 4.0b-2), groff, m4, gettext (>= 0.10.36-1) Build-Depends-Indep: bibtex2html, gs | gs-aladdin, netpbm (>= 2:9.10-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.5.5 +Standards-Version: 3.5.6 Package: lilypond Architecture: any Replaces: lilypond1.3 Provides: lilypond1.3 -Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python-base (>= 1.5.2-4), guile +Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python, guile Recommends: lilypond-doc, tetex-extra (>= 1.0-1) Conflicts: lilypond1.3 (<= 1.3.132-1), musixtex-fonts Description: A program for printing sheet music. @@ -28,14 +28,14 @@ Description: A program for printing sheet music. Package: lilypond-doc Section: doc Architecture: all -Suggests: lilypond (>= 1.4.8-1), postscript-viewer, www-browser +Suggests: lilypond (>= 1.4.11-1), postscript-viewer, www-browser Description: LilyPond Documentation in HTML, PS and DVI formats This package contains the HTML, PostScript and DVI documentation for the - LilyPond music typestting software. + LilyPond music typesetting software. Package: lilypond1.3 Architecture: arm i386 m68k powerpc sparc -Depends: lilypond (>= 1.4.8-1) +Depends: lilypond (>= 1.4.11-1) Description: Dummy package for transition to new stable lilypond. This dummy package provides a transition from the previous lilypond1.3 package back to a newer lilypond because the stable 1.4 series has arrived. diff --git a/debian/control.potato b/debian/control.potato index c7bd20e761..7d58814faa 100644 --- a/debian/control.potato +++ b/debian/control.potato @@ -28,7 +28,7 @@ Description: A program for printing sheet music. Package: lilypond-doc Section: doc Architecture: all -Suggests: lilypond (>= 1.4.8-1), postscript-viewer, www-browser +Suggests: lilypond (>= 1.4.11-1), postscript-viewer, www-browser Description: LilyPond Documentation in HTML, PS and DVI formats This package contains the HTML, PostScript and DVI documentation for the - LilyPond music typestting software. + LilyPond music typesetting software. diff --git a/debian/rules b/debian/rules index d854c688eb..6c21b91e7e 100755 --- a/debian/rules +++ b/debian/rules @@ -17,8 +17,11 @@ d = usr/share/doc/$(package) # "main_memory = 263000" in /etc/texmf/texmf.cnf isn't large enough # for latex to process standchen.dvi.latex, so adding extra_mem_* ... -export extra_mem_top = 100000 -export extra_mem_bot = 100000 +# export extra_mem_top = 100000 +# export extra_mem_bot = 100000 +# But now, building lilypond.dvi requires increased pool_size (2002-02-18) +# export pool_size = 500000 +# But now, it seems that none of the above is needed in 1.4.11 (2002-02-24) export MODE = ljfour export BDPI = 600 export USER_CFLAGS = -DDEBIAN @@ -107,7 +110,7 @@ binary-indep: build-doc install dh_md5sums dh_builddeb -binary-arch: DH_OPTIONS=-a +binary-arch: DH_OPTIONS=-s binary-arch: build install dh_testdir dh_testroot diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 4b6758292f..f5b2bf64d3 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -152,3 +152,5 @@ Timing_translator::start_translation_timestep () daddy_trans_l_->set_property ("measurePosition", measposp.smobbed_copy ()); } + + diff --git a/ly/performer.ly b/ly/performer.ly index 8cfa8204bd..2cfe9ab27c 100644 --- a/ly/performer.ly +++ b/ly/performer.ly @@ -122,6 +122,8 @@ ScoreContext = \translator { \accepts ChoirStaff \accepts RhythmicStaff \accepts ChordNames + + \consists "Timing_translator" \consists "Swallow_performer" dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume diff --git a/ports/ports.make b/ports/ports.make index d02bca27bb..6e0b84c3c5 100644 --- a/ports/ports.make +++ b/ports/ports.make @@ -19,7 +19,7 @@ make-root?=$(wildcard /usr/local/share/lilypond/make) # make-root=/make ifeq ($(SUBDIRS),) -SUBDIRS = $(filter-out .,$(shell find . -maxdepth 1 -type d -not -name 'out*')) +SUBDIRS = $(filter-out .,$(shell find . -maxdepth 1 -type d -not -name 'out*' -and -not -name 'CVS')) endif ifneq ($(make-root),) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index e4fa395d2b..cf10c42f20 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -49,7 +49,7 @@ import operator program_version = '@TOPLEVEL_VERSION@' if program_version == '@' + 'TOPLEVEL_VERSION' + '@': - program_version = '1.4.9' + program_version = '1.5.18' # if set, LILYPONDPREFIX must take prevalence # if datadir is not set, we're doing a build and LILYPONDPREFIX @@ -98,7 +98,7 @@ include_path = [os.getcwd()] # g_ is for global (?) - +g_extra_opts = '' g_here_dir = os.getcwd () g_dep_prefix = '' g_outdir = '' @@ -106,6 +106,7 @@ g_force_lilypond_fontsize = 0 g_read_lys = 0 g_do_pictures = 1 g_num_cols = 1 + format = '' g_run_lilypond = 1 no_match = 'a\ba' @@ -368,6 +369,7 @@ option_definitions = [ ('EXT', 'f', 'format', 'set format. EXT is one of texi and latex.'), ('DIM', '', 'default-music-fontsize', 'default fontsize for music. DIM is assumed to be in points'), ('DIM', '', 'default-lilypond-fontsize', 'deprecated, use --default-music-fontsize'), + ('OPT', '', 'extra-options' , 'Pass OPT quoted to the lilypond command line'), ('DIM', '', 'force-music-fontsize', 'force fontsize for all inline lilypond. DIM is assumed be to in points'), ('DIM', '', 'force-lilypond-fontsize', 'deprecated, use --force-music-fontsize'), ('DIR', 'I', 'include', 'include path'), @@ -475,7 +477,9 @@ re_dict = { }, - # why do we have distinction between @mbinclude and @include? + # why do we have distinction between @mbinclude and @include? + + 'texi': { 'include': '(?m)^[^%\n]*?(?P@mbinclude[ \n\t]+(?P[^\t \n]*))', 'input': no_match, @@ -484,13 +488,9 @@ re_dict = { 'landscape': no_match, 'verbatim': r"""(?s)(?P@example\s.*?@end example\s)""", 'verb': r"""(?P@code{.*?})""", - 'lilypond-file': '(?m)^(?!@c)(?P@lilypondfile(\[(?P.*?)\])?{(?P[^}]+)})', - 'lilypond' : '(?m)^(?!@c)(?P@lilypond(\[(?P.*?)\])?{(?P.*?)})', -# pyton2.2b2 barfs on this - 'lilypond-block': r"""(?m)^(?!@c)(?P(?s)(?P@lilypond(\[(?P.*?)\])?\s(?P.*?)@end lilypond\s))""", - -# 1.5.2 barfs on this. -# 'lilypond-block': r"""(?m)^(?!@c)(?P@lilypond(\[(?P.*?)\])?\s(?P.*?)@end lilypond\s)""", + 'lilypond-file': '(?m)^(?P@lilypondfile(\[(?P[^]]*)\])?{(?P[^}]+)})', + 'lilypond' : '(?m)^(?P@lilypond(\[(?P[^]]*)\])?{(?P.*?)})', + 'lilypond-block': r"""(?ms)^(?P@lilypond(\[(?P[^]]*)\])?\s(?P.*?)@end lilypond)\s""", 'option-sep' : ',\s*', 'intertext': r',?\s*intertext=\".*?\"', 'multiline-comment': r"(?sm)^\s*(?!@c\s+)(?P@ignore\s.*?@end ignore)\s", @@ -504,7 +504,14 @@ for r in re_dict.keys (): olddict = re_dict[r] newdict = {} for k in olddict.keys (): - newdict[k] = re.compile (olddict[k]) + try: + newdict[k] = re.compile (olddict[k]) + except: + print 'invalid regexp: %s' % olddict[k] + + # we'd like to catch and reraise a more detailed error, but + # alas, the exceptions changed across the 1.5/2.1 boundary. + raise "Invalid re" re_dict[r] = newdict @@ -534,8 +541,10 @@ def bounding_box_dimensions(fname): str = fd.read () s = re.search('%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', str) if s: - return (int (s.group (3) - s.group (1) + 0.5), - int (s.group (4) - s.group (2) + 0.5)) + + gs = map (lambda x: string.atoi (x), s.groups ()) + return (int (gs[2] - gs[0] + 0.5), + int (gs[3] - gs[1] + 0.5)) else: return (0,0) @@ -977,20 +986,19 @@ def system (cmd): def get_bbox (filename): - f = open (filename) + system ('gs -sDEVICE=bbox -q -sOutputFile=- -dNOPAUSE %s -c quit > %s.bbox 2>&1 ' % (filename, filename)) + + box = open (filename + '.bbox').read() + m = re.match ('^%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', box) gr = [] - while 1: - l =f.readline () - m = re.match ('^%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)', l) - if m: - gr = map (string.atoi, m.groups ()) - break + if m: + gr = map (string.atoi, m.groups ()) return gr def make_pixmap (name): bbox = get_bbox (name + '.eps') - margin = 3 + margin = 0 fo = open (name + '.trans.eps' , 'w') fo.write ('%d %d translate\n' % (-bbox[0]+margin, -bbox[1]+margin)) fo.close () @@ -1046,7 +1054,7 @@ def compile_all_files (chunks): if g_outdir: lilyopts = lilyopts + '--dep-prefix=' + g_outdir + '/' texfiles = string.join (tex, ' ') - system ('lilypond --header=texidoc %s %s' % (lilyopts, texfiles)) + system ('lilypond --header=texidoc %s %s %s' % (lilyopts, g_extra_opts, texfiles)) # # Ugh, fixing up dependencies for .tex generation @@ -1329,6 +1337,8 @@ for opt in options: elif o == '--default-lilypond-fontsize': print "--default-lilypond-fontsize is deprecated, use --default-music-fontsize" default_music_fontsize = string.atoi (a) + elif o == '--extra-options': + g_extra_opts = a elif o == '--force-music-fontsize': g_force_lilypond_fontsize = string.atoi(a) elif o == '--force-lilypond-fontsize': diff --git a/stepmake/GNUmakefile.in b/stepmake/GNUmakefile.in index a50edb862e..60ea150fa5 100644 --- a/stepmake/GNUmakefile.in +++ b/stepmake/GNUmakefile.in @@ -19,7 +19,7 @@ endif # SCRIPTS = configure aclocal.m4 README_FILES = CHANGES README TODO -README_TXT_FILES = AUTHORS.txt INSTALL.txt +README_TXT_FILES = EXTRA_DIST_FILES = $(IN_FILES) VERSION $(README_FILES) $(SCRIPTS) INSTALL.texi NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) # -- 2.39.5