From 795401cdbafedfbf7875269b0d43df851ed34416 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 01:19:20 +0000 Subject: [PATCH] lilypond-1.4.2 --- Documentation/footer.html.in | 4 +- Documentation/header.html.in | 45 +++++++------- Documentation/regression-test.tely | 2 + Documentation/topdocs/AUTHORS.texi | 10 ++-- Documentation/topdocs/INSTALL.texi | 96 +++++++++++++++--------------- Documentation/topdocs/README.texi | 6 +- Documentation/topdocs/index.tely | 14 +++-- Documentation/user/GNUmakefile | 16 ++--- Documentation/user/macros.itexi | 39 +++++++++--- GNUmakefile.in | 15 ++++- buildscripts/mutopia-index.py | 31 +++++----- debian/GNUmakefile | 8 ++- debian/changelog | 10 ++++ debian/control | 19 ++++-- debian/control.foka | 39 ++++++++---- debian/copyright | 6 +- debian/lilypond-doc.README.Debian | 7 +++ debian/lilypond-doc.dirs | 1 + debian/lilypond-doc.doc-base | 11 ++++ debian/lilypond.dirs | 7 +++ debian/lilypond.doc-base | 11 ++++ debian/lilypond.links | 4 ++ debian/rules | 95 +++++++++++++++++------------ debian/watch | 2 +- input/regression/tuplet-nest.ly | 31 ++++++++++ input/test/octave-duplicate.ly | 58 ++++++++++++++++++ scm/grob-description.scm | 7 ++- scripts/lilypond-book.py | 2 +- stepmake/stepmake/package.make | 20 ++++--- 29 files changed, 418 insertions(+), 198 deletions(-) create mode 100644 debian/lilypond-doc.README.Debian create mode 100644 debian/lilypond-doc.dirs create mode 100644 debian/lilypond-doc.doc-base create mode 100644 debian/lilypond.dirs create mode 100644 debian/lilypond.doc-base create mode 100644 debian/lilypond.links create mode 100644 input/regression/tuplet-nest.ly create mode 100644 input/test/octave-duplicate.ly diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index 19ed96aed4..d71ff8d1ad 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -6,7 +6,7 @@ which substitutes some @AT_VARIABLES@ as well. !--> - + @@ -33,7 +33,7 @@ Copyright (c) 1997--2001 Han-Wen Nienhuys and Jan Nieuwenhuizen.

Verbatim copying and distribution of this entire article is -permitted in any medium, provided this notice is preserved.

+permitted in any medium, provided this notice is preserved.

diff --git a/Documentation/header.html.in b/Documentation/header.html.in index 2188e4e68b..0771ca05f4 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -4,27 +4,26 @@ If this file ./Documentation/header.html.in is present, it is included automatically by add-html-footer.py, which substitutes some @AT_VARIABLES@ as well. -!--> +--> - + +--> - + - + - + - + - +

- +	GNU LilyPond @@ -39,50 +38,48 @@ which substitutes some @AT_VARIABLES@ as well.
Documentation
+
General information For new users For users For developers Background information -
Download
-Source - Binary -
+ Source + Binary +
Music
+
Short examples Longer examples Mutopia Project Other URLs -
Mailing Lists
+
About the lists Discussion - Help + Help Bugs - Announcements + Announcements -
Sites
+
Website - WikiWiki + WikiWiki FTP site -

- - diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index 55db0ae143..54d58e9fe8 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -143,6 +143,7 @@ and documenting bugfixes. @lilypondfile[printfilename]{tuplet-staffline-collision.ly} +@lilypondfile[printfilename]{tuplet-nest.ly} @section Property details @@ -178,6 +179,7 @@ and documenting bugfixes. @lilypondfile[printfilename]{rest-collision.ly} @lilypondfile[printfilename]{collisions.ly} +@lilypondfile[printfilename]{collision-dots.ly} @lilypondfile[printfilename]{number-staff-lines.ly} diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index 85276d489a..269c1aeb01 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -26,13 +26,13 @@ list is alphabetically ordered. @item Laura Conrad (lconrad@@world.std.com) fixes to abc2ly @item @email{Jan.A.Fagertun@@energy.sintef.no, Jan Arne Fagertun}, - TeX titling and lytodvi.sh + @TeX{} titling and lytodvi.sh @item @email{foka@@debian.org, Anthony Fok}, - debian package: debian/* + Debian package: debian/* @item @email{jlhamm@@pacificnet.net, James Hammons}, - american chord names, gnu-windows testing + American chord names, gnu-windows testing @item @email{bjoern.jacke@@gmx.de, Bjoern Jacke} - german glossary stuff. + German glossary stuff. @item @email{nj104@@cus.cam.ac.uk, Neil Jerram}. parts of Documentation/Vocab* @item Donald Ervin Knuth, @uref{http://www-cs-staff.stanford.edu/~knuth/} @@ -63,7 +63,7 @@ list is alphabetically ordered. parts of Documentation/Vocab*, started internationalization stuff @c urg: @c,{} in @email{} barfs. @item @email{portnoy@@ai.mit.edu,Stephen Peters}, - pdfTeX support + pdf@TeX{} support @item @email{glenprideaux@@iname.com, Glen Prideaux}, minor bug fixes, lyric-phrasing. @item @email{Roy.Rankin@@alcatel.com.au, Roy R. Rankin}, diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 186ae7507b..b50c5a14bb 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -52,24 +52,19 @@ If you want to compile LilyPond from source, download here: 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/, RedHat 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 Stable} -@item -@uref{ftp://ftp.debian.org/debian/pool/main/l/lilypond1.3, -Debian GNU/Linux Unstable} +@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{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 Testing} @end itemize @subsection Upgrading -There are two options for upgrading sources. +There are two options for upgrading sources. @itemize @item if you have an unpacked source tree of a previous version, you @@ -83,11 +78,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.3.122.tar.gz} from -@file{lilypond-1.3.121} identical (up to compression dates) to the .122 +The following command produces @file{lilypond-1.4.1.tar.gz} from +@file{lilypond-1.4.0.tar.gz} identical (up to compression dates) to the .1 on the FTP site. @example - xdelta patch lilypond-1.3.121-1.3.122.xd lilypond-1.3.121.tar.gz + xdelta patch lilypond-1.4.0-1.4.1.xd lilypond-1.4.0.tar.gz @end example @end itemize @@ -123,7 +118,7 @@ Check out @uref{http://www.gnu.org/software/bison/,the bison webpage} @TeX{} is used as an output backend. -Also, @TeX{}'s libkpathsea is used to find the fonts (.mf, .afm, .tfm). +Also, @TeX{}'s libkpathsea is used to find the fonts (@file{.mf}, @file{.afm}, @file{.tfm}). Make sure you have tetex 1.0 or newer (1.0.6 is known to work). You may need to install a tetex-devel or tetex-dev package too. @@ -145,8 +140,8 @@ files. If you don't have MetaPost and don't want to use PostScript output, then edit @file{mf/GNUmakefile}, removing the line saying @code{PFA_FILES=}. -@item kpathsea, a library for searching (TeX) files. @code{kpathsea} is -usually included with your installation of TeX. You may need to install +@item kpathsea, a library for searching (@TeX{}) files. @code{kpathsea} is +usually included with your installation of @TeX{}. You may need to install a tetex-devel or tetex-dev package too. In the very unlikely case that kpathsea is not available for your @@ -167,13 +162,13 @@ GNU LilyPond does use a lot of resources. For operation you need the following software @itemize @bullet -@item TeX. -@item Xdvi and ghostscript +@item @TeX{}. +@item Xdvi and Ghostscript @item GUILE 1.3.4, or newer. Check out @uref{http://www.gnu.org/software/guile.html,the GUILE webpage} @end itemize -For running LilyPond successfully you have to help TeX and MetaFont find +For running LilyPond successfully you have to help @TeX{} and MetaFont find various files. The recommended way of doing so is adjusting the environment variables in the start-up scripts of your shell. Appropriate Csh and bourne sh scripts are left in @@ -301,7 +296,7 @@ Add this to your @file{~/.emacs} or @file{~/.emacs.el}: (add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock))) @end example -If you have the latest LilyPond-1.3.x Debian package, LilyPond-mode is +If you have the latest LilyPond-1.4.x Debian package, LilyPond-mode is automatically loaded, so you need not modify your @code{~/.emacs} file. @section Compiling for distributions @@ -333,8 +328,8 @@ libgr-progs. @b{Warning} -There appears to be a problem with the Xdvi shipped with RedHat -7.1. Symptoms: Xdvi responds very sluggishly or hangs while viewing +There appears to be a problem with the Xdvi shipped with Red Hat 7.1. +Symptoms: Xdvi responds very sluggishly or hangs while viewing lilypond output. The cause for this problem is unknown; you are advised to recompile Xdvi from source. @@ -352,7 +347,7 @@ Some SUSE RPMS should available from @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. You can also compile a RPM for SUSE yourself. A spec file is in -@file{make/out/suse.spec}, see the instructions for building the RedHat +@file{make/out/suse.spec}, see the instructions for building the Red Hat RPM. You must have the following packages: guile tcsh tetex te_latex te_kpath @@ -375,15 +370,15 @@ Some binaries are available at rpmfind.net. Refer to @subsection Debian GNU/Linux -A Debian package is also available. You may install it easily by using -apt-get as root: +A Debian package is also available. You may install it easily by running +@command{apt-get} as root: @example - apt-get install lilypond1.3 + apt-get install lilypond @end example -Debian's tex installation is a bit short on memory, you may want to +Debian's @TeX{} installation is a bit short on memory, you may want to increase it like this: @example --- /etc/texmf/texmf.cnf.dpkg Sun Jan 28 14:12:14 2001 @@ -398,22 +393,26 @@ increase it like this: +extra_mem_bot = 100000 % extra low memory for boxes, glue, breakpoints, etc. obj_tab_size.context = 256000 - @end example +You could also export @env{extra_mem_top} and @env{extra_mem_bot} as +environment variables if you do not want to or cannot modify +@file{/etc/texmf/texmf.cnf}. + Alternatively, visit @itemize @bullet @item @uref{http://packages.debian.org/lilypond,http://packages.debian.org/lilypond} -@item @uref{http://ftp.debian.org/debian/pool/main/l/lilypond1.3/,http://ftp.debian.org/debian/pool/main/l/lilypond1.3/} -for latest package uploaded to Debian unstable; @item @uref{http://people.debian.org/~foka/lilypond/,http://people.debian.org/~foka/lilypond/} -for latest semi-unofficial build of LilyPond 1.3.121 for Debian 2.2r2 (potato) users. -The official stable Debian 2.2r2 is stuck with the old LilyPond-1.3.24. +for latest semi-unofficial build of LilyPond 1.3.121 for Debian 2.2 (potato) users. +The official stable Debian 2.2 is stuck with the old LilyPond-1.3.24. +Since LilyPond-1.4 has been released, the older lilypond1.3 Debian +package is now obsolete. @end itemize -You may contact Anthony Fok @email{foka@@debian.org} for more information. +Please contact Anthony Fok @email{lilypond@@packages.debian.org} for more +information. The build scripts are in the subdirectory @file{debian/}; you can make the .deb by doing, for example: @@ -422,12 +421,12 @@ make the .deb by doing, for example: $ su - root # dpkg --purge lilypond lilypond1.3 # exit - $ tar xzf lilypond-1.3.122.tar.gz - $ cd lilypond-1.3.122 - $ dch -p -v 1.3.122-0.local.1 "Local build." + $ tar xzf lilypond-1.4.1.tar.gz + $ cd lilypond-1.4.1 + $ dch -p -v 1.4.1-0.local.1 "Local build." $ debuild $ su - root - # dpkg -i ../lilypond1.3_1.3.122*.deb + # dpkg -i ../lilypond_1.4.1*.deb # exit $ @end example @@ -436,22 +435,25 @@ For compilation on a Debian GNU/Linux system you need these packages, in addition to the those needed for running: @itemize @bullet -@item g++, cpp, libc6-dev, libstdc++-dev -@item libguile-dev +@item g++, cpp, libc6-dev, libstdc++<@var{your-libstdc++-version-here}>-dev +@item libguile<@var{your-libguile-version-here}>-dev @item make, m4, flex, bison @item gettext -@item groff, texinfo, bibtex2html (not in 2.2r2) +@item groff, texinfo +@item bibtex2html (not in Debian 2.2) @item tetex-base, tetex-bin, tetex-extra, libkpathsea-dev or tetex-dev @item dpkg-dev, debhelper, fakeroot -@item gs, netpbm, pnmtopng +@item gs, netpbm +@item pnmtopng (only in Debian 2.2; pnmtopng has been merged with netpbm + in Debian testing/unstable.) @end itemize -Most of these are listed on the Build-Depends line in the -debian/control file. To ensure the creation of the lilypond deb is +Most of these are listed on the @samp{Build-Depends} line in the +@file{debian/control} file. To ensure the creation of the lilypond deb is trouble-free, we recommend that you first install the following packages -before starting dpkg-buildpackage by running apt-get as root. +by running \@command{apt-get} as root before building the package: -For Debian 2.2 (or 2.2r2, 2.2r3): +For Debian 2.2: @example apt-get install task-debian-devel task-c++-dev \ @@ -466,7 +468,7 @@ For Debian in development ("unstable", the future 2.3 or 3.0): apt-get install task-debian-devel task-c++-dev \ python-base libguile9-dev tetex-bin libkpathsea-dev \ tetex-extra flex bison texinfo bibtex2html groff gs \ - netpbm pnmtopng m4 gettext + netpbm m4 gettext @end example And, just so that old fonts from previous versions of LilyPond won't @@ -481,7 +483,7 @@ interfere with your build, you may want to do this before the build too: @section Problems For help and questions use @email{help-gnu-music@@gnu.org} and -@email{gnu-music-discuss@@gnu.org}. Please consult the faq before +@email{gnu-music-discuss@@gnu.org}. Please consult the FAQ before mailing your problems. If you find bugs, please send bug reports to @email{bug-gnu-music@@gnu.org}. diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi index ba3de47ea6..a9160cdb0d 100644 --- a/Documentation/topdocs/README.texi +++ b/Documentation/topdocs/README.texi @@ -57,9 +57,9 @@ The printable documentation is left in @file{Documentation/user/out/}. @section Comments -LilyPond is a long way from finished and polished, so we please send -your criticism, comments, bugreports, patches, etc., to the mailing -list. and @emph{not} to us personally. +LilyPond is a long way from finished and polished, so please send your +criticism, comments, bugreports, patches, etc., to the mailing list, +@emph{not} to us personally. We have the following mailing lists: diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index 24aa57ecdc..a75fb37c1a 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -1,4 +1,4 @@ -i\input texinfo @c -*-texinfo-*- +\input texinfo @c -*-texinfo-*- @setfilename index.info @settitle LilyPond homepage @@ -20,21 +20,23 @@ can also print pop-songs. LilyPond input is @b{plain text}. So, you can use your favorite text editor to enter it, you can put it in mail or embed it in an article like this: +@quotation @lilypond[fragment,verbatim, relative 1] - \key c \minor r8 c16 b c8 g as c16 b c8 d | g,4 -@end lilypond +\key c \minor r8 c16 b c8 g as c16 b c8 d | g,4 +@end lilypond +@end quotation Or you can use it to print music from other programs, using one of the numerous input filters. LilyPond output looks @b{beautiful}. The font and the layout algorithms were inspired by engraved music, so you can expect that same clear and -elegant look from your LilyPond output. And if you don't like the -looks, you can tweak almost everything. +elegant look from your LilyPond output. And if anything is not to your +liking, you can tweak almost everything. LilyPond is @b{free software}. It is part of the @uref{http://www.gnu.org/,GNU Project}. It is licensed under GNU General Public License, so you can use, modify and redistribute the program with -almost no restrictions. LilyPond is part of the +almost no restrictions. @unnumberedsec Want to know more? diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 2e0cf50d2c..566c3b2c1c 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -53,41 +53,35 @@ info: $(INFO_FILES) # Generic rule using % twice not possible? # $(outdir)/%/%.html: $(outdir)/%.texi $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi + mkdir -p $(dir $@) $(MAKEINFO) --output=$@ --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 + mkdir -p $(dir $@) $(MAKEINFO) --output=$@ --html $< -cp -f $(outdir)/*.png $(outdir)/lilypond-internals -cp -f $(outdir)/lilypond-internals/index.html $@ $(deep-footify) $(shell find $(outdir)/$(*F)/*.html) - ifeq ($(SPLITTING_MAKEINFO),yes) DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html -local-WWW: rm-deep-symlinks - -rm-deep-symlinks: - cd $(outdir) && rm -f lilypond lilypond-internals; true - else -DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html - # Links referred to by Documentation index LILYPOND_LINKS=Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html local-WWW: deep-symlinks deep-symlinks: - cd $(outdir) && rm -f lilypond && ln -s . lilypond - cd $(outdir) && rm -f lilypond-internals && ln -s . lilypond-internals - cd $(outdir) && $(foreach i, $(LILYPOND_LINKS),\ + mkdir -p $(outdir)/lilypond + cd $(outdir)/lilypond && $(foreach i, $(LILYPOND_LINKS),\ rm -f $(i) && ln -s lilypond.html $(i) &&) true + endif diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index b817a23ab9..9343d80c3f 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -1,6 +1,6 @@ @ifnottex @macro reng {word} -@ref{ (lilypond-internals)\word\, \word\ }, +@ref{ (lilypond-internals)\word\, \word\ } @end macro @end ifnottex @@ -8,14 +8,13 @@ @iftex @macro reng {word} \word\ - @end macro @end iftex @ifnottex @macro rgrob {word} -@ref{ (lilypond-internals)\word\, \word\ }, +@ref{ (lilypond-internals)\word\, \word\ } @end macro @end ifnottex @@ -23,14 +22,13 @@ @iftex @macro rgrob {word} \word\ - @end macro @end iftex @ifnottex @macro rint {word} -@ref{ (lilypond-internals)\word\, \word\ }, +@ref{ (lilypond-internals)\word\, \word\ } @end macro @end ifnottex @@ -38,7 +36,34 @@ @iftex @macro rint {word} \word\ +@end macro +@end iftex +@ifnottex +@macro texisharp {word} +# +@end macro +@end ifnottex + +@iftex +@macro texisharp {word} +@tex +$\\sharp$ +@end tex +@end macro +@end iftex + +@ifnottex +@macro texiflat {word} +b +@end macro +@end ifnottex + +@iftex +@macro texiflat {word} +@tex +$\\flat$ +@end tex @end macro @end iftex @@ -80,14 +105,14 @@ @ifhtml @macro separate @html -

***
+

***
@end html @end macro @end ifhtml @c netscape 4.x doesn't handle html chars 4.0 :-( @c

♥
-@c

***
+@c

***
@ignore diff --git a/GNUmakefile.in b/GNUmakefile.in index 55c729588c..17208a76ca 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -78,9 +78,18 @@ local-web: fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web top-web: rm -f `find . -name \*.html~ -print` - find `find Documentation input mutopia *.png index.html -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > $(outdir)/weblist + find `find Documentation input mutopia *.png index.html -type d -name 'out-www'` \ + -not -name '*.dvi' -not -name '*ly' -not -name '*.tex' \ + -not -name '*.ps' -not -name '*.eps' -not -name '*pk' \ + -not -name '*.aux' -not -name '*.cp' -not -name '*.fn' \ + -not -name '*.vr' -not -name '*.yp' -not -name '*.ky' \ + -not -name '*.pg' -not -name '*.tmp' -not -name '*.toc' \ + -not -name '*.fns' -not -name '*.cps' -not -name '*.nexi' \ + -not -name '*.texi' -not -name '*.texidoc' \ + -not -name '*.log' -not -name 'out-www' -not -name '*.dep' \ + > $(outdir)/weblist ls *.png *.html >> $(outdir)/weblist - cat $(outdir)/weblist | tar -czf $(outdir)/web.tar.gz -T - + cat $(outdir)/weblist | GZIP=-9v tar -czf $(outdir)/web.tar.gz -T - #WWW: local-WWW @@ -94,7 +103,7 @@ WWW-clean: $(MAKE) -C mutopia WWW-clean top-WWW-clean: - rm -f $(TOP_HTMLS) + rm -f $(TOP_HTMLS) lily-[0-9]*.png $(SHELL) $(buildscript-dir)/clean-fonts.sh diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py index bfa093e466..794e59929e 100644 --- a/buildscripts/mutopia-index.py +++ b/buildscripts/mutopia-index.py @@ -52,21 +52,18 @@ def file_exist_b (fn): return 0 -headertext= r"""You're looking at a page with some LilyPond samples. +headertext= r""" +

You're looking at a page with some LilyPond samples. These files are also included in the distribution. The output is completely generated by LilyPond, without any touch up by humans. - -

- -The PostScript files were generated using TeX and dvips. The pictures +

The PostScript files were generated using TeX and dvips. The pictures are 90dpi anti-aliased snapshots of the printed output. The images are in PNG format, and should be viewable with any current browser. -

- -If you want a better impression of the appearance, do print out one of -the postscript files.""" +

If you want a better impression of the appearance, do print out one of +the postscript files. +""" # @@ -118,8 +115,8 @@ def gen_list(inputs, filename): list = open(filename, 'w') else: list = sys.stdout - list.write ('Rendered Examples\n') - list.write ('') + list.write ('Rendered Examples\n') + list.write ('\n') if inputs: list.write (headertext) @@ -144,16 +141,16 @@ def gen_list(inputs, filename): head = read_dict('title', os.path.basename (base)) composer = read_dict('composer', '') desc = read_dict('description', '') - list.write('

') - list.write('

example file: %s

' % head); + list.write('

\n') + list.write('

example file: %s

\n' % head); if composer <> '': list.write('

%s

\n' % composer) if desc <> '': list.write('%s

' % desc) - list.write ('

%s' % (filename, desc)) + l.write ('
%s' % (filename, desc)) size=os.stat(filename)[stat.ST_SIZE] l.write (' (%s %dk)' % (type, (size + 512) / 1024)) pictures = ['jpeg', 'png', 'xpm'] @@ -167,9 +164,9 @@ def gen_list(inputs, filename): list_item(f, 'See a picture of page %d' % pageno, 'png') list_item(base + '.ps.gz', 'Print ', 'gzipped PostScript') list_item(base + '.midi', 'Listen', 'MIDI') - list.write ("

\n"); - list.write( ""); + list.write('\n'); list.close() import getopt diff --git a/debian/GNUmakefile b/debian/GNUmakefile index 48136e47d2..205ae80403 100644 --- a/debian/GNUmakefile +++ b/debian/GNUmakefile @@ -6,10 +6,12 @@ NAME = debian at-dir = $(outdir)/ at-ext = -CONF_FILES = changelog control copyright doc-base emacsen-startup \ +CONF_FILES = changelog control copyright emacsen-startup \ preinst postinst postrm prerm rules watch -EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) \ - control.foka control.potato +EXTRA_DIST_FILES = README.Debian $(CONF_FILES) \ + control.foka control.potato \ + lilypond.dirs lilypond.doc-base lilypond.links \ + lilypond-doc.dirs lilypond-doc.doc-base lilypond-doc.README.Debian #OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES) OUTCONF_FILES = $(OUTIN_FILES) OUT_DIST_FILES = $(OUTIN_FILES) diff --git a/debian/changelog b/debian/changelog index 29c617fd43..fd0a0cb6f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +lilypond (1.4.1-1) unstable; urgency=low + + * New upstream release. (Closes: Bug#97598) + * export extra_mem_top=100000 and extra_mem_bot=100000, otherwise + latex runs out of memory when processing standchen.dvi.latex. + * Split the documentation into the "lilypond-doc" package, which + provides the LilyPond website in /usr/share/doc/lilypond/html. + + -- Anthony Fok Wed, 16 May 2001 16:03:40 -0600 + lilypond (1.3.150-1) unstable; urgency=low * New upstream version. diff --git a/debian/control b/debian/control index 6b573472c9..3d1ba98510 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +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, bison, texinfo (>= 4.0-1), bibtex2html, groff, gs, netpbm (>= 2:9.10-1), m4, gettext (>= 0.10.36-1) -Build-Conflicts: lilypond, lilypond1.3 +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, bison, texinfo (>= 4.0-1), bibtex2html, groff, gs | gs-aladdin, netpbm (>= 2:9.10-1), m4, gettext (>= 0.10.36-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.5.2 +Standards-Version: 3.5.4 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 -Recommends: tetex-extra (>= 1.0-1) +Recommends: lilypond-doc, tetex-extra (>= 1.0-1) Conflicts: lilypond, lilypond1.3 (<= 1.3.132-1), musixtex-fonts Description: A program for printing sheet music. LilyPond is a music typesetter. It produces beautiful sheet music @@ -25,13 +24,21 @@ Description: A program for printing sheet music. Authors: Han-Wen Nienhuys Jan Nieuwenhuizen +Package: lilypond-doc +Section: doc +Architecture: all +Recommends: lilypond (= ${Source-Version}) +Suggests: 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. + Package: lilypond1.3 Architecture: all Depends: lilypond (>= 1.3.150-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 1.3.x series will become - 1.4 really soon now. + package back to a newer lilypond because the stable 1.4 series has arrived. . Please feel free to remove this dummy package after you have upgraded to the latest lilypond. diff --git a/debian/control.foka b/debian/control.foka index 182166b1f1..1388612c34 100644 --- a/debian/control.foka +++ b/debian/control.foka @@ -1,25 +1,21 @@ -Source: lilypond1.3 -Build-Depends: debhelper (>= 2.0.72), python-base (>= 1.5.2-4), libguile9-dev, tetex-bin, libkpathsea-dev, tetex-extra, flex, bison, texinfo (>= 4.0-1), bibtex2html, groff, gs, netpbm, pnmtopng, m4, gettext (>= 0.10.35-13) +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, bison, texinfo (>= 4.0-1), bibtex2html, groff, gs | gs-aladdin, netpbm (>= 2:9.10-1), m4, gettext (>= 0.10.36-1) Section: tex Priority: optional Maintainer: Anthony Fok -Standards-Version: 3.2.1 +Standards-Version: 3.5.4 -Package: lilypond1.3 +Package: lilypond Architecture: any -Replaces: lilypond -Provides: lilypond +Replaces: lilypond1.3 +Provides: lilypond1.3 Depends: ${shlibs:Depends}, tetex-bin (>= 1.0.5-1), python-base (>= 1.5.2-4), guile -Recommends: tetex-extra (>= 1.0-1) -Conflicts: lilypond, musixtex-fonts +Recommends: lilypond-doc, tetex-extra (>= 1.0-1) +Conflicts: lilypond, lilypond1.3 (<= 1.3.132-1), musixtex-fonts Description: A program for printing sheet music. 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. - . - This is the developmental 1.3 branch of LilyPond. It is not intended for - use with stable projects, although 1.3.x is most likely to be less buggy - and much more featureful than then the old "stable" 1.2.17. . URLs: http://www.cs.uu.nl/~hanwen/lilypond/ http://www.xs4all.nl/~jantien/lilypond/ @@ -27,3 +23,22 @@ Description: A program for printing sheet music. http://www.lilypond.org/ Authors: Han-Wen Nienhuys Jan Nieuwenhuizen + +Package: lilypond-doc +Section: doc +Architecture: all +Recommends: lilypond (= ${Source-Version}) +Suggests: postscript-viewer, www-browser +Description: LilyPond Documentation in HTML and PS formats + This package contains the HTML and PostScript documentation for the + LilyPond music typestting software. + +Package: lilypond1.3 +Architecture: all +Depends: lilypond (>= 1.3.150-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. + . + Please feel free to remove this dummy package after you have upgraded + to the latest lilypond. diff --git a/debian/copyright b/debian/copyright index 9e89926f1e..d86145ba93 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,10 +7,10 @@ but was merged back into the lilypond package as of Mon, 16 Apr 2001 21:58:42 -0600 It was downloaded from - ftp://ftp.lilypond.org/pub/LilyPond/v1.3/ + ftp://ftp.lilypond.org/pub/LilyPond/v1.4/ It is also available at: - ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.3/ + ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.4/ For more information about GNU LilyPond, please visit: http://www.cs.uu.nl/~hanwen/lilypond/ @@ -24,7 +24,7 @@ Authors: Copyright: - GNU LilyPond is Copyright (C) 1996-2000 + GNU LilyPond is Copyright (C) 1996-2001 Jan Nieuwenhuizen & Han-Wen Nienhuys This program is free software; you can redistribute it and/or modify diff --git a/debian/lilypond-doc.README.Debian b/debian/lilypond-doc.README.Debian new file mode 100644 index 0000000000..cfa4cb54ac --- /dev/null +++ b/debian/lilypond-doc.README.Debian @@ -0,0 +1,7 @@ +lilypond-doc for Debian +----------------------- + +The HTML, PostScript and DVI documentation files are installed under +`/usr/share/doc/lilypond', not `/usr/share/doc/lilypond-doc'. + +Anthony Fok , Wed, 16 May 2001 01:37:00 -0600 diff --git a/debian/lilypond-doc.dirs b/debian/lilypond-doc.dirs new file mode 100644 index 0000000000..d3ff8f268a --- /dev/null +++ b/debian/lilypond-doc.dirs @@ -0,0 +1 @@ +usr/share/doc/lilypond/html diff --git a/debian/lilypond-doc.doc-base b/debian/lilypond-doc.doc-base new file mode 100644 index 0000000000..11faa0f076 --- /dev/null +++ b/debian/lilypond-doc.doc-base @@ -0,0 +1,11 @@ +Document: lilypond-doc +Title: GNU LilyPond, the music typesetter +Author: Various +Abstract: This documentation describes LilyPond (the GNU Project music + typesetter), its language Mudela, and the Mutopia project, a.k.a. + "Music To the People." +Section: Apps/Music + +Format: HTML +Index: /usr/share/doc/lilypond/html/index.html +Files: /usr/share/doc/lilypond/html/*.html /usr/share/doc/lilypond/html/Documentation/out-www/*.html /usr/share/doc/lilypond/html/Documentation/*/out-www/*.html diff --git a/debian/lilypond.dirs b/debian/lilypond.dirs new file mode 100644 index 0000000000..188c688e7c --- /dev/null +++ b/debian/lilypond.dirs @@ -0,0 +1,7 @@ +usr/share/doc/lilypond/examples +usr/share/doc/texmf +usr/share/emacs/site-lisp +usr/share/texmf/tex +usr/share/texmf/fonts/source/public +usr/share/texmf/fonts/afm/public +usr/share/texmf/fonts/tfm/public diff --git a/debian/lilypond.doc-base b/debian/lilypond.doc-base new file mode 100644 index 0000000000..cb521ca139 --- /dev/null +++ b/debian/lilypond.doc-base @@ -0,0 +1,11 @@ +Document: lilypond +Title: GNU LilyPond, the music typesetter +Author: Various +Abstract: This documentation describes LilyPond (the GNU Project music + typesetter), its language Mudela, and the Mutopia project, a.k.a. + "Music To the People." +Section: Apps/Music + +Format: info +Index: /usr/share/info/lilypond.info.gz +Files: /usr/share/info/lilypond.info* /usr/share/info/lilypond-internals.info* diff --git a/debian/lilypond.links b/debian/lilypond.links new file mode 100644 index 0000000000..edd69e82b6 --- /dev/null +++ b/debian/lilypond.links @@ -0,0 +1,4 @@ +usr/share/lilypond/tex usr/share/texmf/tex/lilypond +usr/share/lilypond/mf usr/share/texmf/fonts/source/public/lilypond +usr/share/lilypond/afm usr/share/texmf/fonts/afm/public/lilypond +usr/share/lilypond/tfm usr/share/texmf/fonts/tfm/public/lilypond diff --git a/debian/rules b/debian/rules index d36c89e953..7538d7bc3f 100644 --- a/debian/rules +++ b/debian/rules @@ -12,14 +12,20 @@ package = lilypond SHELL = /bin/sh r = debian/$(package) -TMP = $(PWD)/$(r) +r_doc = debian/$(package)-doc d = usr/share/doc/$(package) -TELY_FILES := $(notdir $(wildcard Documentation/user/*.tely)) -DVI_FILES = $(addprefix Documentation/user/out/, $(TELY_FILES:.tely=.dvi)) -PS_FILES = $(DVI_FILES:.dvi=.ps) +# TELY_FILES := $(notdir $(wildcard Documentation/user/*.tely)) +# DVI_FILES = $(addprefix Documentation/user/out/, $(TELY_FILES:.tely=.dvi)) +# PS_FILES = $(DVI_FILES:.dvi=.ps) + +# "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 MODE=ljfour export BDPI=600 +export MAILADDRESS=lilypond@packages.debian.org # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -35,48 +41,44 @@ build-stamp: dh_testdir ./configure --enable-checking --disable-debugging \ - --enable-printing --prefix=/usr --enable-optimise \ - --enable-shared \ + --prefix=/usr --enable-optimise \ --infodir='$${prefix}/share/info' \ --mandir='$${prefix}/share/man' $(MAKE) USER_CFLAGS=-DDEBIAN all - $(MAKE) -C Documentation/user dvi ps - $(MAKE) -C Documentation/pictures pngs touch build-stamp +build-doc: build build-doc-stamp +build-doc-stamp: + dh_testdir + + $(MAKE) -C Documentation + $(MAKE) web + + touch build-doc-stamp + clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp build-doc-stamp + -$(MAKE) WWW-clean top-WWW-clean -$(MAKE) distclean - dh_clean - # Correct the owner of the out/dummy.dep files when built with sudo. - if [ -n "$$SUDO_USER" -a -n "$$SUDO_GID" ]; then \ - find . -user root | xargs -r chown --dereference $$SUDO_USER.$$SUDO_GID; \ - fi + # Still not clean enough? Let's use... BRUTE STRENGTH! :-) + find . -type d -name 'out' -o -name 'out-www' | xargs rm -rf + rm -f debian/doc-base debian/TODO + + dh_clean install: DH_OPTIONS= install: build dh_testdir dh_testroot dh_clean -k - dh_installdirs usr/share/doc/texmf \ - $(d)/examples \ - usr/share/emacs/site-lisp \ - usr/share/texmf/tex \ - usr/share/texmf/fonts/source/public \ - usr/share/texmf/fonts/afm/public \ - usr/share/texmf/fonts/tfm/public - ln -fs ../$(package) $(r)/usr/share/doc/texmf/lilypond - - $(MAKE) prefix=$(TMP)/usr USER_CFLAGS=-DDEBIAN install - - ln -s ../../lilypond/tex $(r)/usr/share/texmf/tex/lilypond - ln -s ../../../../lilypond/mf $(r)/usr/share/texmf/fonts/source/public/lilypond - ln -s ../../../../lilypond/afm $(r)/usr/share/texmf/fonts/afm/public/lilypond - ln -s ../../../../lilypond/tfm $(r)/usr/share/texmf/fonts/tfm/public/lilypond + + # Add here commands to install the package into debian/tmp. + dh_installdirs + $(MAKE) prefix=$(PWD)/$(r)/usr USER_CFLAGS=-DDEBIAN install # Change from an absolute symlink to a relative symlink (Lintian) if [ -L $(r)/usr/share/lilypond/cmtfm ]; then \ @@ -86,9 +88,18 @@ install: build # Build architecture-independent files here. binary-indep: DH_OPTIONS=-i -binary-indep: build install +binary-indep: build-doc install dh_testdir dh_testroot + # Extract LilyPond website tarball ... + tar -C $(r_doc)/$(d)/html -xvzf out/web.tar.gz + # Add symlinks to the PostScript docs and LilyPond logo PNGs ... + cd $(r_doc)/$(d) \ + && cp -s `find html/Documentation -name '*.ps.gz'` . \ + && cp -s html/Documentation/pictures/out-www/*.png . + # Copy the DVI docs too ... + cp -a `find Documentation -name '*.dvi' ! -name 'lily-[0-9]*.dvi'` \ + $(r_doc)/$(d)/ dh_installdocs dh_installchangelogs dh_link @@ -105,13 +116,16 @@ binary-arch: build install dh_testroot cp -av lilypond-mode.el lilypond-font-lock.el \ $(r)/usr/share/emacs/site-lisp/ - dh_installdocs DEDICATION NEWS ROADMAP *.txt \ - Documentation/pictures/out/*.png \ - Documentation/out/*.txt \ - $(DVI_FILES) $(PS_FILES) - mkdir $(r)/$(d)/bibliography $(r)/$(d)/misc - cp -a Documentation/bibliography/*.bib $(r)/$(d)/bibliography/ - cp -a Documentation/misc/[ACN]* $(r)/$(d)/misc/ + dh_installdocs DEDICATION NEWS ROADMAP *.txt + +# dh_installdocs DEDICATION NEWS ROADMAP *.txt \ +# Documentation/pictures/out/*.png +# Documentation/out/*.txt +# $(DVI_FILES) $(PS_FILES) +# mkdir $(r)/$(d)/bibliography $(r)/$(d)/misc +# cp -a Documentation/bibliography/*.bib $(r)/$(d)/bibliography/ +# cp -a Documentation/misc/[ACN]* $(r)/$(d)/misc/ + # dh_installexamples input cp -aP `find input mutopia $ -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' $` \ $(r)/$(d)/examples @@ -120,7 +134,7 @@ binary-arch: build install # dh_installmenu dh_installemacsen # dh_installcron -# dh_installmanpages +# dh_installman # dh_undocumented dh_installchangelogs -k CHANGES dh_link @@ -128,7 +142,10 @@ binary-arch: build install dh_compress dh_fixperms dh_installdeb - dh_shlibdeps +# dh_shlibdeps + # Ugh, ugly kludge to avoid the circular symlinks under html/ + cd debian/lilypond && dpkg-shlibdeps -T../substvars -dDepends \ + usr/bin/lilypond usr/bin/midi2ly dh_gencontrol # dh_makeshlibs dh_md5sums diff --git a/debian/watch b/debian/watch index 589895ff83..62a6d3d9f0 100644 --- a/debian/watch +++ b/debian/watch @@ -2,4 +2,4 @@ # Rename this file to "watch" and then you can run the "uscan" command # to check for upstream updates and more. # Site Directory Pattern Version Script -ftp.cs.uu.nl /pub/GNU/LilyPond/v1.3 lilypond-*.tar.gz debian uupdate +ftp.cs.uu.nl /pub/GNU/LilyPond/v1.4 lilypond-*.tar.gz debian uupdate diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly new file mode 100644 index 0000000000..8219145784 --- /dev/null +++ b/input/regression/tuplet-nest.ly @@ -0,0 +1,31 @@ +\header { + texidoc="Manual hack for nested tuplets" +} + +#(define (make-text-checker-once text) + (lambda (grob) (and text-checker-once + (if (equal? text (ly-get-grob-property grob 'text)) + (begin + (set! text-checker-once #f) #t) + #f)))) + +#(define text-checker-once #t) + +\score { + \notes\relative c'' { + + \property Voice.tupletNumberFormatFunction = #fraction-tuplet-formatter + + \outputproperty #(make-text-checker-once "2:3") + #'extra-offset = #'(0 . 1) + \times 2/3 { + \times 2/3 { + a a a + } + \times 3/5 { + a a a a a + } + } + } + \paper { linewidth = -1. } +} diff --git a/input/test/octave-duplicate.ly b/input/test/octave-duplicate.ly new file mode 100644 index 0000000000..eaf17c4d0d --- /dev/null +++ b/input/test/octave-duplicate.ly @@ -0,0 +1,58 @@ +\header { +texidoc="Octave duplicate parts of music" +} + +upperOne = \notes\relative c'' { + a4 a a a + a4 a a a + a4 a a a + a4 a a a +} + +upperOctave = \notes < + \context Thread=upperOne { \transpose c \upperOne } + \context Thread=upperOne { + \property Thread.devNullThread = #'allways s1*2 + \property Thread.devNullThread = #'() s1*2 + } +> + +lowerOne = \notes\relative c { + a8 a a a a a a a + a8 a a a a a a a + a8 a a a a a a a + a8 a a a a a a a +} + +firstEight = \notes { + \property Thread.devNullThread = #'() s8 + \property Thread.devNullThread = #'allways s8*7 +} + +lowerOctave = \notes < + \context Thread=lowerOne { \transpose c \lowerOne } + \context Thread=lowerOne { + \repeat "unfold" 4 { \firstEight } + } +> + +\score { + < + \context PianoStaff < + \context Staff=upper < + \context Voice=upperOne < + \upperOne + \upperOctave + > + > + \context Staff=lower < + \clef bass + \context Voice=lowerOne < + \lowerOne + \lowerOctave + > + > + > + > + \paper { } +} diff --git a/scm/grob-description.scm b/scm/grob-description.scm index b26ece9a3b..78e498658d 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -152,7 +152,11 @@ (DotColumn . ( - (axes 0 ) + (axes 0) + (direction . 1) + (X-extent-callback . ,Axis_group_interface::group_extent_callback) + + (X-offset-callbacks . (,Dot_column::side_position)) (meta . ,(grob-description "DotColumn" dot-column-interface axis-group-interface)) )) @@ -703,6 +707,7 @@ (UnaCordaPedal . ( (molecule-callback . ,Text_item::brew_molecule) + (font-family . roman) (font-shape . italic) (no-spacing-rods . #t) (self-alignment-X . 0) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 5b5da01925..8b560e8959 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -401,7 +401,7 @@ output_dict= { @end tex @html

- + @end html """, } diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make index caf13194e9..025ef15d21 100644 --- a/stepmake/stepmake/package.make +++ b/stepmake/stepmake/package.make @@ -1,19 +1,25 @@ # stepmake/Package.make deb: - $(MAKE) -C $(depth)/debian +# $(MAKE) -C $(depth)/debian + @echo The \"deb\" target is deprecated. + @echo Please install the appropriate Debian packages: + @echo + @echo " apt-get install task-debian-devel" + @echo + @echo and then run \"debuild\" in the lilypond directory. # urg #(cd $(depth)/../debian/$(distname); \ # ln -sf debian DEBIAN; ) # su -c 'dpkg-deb -b $(depth)/../debian/$(distname)' # urg, why aren't there any decent manual pages for dpkg or rpm? - (cd $(depth)/../debian; \ - rm -rf $(distname) $(distname).deb;\ - tar xz -C $(depth)/../debian -f $(release-dir)/$(distname).tar.gz; \ - cd $(distname);\ - dpkg-buildpackage -b -rfakeroot; \ - ) +# (cd $(depth)/../debian; \ +# rm -rf $(distname) $(distname).deb;\ +# tar xz -C $(depth)/../debian -f $(release-dir)/$(distname).tar.gz; \ +# cd $(distname);\ +# dpkg-buildpackage -b -rfakeroot; \ +# ) makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%)))) -- 2.39.5