From f5d88b8b3b09ac724d7f2234b25fcbde4bc1b072 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 2 Sep 1998 11:41:36 +0200 Subject: [PATCH] release: 1.0.6 --- AUTHORS.txt | 8 +- Documentation/GNUmakefile | 6 +- Documentation/README-W32.yo | 28 ++- Documentation/TODO | 6 +- Documentation/faq.yo | 23 ++- Documentation/man/GNUmakefile | 6 - Documentation/man/convert-mudela.yo | 10 - Documentation/man/lilypond.yo | 31 +-- Documentation/man/ly2dvi.yo | 20 -- Documentation/man/mi2mu.yo | 11 - Documentation/man/mudela-book.yo | 11 - Documentation/man/out/convert-mudela.1 | 1 - Documentation/man/out/lilypond.1 | 9 - Documentation/man/out/ly2dvi.1 | 1 - Documentation/man/out/mi2mu.1 | 2 - Documentation/man/out/mudela-book.1 | 2 - Documentation/mutopia.yo | 2 - Documentation/ntweb/GNUmakefile | 8 + Documentation/ntweb/index.yo | 49 +++-- Documentation/programs.yo | 21 ++ Documentation/tex/refman.yo | 9 +- Documentation/tex/tutorial.yo | 95 ++++++--- Documentation/topdocs/AUTHORS.yo | 8 +- Documentation/topdocs/INSTALL.yo | 28 ++- Documentation/topinfo.yo | 57 +++--- INSTALL.txt | 27 ++- NEWS | 79 +++++++ TODO | 18 +- VERSION | 8 +- aclocal.m4 | 51 +++-- config.hh.in | 3 + config.make.in | 2 + configure | 193 ++++++++++-------- configure.in | 2 +- flower/file-path.cc | 1 + init/book-fragment.ly | 2 +- init/book-init.ly | 2 +- init/center-fragment.ly | 2 +- init/center.ly | 2 +- init/english.ly | 86 ++++++++ init/fragment.ly | 2 +- init/init.fly | 2 +- init/init.ly | 2 +- init/paper16.ly | 2 +- init/paper20.ly | 2 +- init/property.ly | 15 +- input/keys.ly | 6 +- input/kortjakje.ly | 2 +- input/pedal.ly | 2 +- input/praeludium-fuga-E.ly | 2 +- input/rhythm.ly | 2 +- input/scales.ly | 2 +- input/scripts.ly | 2 +- input/test/a.ly | 2 +- input/test/beams.ly | 2 +- input/test/broken.ly | 2 +- input/test/collisions.ly | 2 +- input/test/denneboom.ly | 2 +- input/test/font-body.ly | 2 +- input/test/font.ly | 2 +- input/test/font16.ly | 2 +- input/test/gourlay.ly | 2 +- input/test/knee.ly | 2 +- input/test/sleur.ly | 2 +- input/test/slur-damping.ly | 2 +- input/test/slurs.ly | 2 +- input/test/spacing.ly | 2 +- input/test/stem.ly | 2 +- input/test/title.ly | 2 +- input/test/transposition.ly | 12 +- input/tril.ly | 2 +- input/twinkle-pop.ly | 2 +- input/twinkle.ly | 2 +- lily/GNUmakefile | 3 - lily/VERSION | 8 +- ...up-elem.cc => horizontal-group-element.cc} | 0 ...c => horizontal-vertical-group-element.cc} | 0 .../include/horizontal-vertical-group-item.hh | 4 +- lily/include/item.hh | 1 + lily/include/lily-proto.hh | 3 +- lily/include/line-of-score.hh | 9 +- lily/include/p-score.hh | 16 +- lily/include/score-element.hh | 4 +- lily/include/spanner.hh | 3 +- lily/include/super-element.hh | 19 +- lily/item.cc | 9 +- lily/key-engraver.cc | 4 +- lily/lexer.ll | 2 +- lily/line-of-score.cc | 75 +++---- lily/main.cc | 25 ++- lily/my-lily-lexer.cc | 2 +- lily/p-score.cc | 136 +++++++++--- lily/parser.yy | 14 +- lily/score-element.cc | 2 +- lily/score-engraver.cc | 2 +- lily/spanner.cc | 22 +- lily/{super-elem.cc => super-element.cc} | 50 ++--- make/GNUmakefile | 6 +- make/STATE-VECTOR | 72 +++++++ make/docrules.make | 3 - make/lilypond.spec.in | 2 + make/mutopia.make | 3 - make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 6 +- make/substitute.make | 1 + mf/GNUmakefile | 2 + mf/feta-black16.mf | 22 -- mf/feta-brackets16.mf | 18 -- mf/feta-brackets20.mf | 16 -- mf/feta-generic.mf | 2 +- mf/feta-nummer-generic.mf | 7 +- mf/feta-params.mf | 2 +- mf/feta-sleur.mf | 13 -- mutopia/Coriolan/GNUmakefile | 2 +- mutopia/Coriolan/bassi-part.ly | 2 +- mutopia/Coriolan/clarinetti-part.ly | 2 +- mutopia/Coriolan/clarinetti.ly | 2 +- mutopia/Coriolan/clarinetto-1.ly | 2 +- mutopia/Coriolan/clarinetto-2.ly | 2 +- mutopia/Coriolan/contrabasso-part.ly | 2 +- mutopia/Coriolan/contrabasso.ly | 2 +- mutopia/Coriolan/coriolan.ly | 2 +- mutopia/Coriolan/corni-part.ly | 2 +- mutopia/Coriolan/corni.ly | 2 +- mutopia/Coriolan/corno-1.ly | 2 +- mutopia/Coriolan/corno-2.ly | 2 +- mutopia/Coriolan/fagotti-part.ly | 2 +- mutopia/Coriolan/fagotti.ly | 2 +- mutopia/Coriolan/fagotto-1.ly | 2 +- mutopia/Coriolan/fagotto-2.ly | 2 +- mutopia/Coriolan/flauti-part.ly | 2 +- mutopia/Coriolan/flauti.ly | 2 +- mutopia/Coriolan/flauto-1.ly | 2 +- mutopia/Coriolan/flauto-2.ly | 2 +- mutopia/Coriolan/global.ly | 2 +- mutopia/Coriolan/oboe-1.ly | 2 +- mutopia/Coriolan/oboe-2.ly | 2 +- mutopia/Coriolan/oboi-part.ly | 2 +- mutopia/Coriolan/oboi.ly | 2 +- mutopia/Coriolan/timpani.ly | 2 +- mutopia/Coriolan/trombe-part.ly | 2 +- mutopia/Coriolan/trombe.ly | 2 +- mutopia/Coriolan/trombo-1.ly | 2 +- mutopia/Coriolan/trombo-2.ly | 2 +- mutopia/Coriolan/viola-1.ly | 2 +- mutopia/Coriolan/viola-2.ly | 2 +- mutopia/Coriolan/viola-part.ly | 2 +- mutopia/Coriolan/violino-1-part.ly | 2 +- mutopia/Coriolan/violino-1.ly | 2 +- mutopia/Coriolan/violino-2-part.ly | 2 +- mutopia/Coriolan/violino-2.ly | 2 +- mutopia/Coriolan/violoncello-part.ly | 2 +- mutopia/Coriolan/violoncello.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-1.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-2.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-4.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-5.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-6.ly | 2 +- .../Solo-Cello-Suites/allemande-cello.ly | 5 +- .../Solo-Cello-Suites/allemande-urtext.ly | 4 +- .../{allemande-alto.ly => allemande-viola.ly} | 19 +- .../Solo-Cello-Suites/courante-cello.ly | 5 +- .../Solo-Cello-Suites/courante-urtext.ly | 4 +- .../{courante-alto.ly => courante-viola.ly} | 19 +- .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 5 +- .../Solo-Cello-Suites/gigue-urtext.ly | 4 +- .../{gigue-alto.ly => gigue-viola.ly} | 7 +- .../Solo-Cello-Suites/menuetto-cello.ly | 10 +- .../Solo-Cello-Suites/menuetto-urtext.ly | 4 +- .../{menuetto-alto.ly => menuetto-viola.ly} | 36 ++-- .../Solo-Cello-Suites/prelude-cello.ly | 5 +- .../Solo-Cello-Suites/prelude-urtext.ly | 4 +- .../{prelude-alto.ly => prelude-viola.ly} | 19 +- .../Solo-Cello-Suites/sarabande-cello.ly | 5 +- .../Solo-Cello-Suites/sarabande-urtext.ly | 4 +- .../{sarabande-alto.ly => sarabande-viola.ly} | 19 +- .../{scsii-alto.ly => scsii-viola.ly} | 2 +- mutopia/J.S.Bach/wtk1-fugue1.ly | 2 +- mutopia/J.S.Bach/wtk1-fugue2.ly | 4 +- mutopia/J.S.Bach/wtk1-prelude1.ly | 2 +- mutopia/W.A.Mozart/cadenza.ly | 2 +- mutopia/W.A.Mozart/horn-concerto-3.ly | 2 +- mutopia/gallina.ly | 2 +- mutopia/los-toros-oboe.ly | 2 +- mutopia/standchen-16.ly | 2 +- mutopia/standchen-20.ly | 2 +- mutopia/standchen.ly | 2 +- po/nl.po | 2 +- scripts/GNUmakefile | 4 +- scripts/convert-mudela.py | 18 ++ scripts/ly2dvi.sh | 30 ++- stepmake/AUTHORS.txt | 2 +- stepmake/INSTALL.txt | 170 ++++++++++++++- stepmake/NEWS | 8 + stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 49 +++-- stepmake/bin/package-zip32.sh | 75 +++++++ stepmake/config.make.in | 2 + stepmake/configure | 62 ++++-- stepmake/make/GNUmakefile | 4 +- stepmake/make/out/stepmake.lsm | 8 +- stepmake/make/out/stepmake.spec | 4 +- stepmake/make/toplevel-version.make | 2 +- .../automatically-configured.sub.make | 1 + .../stepmake/automatically-generated.sub.make | 9 + stepmake/stepmake/documentation-targets.make | 6 +- stepmake/stepmake/documentation-vars.make | 1 - stepmake/stepmake/documentation.shared.make | 9 - stepmake/stepmake/generic-targets.make | 9 +- stepmake/stepmake/install-outfiles.sub.make | 2 +- stepmake/stepmake/metafont-rules.make | 5 + stepmake/stepmake/metafont-targets.make | 7 +- stepmake/stepmake/metafont-vars.make | 9 +- stepmake/stepmake/package.make | 5 +- stepmake/stepmake/po-vars.make | 0 stepmake/stepmake/substitute-targets.make | 0 stepmake/stepmake/texinfo-rules.make | 6 - stepmake/stepmake/toplevel-targets.make | 12 +- stepmake/stepmake/yolily-topdoc-vars.make | 2 - .../stepmake/yolily-toplevel-targets.make | 1 + 221 files changed, 1555 insertions(+), 890 deletions(-) create mode 100644 Documentation/programs.yo create mode 100644 init/english.ly rename lily/{horizontal-group-elem.cc => horizontal-group-element.cc} (100%) rename lily/{horizontal-vertical-group-elem.cc => horizontal-vertical-group-element.cc} (100%) rename lily/{super-elem.cc => super-element.cc} (57%) create mode 100644 make/STATE-VECTOR delete mode 100644 make/docrules.make delete mode 100644 make/mutopia.make delete mode 100644 mf/feta-black16.mf delete mode 100644 mf/feta-brackets16.mf delete mode 100644 mf/feta-brackets20.mf rename mutopia/J.S.Bach/Solo-Cello-Suites/{allemande-alto.ly => allemande-viola.ly} (64%) rename mutopia/J.S.Bach/Solo-Cello-Suites/{courante-alto.ly => courante-viola.ly} (65%) rename mutopia/J.S.Bach/Solo-Cello-Suites/{gigue-alto.ly => gigue-viola.ly} (90%) rename mutopia/J.S.Bach/Solo-Cello-Suites/{menuetto-alto.ly => menuetto-viola.ly} (65%) rename mutopia/J.S.Bach/Solo-Cello-Suites/{prelude-alto.ly => prelude-viola.ly} (62%) rename mutopia/J.S.Bach/Solo-Cello-Suites/{sarabande-alto.ly => sarabande-viola.ly} (63%) rename mutopia/J.S.Bach/Solo-Cello-Suites/{scsii-alto.ly => scsii-viola.ly} (76%) create mode 100644 stepmake/bin/package-zip32.sh create mode 100644 stepmake/stepmake/automatically-configured.sub.make create mode 100644 stepmake/stepmake/automatically-generated.sub.make delete mode 100644 stepmake/stepmake/documentation.shared.make delete mode 100644 stepmake/stepmake/po-vars.make delete mode 100644 stepmake/stepmake/substitute-targets.make diff --git a/AUTHORS.txt b/AUTHORS.txt index 7dd6318284..0c8577c497 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -3,8 +3,8 @@ TITLE INFORMATION: AUTHORS - who did what on GNU LilyPond? Contents -This file lists authors of GNU LilyPond, and what they wrote. -This list is alphabetically ordered. +This file lists authors of GNU LilyPond, and what they wrote. This +list is alphabetically ordered. o Mats Bengtsson , http://www.s3.kth.se/~matsb @@ -27,11 +27,11 @@ o David R. Linn , o Han-Wen Nienhuys , http://www.cs.uu.nl/~hanwen - Main author. + Main author (initials: HWN). o Jan Nieuwenhuizen , http://www.xs4all.nl/~jantien - Main author + Main author (initials: JCN). o Alexandre Oliva , http://sunsite.unicamp.br/~oliva testing diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 361a15f4a7..22da57bfe0 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -6,17 +6,15 @@ NAME = documentation SUBDIRS=man tex pictures topdocs ntweb STEPMAKE_TEMPLATES=documentation README_TOP_FILES=NEWS DEDICATION TODO ANNOUNCE-0.1 +# INFO_FILES = $(wildcard $(outdir)/$(package).info*) EXTRA_DIST_FILES = gnu-music-history TODO BLURBS=BLURB COPERTINA FLAPTEKST -OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo include $(depth)/make/stepmake.make default: do-doc -# INFO_FILES = $(outdir)/$(package).info - -texinfo: $(OUTTEXINFO_FILES) +texinfo: $(outdir)/$(package).info diff --git a/Documentation/README-W32.yo b/Documentation/README-W32.yo index 506be7899a..579642fc23 100644 --- a/Documentation/README-W32.yo +++ b/Documentation/README-W32.yo @@ -61,7 +61,9 @@ subsect(GOOD NEWS) It can be done! Occasionally, the Cygnus b19.1 cross compiler and utilities under GNU/Linux are used to make the binary file(.exe.zip) releases (some makefile hacking was needed to build this stuff). Jeffrey -Reed tries to keep-up with LilyPond development, and is doing quite well. +Reed tries to keep-up with LilyPond development, and is doing quite +well. His latest release is available on +lurl(http://www.realtime.net/~daboys/lilypond/). subsect(UNPACKING) @@ -342,8 +344,11 @@ done $realinstall $args ) -I place this in script file(~/bin). Having said that here is how one -might build the em(gettext) package. +I place this in script file(~/bin). The LilyPond configure, build, +and install process handles this with it's own install script. In +addition there are patches to the cygnus install command that also +deals with this problem. Having said that, here is how one +might build the em(gettext) package. itemize( it() download the package from one of the ftp sites. @@ -382,7 +387,7 @@ $CYGFS/cygnus.bat. subsubsect(Yodl Document Language) lurl(http://www.xs4all.nl/~jantien/yodl/) -Yodl for documentation in Lilypond. It is currently being updated by +Yodl for documentation in LilyPond. It is currently being updated by Jan Nieuwenhuizen. The development methodology of em(Yodl) as well as em(LilyPond) relies on a the following directory structure: @@ -441,7 +446,7 @@ The build of em(stepmake) documentation will fail due to the fact that em(yodl) is not yet installed. This is normal and shouldn't be a problem. -subsubsect(Lilypond) label(lilybuild) +subsubsect(LilyPond) label(lilybuild) itemize( it() download the package from lurl(http://www.cs.uu.nl/people/hanwen/lilypond/) to @@ -533,16 +538,23 @@ it() make release ) subsect(Running lilypond on Windows-NT) label(run) - -label(binary) + +We are now distributing a formated binary distribution for +Windows-NT. Please refer to +lurl(http://www.realtime.net/~daboys/lilypond/) for current news, +download, installation, and running information. Jeffrey B. Reed email(daboys@bga.com) sect(RUNNING LILYPOND -- by Dominique Cretel) +You may want to refer to section ref(run), for more current +information about downloading, installing, and running the Windows-NT +binary distribution. + enumerate( -eit() First, I have download tha 0.1.64 version of Lilypond music software. +eit() First, I have download tha 0.1.64 version of LilyPond music software. eit() Then I extract it in a temp directory, and I move the directory "lilypond-0.1.64" to the root directory of my D drive. diff --git a/Documentation/TODO b/Documentation/TODO index 060d0c342a..7145924b96 100644 --- a/Documentation/TODO +++ b/Documentation/TODO @@ -1,10 +1,6 @@ # Documentation/TODO - * write toplevel info file - - * yodl2texinfo: automatic nodes and menus? + * overview and index of features * get rid of pod manpage layout legacy - - diff --git a/Documentation/faq.yo b/Documentation/faq.yo index 14dbafd856..6a9ae5f364 100644 --- a/Documentation/faq.yo +++ b/Documentation/faq.yo @@ -69,8 +69,8 @@ The directory file(~/usr/src/) contains something like includefile(../stepmake/Documentation/layout.yo) ) -~/usr/src/bin is in the PATH, and contains symlinks to the -compiled executables. +~/usr/src/bin is in the PATH, and contains symbolic links to the +compiled executables. question(Is there an emacs mode?) @@ -78,6 +78,25 @@ Yes. It is included with the source archive as mudela-mode.el. If you have an rpm it is in /usr/doc/lilypond-X/. You have to install it yourself. +question(How do i create the file(.tfm) files?) + +You don't. The file(.tfm) files should be generated automatically by +Metafont when you run TeX(). Check your TeX() installation, or ask +your local TeX() guru. The supplied file(.afm) files are intended to +be used by LilyPond, not by any other programs. + + +sect(Documentation) + +question(Why is the documentation/website/etc. so lousy?) + +LilyPond development is moving quite fast, documentation will often +lag a bit behind. We must always make a choice between writing more +doco, writing more code and answering email. + +If you think you can make a correction, or devised a solution that +should be documented, please do so and send in a patch. + sect(Language: mudela) question(Why can't you type code(#c) in stead of code(cis) ?) diff --git a/Documentation/man/GNUmakefile b/Documentation/man/GNUmakefile index efac06ae88..6f2e9d4b4a 100644 --- a/Documentation/man/GNUmakefile +++ b/Documentation/man/GNUmakefile @@ -7,18 +7,12 @@ SECTION=1 MANTXT = $(addprefix $(outdir)/, $(addsuffix .txt,$(basename $(TEXINFO_FILES) .texinfo))) MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION),$(basename $(YO_FILES) .yo))) -OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo))) - OUT_DIST_FILES += $(MANGROFF) include $(depth)/make/stepmake.make default: $(MANGROFF) -texinfo: $(OUTTEXINFO_FILES) - - - INSTALLATION_OUT_FILES=$(MANGROFF) INSTALLATION_OUT_DIR=$(mandir)/man$(SECTION) diff --git a/Documentation/man/convert-mudela.yo b/Documentation/man/convert-mudela.yo index a9640b80f6..39a913b3d5 100644 --- a/Documentation/man/convert-mudela.yo +++ b/Documentation/man/convert-mudela.yo @@ -12,24 +12,16 @@ manpage(convert-mudela) metalC(Automatically generated by yodl(1) from convert-mudela.yo.) -node(Programs)(convert-mudela)(Invoking convert-mudela)(Programs) manpagename(convert-mudela)(convert-mudela to newer versions) convert-mudela sequentially applies different mudela-conversions to upgrade a Mudela input file. -menu( -mit(Invoking convert-mudela)( Command options supported by file(convert-mudela)) -mit(Bugs convert-mudela)( Bugs) -mit(Author convert-mudela)( Author) -) - manpagedescription() Upgrade a Mudela input file from FROM_PATCHLEVEL to TO_PATCHLEVEL. If no files are given, the standard input and output are used. -node(convert-mudela)(Invoking convert-mudela)(Bugs convert-mudela)(convert-mudela) manpagesynopsis() convert-mudela [options] [files] @@ -50,7 +42,6 @@ dit(--to=TO_PATCHLEVEL) available version. ) -node(Invoking convert-mudela)(Bugs convert-mudela)(Author convert-mudela)(convert-mudela) manpagesection(BUGS) Not all language changes are handled. Multiple output options won't @@ -60,7 +51,6 @@ convert-mudela is written in python, so you have install url(python)(http://www.python.org). -node(Bugs convert-mudela)(Author convert-mudela)(LilyPond)(convert-mudela) manpageauthor() nemail(Han-Wen Nienhuys)(hanwen@cs.uu.nl), lurl(http://www.cs.uu.nl/people/hanwen) diff --git a/Documentation/man/lilypond.yo b/Documentation/man/lilypond.yo index b0bb0316ae..dc69bc4fe5 100644 --- a/Documentation/man/lilypond.yo +++ b/Documentation/man/lilypond.yo @@ -3,6 +3,7 @@ mailto(janneke@gnu.org) COMMENT( (PIPETHROUGH(echo -n `date '+%d/%b/%y'|tr '[a-z]' '[A-Z]'`)()) ) + manpage(LilyPond) (1) (1998) @@ -14,30 +15,12 @@ metalC(Automatically generated by yodl(1) from lilypond.yo.) manpagename(LilyPond)(the GNU Music Typesetter) cindex(LilyPond) -COMMENT(nodes and menus by hand, for now) -node(Author convert-mudela)(LilyPond)(Invoking LilyPond)(Programs) -menu( -mit(Invoking LilyPond)( Command options supported by file(LilyPond)) -mit(Disclaimer LilyPond)( Disclaimer) -mit(Features LilyPond)( Features) -mit(Problems LilyPond)( Problems) -mit(Files LilyPond)( Files) -mit(Environment LilyPond)( Environment) -mit(Bugs LilyPond)( Bugs) -mit(See Also LilyPond)( See Also) -mit(Remarks LilyPond)( Remarks) -mit(History LilyPond)( History) -mit(Author LilyPond)( Author) -) - -node(LilyPond)(Invoking LilyPond)(Features LilyPond)(LilyPond) - manpagesynopsis() bf(lilypond) [OPTION]... [MUDELA-FILE]... manpagedescription() -verbinclude(../BLURB.in) +includefile(../BLURB.in) manpageoptions() description( @@ -72,7 +55,6 @@ dit(--find-fourths, -Q) converting absolute octave mode stuff to relative octaves. ) -node(Invoking LilyPond)(Features LilyPond)(Disclaimer LilyPond)(LilyPond) manpagesection(FEATURES) This is an overview of the features that GNU LilyPond supports. For @@ -96,7 +78,6 @@ it()Multiple scores within one input file. Each score is output to it()Clef changes, meter changes, cadenza-mode, key changes, repeat bars. ) -node(Features LilyPond)(Disclaimer LilyPond)(Problems LilyPond)(LilyPond) manpagesection(DISCLAIMER) GNU LilyPond is copyright 1996-1998 by its authors. GNU LilyPond is @@ -105,7 +86,6 @@ is provided without any warranty what so ever. GNU LilyPond may be freely distributed. For further information consult the GNU General Public License, from the file file(COPYING). -node(Disclaimer LilyPond)(Problems LilyPond)(Files LilyPond)(LilyPond) manpagesection(PROBLEMS) There is an extensive list of todoes and bugs. See file(TODO). If you @@ -128,7 +108,6 @@ it()Send it to email(bug-gnu-music@gnu.org) (you don't have to subscribe to this mailinglist). ) -node(Problems LilyPond)(Files LilyPond)(Environment LilyPond)(LilyPond) manpagefiles() description( dit(file(init.ly)) @@ -136,7 +115,6 @@ dit(file(init.ly)) includes files from the directory file(init/). ) -node(Files LilyPond)(Environment LilyPond)(Bugs LilyPond)(LilyPond) manspagesection(environment) description( @@ -147,12 +125,10 @@ dit(LANG) selects the language for the warning messages of LilyPond. ) -node(Environment LilyPond)(Bugs LilyPond)(See Also LilyPond)(LilyPond) manpagebugs() Lots of them. See file(TODO) and file(BUGS) -node(Bugs LilyPond)(See Also LilyPond)(Remarks LilyPond)(LilyPond) manpageseealso() description( @@ -199,13 +175,11 @@ dit(email(gnu-music-discuss@gnu.org)) Announces of new versions will be sent to info-gnu-music and gnu-music-discuss. -node(See Also LilyPond)(Remarks LilyPond)(History LilyPond)(LilyPond) manpagesection(REMARKS) GNU LilyPond has no connection with the music package Rosegarden, other than the names being similar (:-) -node(Remarks LilyPond)(History LilyPond)(Author LilyPond)(LilyPond) manpagesection(HISTORY) cindex(History) @@ -236,7 +210,6 @@ Most the other history is described in the NEWS file. The first large scale release (0.1) was done after approximately 78 patchlevels on August 1, 1997. -node(History LilyPond)(Author LilyPond)(Ly2dvi)(LilyPond) manpageauthor() cindex(Author) diff --git a/Documentation/man/ly2dvi.yo b/Documentation/man/ly2dvi.yo index d0a0c6dd28..45734f10e8 100644 --- a/Documentation/man/ly2dvi.yo +++ b/Documentation/man/ly2dvi.yo @@ -7,20 +7,8 @@ manpage(LilyPond) metalC(Automatically generated by yodl(1) from ly2dvi.yo.) -node(Author LilyPond)(Ly2dvi)(Invoking Ly2dvi)(Programs) manpagename(Ly2dvi)(convert mudela to DVI) -menu( -mit(Invoking Ly2dvi)( Command options supported by file(Ly2dvi)) -mit(Features Ly2dvi)( Features) -mit(Environment Ly2dvi)( Environment) -mit(Files Ly2dvi)( Files) -mit(See Also Ly2dvi)( See Also) -mit(Bugs Ly2dvi)( Bugs) -mit(Remarks Ly2dvi)( Remarks) -mit(Author Ly2dvi)( Author) -) - manpagedescription() ly2dvi is a shell script which creates input file for LaTeX, based on information from the output files from lilypond. @@ -31,7 +19,6 @@ One or more LaTeX files are created, based on information found in the output (TeX) files, and latex is finally run to create one or more DVI files. -node(Ly2dvi)(Invoking Ly2dvi)(Features Ly2dvi)(Ly2dvi) manpagesynopsis() ly2dvi [options] inputfile[.ly] [....] @@ -84,7 +71,6 @@ dit(-s,--separate) DVI file for each. ) -node(Invoking Ly2dvi)(Features Ly2dvi)(Environment Ly2dvi)(Ly2dvi) manpagesection(Features) ly2dvi responds to several parameters specified in the mudela @@ -103,7 +89,6 @@ dit(papersize="";) Specify name of papersize. ) -node(Features Ly2dvi)(Environment Ly2dvi)(Files Ly2dvi)(Ly2dvi) manpagesection(Environment) description( @@ -113,7 +98,6 @@ dit(TMP) Temporary directory name. Default is /tmp ) -node(Environment Ly2dvi)(Files Ly2dvi)(See Also Ly2dvi)(Ly2dvi) manpagesection(Files) file(titledefs.tex) is inspected for definitions used to extract @@ -160,12 +144,10 @@ dit(PWIDTH=) Specify paperwidth (points - an inch is 72.27, a cm is 28.453 points). ) -node(Files Ly2dvi)(See Also Ly2dvi)(Bugs Ly2dvi)(Ly2dvi) manpagesection(See Also) lilypond(1), tex(1), latex(1) -node(See Also Ly2dvi)(Bugs Ly2dvi)(Remarks Ly2dvi)(Ly2dvi) manpagesection(Bugs) If you have found a bug, you should send a bugreport. @@ -179,7 +161,6 @@ it()Send it to email(bug-gnu-music@gnu.org) (you don't have to subscribe to this mailinglist). ) -node(Bugs Ly2dvi)(Remarks Ly2dvi)(Author Ly2dvi)(Ly2dvi) manpagesection(Remarks) Many papersizes are now supported. Information on other sizes @@ -192,7 +173,6 @@ a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, archA, archB, archC, archD, archE, b0, b1, b2, b3, b4, b5, flsa, flse, halfletter, ledger, legal, letter, note -node(Remarks Ly2dvi)(Author Ly2dvi)(Mi2mu)(Ly2dvi) manpageauthor() nemail(Jan Arne Fagertun)(Jan.A.Fagertun@energy.sintef.no), lurl(http://www.termo.unit.no/mtf/people/janaf/) diff --git a/Documentation/man/mi2mu.yo b/Documentation/man/mi2mu.yo index 14d3d7d3b4..7a0abb6fee 100644 --- a/Documentation/man/mi2mu.yo +++ b/Documentation/man/mi2mu.yo @@ -11,21 +11,12 @@ manpage(LilyPond) metalC(Automatically generated by yodl(1) from mi2mu.yo.) -node(Author Ly2dvi)(Mi2mu)(Invoking Mi2mu)(Programs) - manpagename(Mi2mu)(convert MIDI to bf(mudela)(5)) -menu( -mit(Invoking Mi2mu)( Command options supported by file(Mi2mu)) -mit(Disclaimer Mi2mu)( Disclaimer) -mit(Author Mi2mu)( Author) -) - manpagedescription() Mi2mu translates a MIDI input file to Mudela (GNU LilyPond source format). Mi2mu is part of the GNU LilyPond music typesetting package. -node(Mi2mu)(Invoking Mi2mu)(Disclaimer Mi2mu)(Mi2mu) manpagessynopsis() mi2mu [options] midi-file @@ -62,7 +53,6 @@ dit(-x, --no-double-dots,) Assume no double dotted notes. ) -node(Invoking Mi2mu)(Disclaimer Mi2mu)(Author Mi2mu)(Mi2mu) manpagesection(DISCLAIMER) Mi2mu is copyright 1996, 1997 by its authors. Mi2mu is distributed @@ -80,7 +70,6 @@ dit(mudela-man) On the input format. This is a LilyPond-enhanced LaTeX document. ) -node(Disclaimer Mi2mu)(Author Mi2mu)(mudela-book)(Mi2mu) manpageauthor() Please consult the documentation file file(AUTHORS) for more detailed diff --git a/Documentation/man/mudela-book.yo b/Documentation/man/mudela-book.yo index 4f1907558d..c6f2dce08d 100644 --- a/Documentation/man/mudela-book.yo +++ b/Documentation/man/mudela-book.yo @@ -11,16 +11,8 @@ manpage(LilyPond) metalC(Automatically generated by yodl(1) from mudela-book.yo.) -node(Author Mi2mu)(mudela-book)(Invoking mudela-book)(Programs) - manpagename(mudela-book)(integrate LaTeX and mudela) -menu( -mit(Invoking mudela-book)(Command options supported by file(mudela-book)) -mit(Bugs mudela-book)(Bugs) -mit(Author mudela-book)(Author) -) - manpagedescription() file(mudela-book) is a script that helps integrating mudela and LaTeX(). mudela-book runs LilyPond on fragments of mudela in your source file, and includes the results into @@ -48,7 +40,6 @@ dit(verbatim) CONTENTS is copied into the TeX source enclosed in a verbatim block. ) -node(mudela-book)(Invoking mudela-book)(Bugs mudela-book)(mudela-book) manpagesection(Synopsis) description( @@ -62,13 +53,11 @@ dit(--help) print a short help message ) -node(Invoking mudela-book)(Bugs mudela-book)(Author mudela-book)(mudela-book) manpagebugs() Doesn't handle incorrect input sanely. mudela-book is written in python, so you have install url(python)(http://www.python.org). -node(Bugs mudela-book)(Author mudela-book)(Mutopia)(mudela-book) manpageauthor() nemail(Han-Wen Nienhuys)(hanwen@cs.uu.nl), lurl(http://www.cs.uu.nl/people/hanwen) diff --git a/Documentation/man/out/convert-mudela.1 b/Documentation/man/out/convert-mudela.1 index a72de5e538..98f6f5d2dc 100644 --- a/Documentation/man/out/convert-mudela.1 +++ b/Documentation/man/out/convert-mudela.1 @@ -7,7 +7,6 @@ convert-mudela \- convert-mudela to newer versions convert-mudela sequentially applies different mudela-conversions to upgrade a Mudela input file\&. .PP -.PP .SH "DESCRIPTION" .PP Upgrade a Mudela input file from FROM_PATCHLEVEL to TO_PATCHLEVEL\&. diff --git a/Documentation/man/out/lilypond.1 b/Documentation/man/out/lilypond.1 index 85af901fd9..c757203f29 100644 --- a/Documentation/man/out/lilypond.1 +++ b/Documentation/man/out/lilypond.1 @@ -4,26 +4,17 @@ .SH "NAME" LilyPond \- the GNU Music Typesetter .PP -.PP -.PP .SH "SYNOPSIS" \fBlilypond\fP [OPTION]\&.\&.\&. [MUDELA-FILE]\&.\&.\&. .PP .SH "DESCRIPTION" .PP - -.DS - LilyPond is the GNU Project music typesetter\&. This program can print beautiful sheet music from a music definition file\&. It can also play mechanical performances to a MIDI file\&. Features include multiple staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas, beams, slurs, triplets, formatting scores, part extraction\&. It includes a nice font of musical symbols\&. - -.DE - - .PP .SH "OPTIONS" .IP "-I,--include=FILE" diff --git a/Documentation/man/out/ly2dvi.1 b/Documentation/man/out/ly2dvi.1 index dd83e906de..941b15e780 100644 --- a/Documentation/man/out/ly2dvi.1 +++ b/Documentation/man/out/ly2dvi.1 @@ -4,7 +4,6 @@ .SH "NAME" Ly2dvi \- convert mudela to DVI .PP -.PP .SH "DESCRIPTION" ly2dvi is a shell script which creates input file for LaTeX, based on information from the output files from lilypond\&. diff --git a/Documentation/man/out/mi2mu.1 b/Documentation/man/out/mi2mu.1 index 836de8b0cc..12c08fd13f 100644 --- a/Documentation/man/out/mi2mu.1 +++ b/Documentation/man/out/mi2mu.1 @@ -1,11 +1,9 @@ .TH "LilyPond" "1" "1998" "Mi2mu" "The LilyPond package" .PP .PP -.PP .SH "NAME" Mi2mu \- convert MIDI to \fBmudela\fP(5) .PP -.PP .SH "DESCRIPTION" Mi2mu translates a MIDI input file to Mudela (GNU LilyPond source format)\&. Mi2mu is part of the GNU LilyPond music typesetting package\&. diff --git a/Documentation/man/out/mudela-book.1 b/Documentation/man/out/mudela-book.1 index 478df6e6eb..ea1166057c 100644 --- a/Documentation/man/out/mudela-book.1 +++ b/Documentation/man/out/mudela-book.1 @@ -1,11 +1,9 @@ .TH "LilyPond" "1" "1998" "The LilyPond package" "mudela-book" .PP .PP -.PP .SH "NAME" mudela-book \- integrate LaTeX and mudela .PP -.PP .SH "DESCRIPTION" \fBmudela-book\fP is a script that helps integrating mudela and \&. mudela-book runs LilyPond on diff --git a/Documentation/mutopia.yo b/Documentation/mutopia.yo index 28e1bf4c58..e3f5c55201 100644 --- a/Documentation/mutopia.yo +++ b/Documentation/mutopia.yo @@ -1,5 +1,3 @@ -node(Author mudela-book)(Mutopia)(Concept Index)(Top) - article(Mutopia project - manifesto)(HWN and JCN)() This is some random ranting about the Mutopia project, aka "Music To diff --git a/Documentation/ntweb/GNUmakefile b/Documentation/ntweb/GNUmakefile index 709c7875f8..4a25d2eafa 100644 --- a/Documentation/ntweb/GNUmakefile +++ b/Documentation/ntweb/GNUmakefile @@ -8,5 +8,13 @@ include $(depth)/make/stepmake.make default: do-doc +$(outdir)/%.html: %.yo + $(sed-version) < $< > $<.out + $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@ $<.out + rm -f $<.out + $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) \ + --index=http://www.cs.ruu.nl/people/hanwen/lilypond/index.html \ + --news=$(depth)/NEWS $@ + local-WWW: diff --git a/Documentation/ntweb/index.yo b/Documentation/ntweb/index.yo index 407e3d5497..a1c3777098 100644 --- a/Documentation/ntweb/index.yo +++ b/Documentation/ntweb/index.yo @@ -1,29 +1,26 @@ mailto(daboys@bga.com) article(LilyPond Windows NT 4.0 Distribution)(nemail(Jeffrey B. Reed)(daboys@bga.com))(label(contents)) -sect(Windows NT Distribution) +sect(Windows NT Binary Distribution) subsect(Introduction) label(introduction) -This web page is dedicated to the distrubution of LilyPond for Windows -NT 4.0. This package is covered under the GNU General Public License -and all of the source and documentation are available on the official -url(LilyPond -Homepage)(http://www.cs.ruu.nl/people/hanwen/lilypond/index.html). +This page is dedicated to the distribution of precompiled and preformatted +LilyPond binaries for Windows NT 4.0 . This package is covered under the +GNU General Public License and all of the source and documentation are +available on the official +url(LilyPond Homepage)(http://www.cs.ruu.nl/people/hanwen/lilypond/index.html). -LilyPond is the GNU Project music typesetter. This program can print -beautiful sheet music from a music definition file. It can also play -mechanical performances to a MIDI file. Features include multiple -staffs, meters, clefs, keys, lyrics, versatile input language, -cadenzas, beams, slurs, triplets, formatting scores, part -extraction. It includes a nice font of musical symbols. +includefile(../BLURB.in) link(Back to top)(contents) clearpage() subsect(NEWS) label(news) - -Version 1.0.3 is available +This is what the version @TOPLEVEL_VERSION@ brings: +verb( +top_of_NEWS +) link(Back to top)(contents) clearpage() @@ -53,7 +50,7 @@ clearpage() subsect(Download) label(download) itemize( - it()lurl(lilypond-1.0.3.zip) + it()lurl(lilypond-@TOPLEVEL_VERSION@.bin.zip) ) link(Back to top)(contents) @@ -68,14 +65,17 @@ itemize( it()Set your path variable for lilypond and TeX description( dit(batch file) - In a batch file you can add the following entry: nl() - bf(set path=%path%em(LilyPond-dir)\bin;em(MiKTeX-dir)\miktex\bin) - dit(Windows Environment) + In a batch file you can add the following entries: nl() + bf(set LILYPOND=em(LilyPond-dir)) nl() + bf(set path=%path%%LILYPOND%\bin;em(MiKTeX-dir)\miktex\bin) nl() + bf(set TEXINPUTS=%LILYPOND%\texmf\tex\lilypond;;) nl() + bf(set MFINPUTS=%LILYPOND%\texmf\mf\public\lilypond;;) nl() +COMMENT( dit(Windows Environment) In the Windows environment you can select properties menu of the My Computer icon. Click on the environment tag and add the following to the user variables path entry. nl() - bf(em(LilyPond-dir)\bin;em(MiKTeX-dir)\miktex\bin) + bf(em(LilyPond-dir)\bin;em(MiKTeX-dir)\miktex\bin)) ) nl() it() The first installation of LilyPond also requires these additional steps: @@ -108,6 +108,16 @@ clearpage() subsect(Running LilyPond) label(running) + +itemize( + it()Take a look at url(angles.ly)(angles.ly) + it()Save angles.ly to your local disk + it()From a Command Prompt run: nl() + bf(ly2dvi.py angles.ly) nl() + bf(dvips angles.dvi) nl() + bf(cmd /c angles.ps) nl() +) + link(Back to top)(contents) clearpage() @@ -125,3 +135,4 @@ itemize( link(Back to top)(contents) clearpage() + diff --git a/Documentation/programs.yo b/Documentation/programs.yo new file mode 100644 index 0000000000..c32fc41717 --- /dev/null +++ b/Documentation/programs.yo @@ -0,0 +1,21 @@ +COMMENT( +URG +don't try to make html from this +) +whentexinfo( +nodetext(Your Softs.) +chapter(Programs) + +COMMENT(prepare for texinfoing manpages) +redef(manpage)(5)() +redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1)) +redef(manpageauthor)(0)(sect(Authors)) +redef(manpagesection)(1)(sect(ARG1)) + +redef(includefile)(1)(INCLUDEFILE(man/ARG1)) +includefile(convert-mudela.yo) +includefile(lilypond.yo) +includefile(ly2dvi.yo) +includefile(mi2mu.yo) +includefile(mudela-book.yo) +) diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index cf44f1cb42..9c6aa43a65 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -608,14 +608,13 @@ These commands constitute `Music', and have a duration of 0. sect(Properties) -By default the same accidentals are valid for all octaves, but - this can be changed with the property code(specialaccidentals). +By default the same key signature is valid for all octaves, but + this can be changed with the property code(keyoctaviation). The identifier code(\specialkey) sets the property for the Staff. A -key with two flats in one octave and three - sharps in the next can be declared with verb(\specialkey -\accidentals bes es fis' cis' gis';) +key with two flats in one octave and three sharps in the next can be +declared with verb(\specialkey \keysignature bes es fis' cis' gis';) sect(Music fragments) label(tutorial:music-fragments) diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo index c7fe41086e..9878ae3550 100644 --- a/Documentation/tex/tutorial.yo +++ b/Documentation/tex/tutorial.yo @@ -10,16 +10,43 @@ Yodl-1.30.18 to convert this to tex or html. TODO +need to rethink paper size stuff? + +pipethrough(date) sucks. + +paragraphs have too much space. + in stead <-> instead ) +COMMENT( + Mainly written by Han-Wen Nienhuys, + + with help of (among others) + + * Jan Nieuwenhuizen + + * Lambert Meertens, + + * Adrian Mariano + + * Mats Bengtsson + +) + htmlbodyopt(bgcolor)(white) htmlcommand() -latexpackage()(a4wide) latexlayoutcmds( -%\usepackage[latin1]{inputenc} -\input mudela-book + \topmargin -0.25in + \textheight 53\baselineskip + \advance\textheight by \topskip + \marginparwidth 1 in % Width of marginal notes. + \oddsidemargin 0.25 in % Note that \oddsidemargin = \evensidemargin + \evensidemargin 0.25 in + \marginparwidth 0.75 in + \textwidth 5.875 in % Width of text line. + \input mudela-book ) whenlatex(notableofcontents()) @@ -29,12 +56,6 @@ article(Mudela, the Music-Definition Language) (Han-Wen Nienhuys and Jan Nieuwenhuizen) (nop()PIPETHROUGH(date "+%B %d, %Y")()()nop()) -COMMENT( - -* paragraphs have too much space. - -) - latexcommand(\def\interexample{}) latexcommand(\def\preexample{\par}) @@ -78,7 +99,7 @@ If you are not familiar with the English terms for music notation, you should consult bind(Appendix)ref(glossary): it contains a glossary of musical terms along with translations in some other languages. -If you want to try the examples given here, you should have look a +If you want to try the examples given here, you should have a look at bind(Section)ref(sec:running-lilypond) first. sect(Music copying, music definition and music entry) @@ -262,8 +283,8 @@ verb(\score { \melodic { X Y Z } \paper {} }) -We will continue to leave out the red tape this, until the time is fit to explain what the -above it means. +We will continue to leave out the red tape this, until the time is right to explain what +it means. Because LilyPond uses a language, it is a so called em(batch) @@ -271,7 +292,7 @@ program. This means, that you use a text editor (such as code(emacs) or code(vi)) to create an input file. When you are done editing your input file, you save it, and you -run LilyPond on the file. If Lily finds any errors in your input file +run LilyPond on the file. If LilyPond finds any errors in your input file then nop(she)footnote(We're sure that if computer programs could have gender, LilyPond would be a female computer program. So we will refer to the program as a she. This gender-bending is not to tease @@ -286,7 +307,7 @@ will complain. If everything went well, then she'll generate a file, that you can process further to view or print. Using LilyPond to print or view some music is a four-step procedure. -To get you started we'll run down the full procedure for you once. +To get you started we'll run down the full procedure for you. enumerate( it() @@ -466,7 +487,7 @@ previous example can be reduced to verb( If you entered this, you probably made some little errors with the right amount of quotes as well. To remedy this, mudela has another -feature called `relative octaves', which reduces the amount of quotes +feature called `relative octaves', which reduces the number of quotes needed. If you want to enter large pieces of music em(now) we recommend you make an excursion to bind(Section)ref(sec:relativeoctaves) and learn about relative @@ -686,17 +707,21 @@ dit(code(\key) var(pitch)) This command changes the current key signature. The is the name of the corresponding major key. The key of C-minor can thus be specified as `code(\key es)'. -dit(code(\accidentals) var(pitchlist)) +dit(code(\keysignature) var(pitchlist)) -This command changes the current key signature. The signature is -given in the form of a list of accidentals, which can be useful for -unconventional keys. The key of C-minor can be specified as -`code(\accidentals bes es as)'. The command `code(\accidentals fis es -bis)' provides a more exotic example. +This command changes the current key signature. Unlike the +`code(\key)' command, this command can produce arbitrary key +signatures, which can be useful for unconventional keys or modes. The +key signature is given in the form of a list of notes. The notes will +be printed in the key signature in the order that they appear on the list. +For example, the key +of C-minor can be specified as `code(\accidentals bes es as)'. The +command `code(\accidentals fis es bis)' provides a more exotic +example. dit(code(\time) var(numerator)code(/)var(denominator)) - This command chages the current time signature. LilyPond uses the + This command changes the current time signature. LilyPond uses the time signature to calculate where to place the bars that start a measure. These bars in turn are the places where a system can be broken into lines. @@ -722,22 +747,32 @@ is printed. LilyPond will act as if you are again at the start of a measure. dit(code(\bar) var(bartype)) - This command lets you print special bar lines, such as repeats. You - can also use it to allow line breaks when entering cadenzas. The - argument var(bartype) is a string that describes what kind of bar line to print. + This command lets you print special bar + lines and repeat symbols. You can also use it to allow line breaks + when entering cadenzas. The argument var(bartype) is a string that + describes what kind of bar line to print. mudela(fragment,verbatim)( \bar "|:"; c'4 \bar ":|:"; c'4 \bar ":|"; c'4 \bar "||"; c'4 \bar "empty"; c'4 \bar "|."; ) The command `code(\bar "empty")' does not create any visible bar - line, but it does tells LilyPond to allow a linebreak - at that position. + line, but it does tells LilyPond to allow a linebreak + at that position. The `code(\bar)' command prints the specified + symbol immediately. If you give a `code(\bar)' command at the end + of a measure then + the specified symbol replaces the automatic bar line; otherwise + the specified symbol appears in the middle of the measure. The + code(\bar) command does not affect metric structure. + + dit(code(\partial) var(duration)) some music starts with a measure that isn't fully filled, a so-called upstep. The code(\partial) command allows you to make upsteps. The argument is a duration similar to the duration of a note. +The `code(\partial)' command cannot be used to generate partial +measures in the middle of the music. Example: mudela(fragment,verbatim)( \time 4/4; @@ -1682,9 +1717,9 @@ The mechanism of context selection can be used to fabricate an Urtext and an edited edition from em(one source). We will use the first few bars of bind(J.)bind(S.)Bach's lovely Cello suite bind(no.)I to demonstrate this. The example makes heavy use of space rests: a space -rest is a like a rest that doesn't print anything. It can be used as -a placeholder, to attach articulation marks to. It is entered as a -note with the name code(s). +rest takes up time, like a rest does, but it doesn't print anything. +It can be used as a placeholder, to attach articulation marks to. It +is entered as a note with the name code(s). mudela(verbatim)( bach = \melodic { [c16 g e' d'] [e' g e' g] } diff --git a/Documentation/topdocs/AUTHORS.yo b/Documentation/topdocs/AUTHORS.yo index 4db956cde2..74406656fd 100644 --- a/Documentation/topdocs/AUTHORS.yo +++ b/Documentation/topdocs/AUTHORS.yo @@ -1,7 +1,7 @@ article(AUTHORS - who did what on GNU LilyPond?)()() -This file lists authors of GNU LilyPond, and what they wrote. -This list is alphabetically ordered. +This file lists authors of GNU LilyPond, and what they wrote. This +list is alphabetically ordered. itemize( it()nemail(Mats Bengtsson)(matsb@s3.kth.se), @@ -25,11 +25,11 @@ it()nemail(David R. Linn)(drl@vuse.vanderbilt.edu), it()nemail(Han-Wen Nienhuys)(hanwen@cs.uu.nl), lurl(http://www.cs.uu.nl/~hanwen) nl() - Main author. + Main author (initials: HWN). it()nemail(Jan Nieuwenhuizen)(janneke@gnu.org), lurl(http://www.xs4all.nl/~jantien) nl() - Main author + Main author (initials: JCN). it()nemail(Alexandre Oliva)(oliva@dcc.unicamp.br), lurl(http://sunsite.unicamp.br/~oliva) testing diff --git a/Documentation/topdocs/INSTALL.yo b/Documentation/topdocs/INSTALL.yo index 19716b51d6..60c78c73ec 100644 --- a/Documentation/topdocs/INSTALL.yo +++ b/Documentation/topdocs/INSTALL.yo @@ -24,11 +24,17 @@ it()A GNU system: GNU LilyPond is known to run on these GNU systems: Linux (PPC, intel), FreeBSD, AIX, NeXTStep, IRIX, Digital Unix and Solaris. +it()Lots of disk space: LilyPond takes between 50 and 100 mb to +compile if you use debugging information. If you are short on +disk-space run configure with code(--disable-debugging). + Although we recommend to use Unix, LilyPond is known to run on Windows NT/95/98 as well. See Section ref(w32). it() GNU C++ version 2.7 or newer (2.8 and egcs are also fine). -it() Python 1.5 +it() Python 1.5 (Strictly speaking, you shouldn't need Python for + compiling and installing, but you'll need it to regenerate the font + tables, e.g.). ) sect(RUNNING) @@ -48,15 +54,29 @@ Although not strictly necessary, these are recommended to have. itemize( it()GNU make. +Check out lurl(ftp://ftp.gnu.org) +or any mirror of this site. + it()Flex (version 2.5.4 or newer). +Check out lurl(ftp://ftp.gnu.org) +or any mirror of this site. it()Bison (version 1.25 or newer). -it()Python (version 1.5 or newer). +Check out lurl(ftp://ftp.gnu.org) +or any mirror of this site. + +it()Python (version 1.5 or newer). Check out +lurl(ftp://ftp.python.org) or lurl(ftp://ftp.cwi.nl/pub/python). + it()Yodl. All documentation will be in Yodl. (1.30.17) lurl(ftp://pcnov095.win.tue.nl/pub/yodl) lurl(http://www.cs.uu.nl/~hanwen/yodl) it()Texinfo. (version 3.12 or newer) it()GNU find +Check out lurl(ftp://ftp.gnu.org) +or any mirror of this site + + it() A fast computer (a full page of music typically takes 1 minute on my 486/133, using the bf(--enable-checking) compile. It's lot slower than most MusiXTeX preprocessors) @@ -197,8 +217,8 @@ and for the profiling version, I specify a different configuration. verb( configure --prefix=~ --enable-profiling --enable-config=optprof --enable-optimise --disable-checking - make configuration=optprof - make configuration=optprof install + make config=optprof + make config=optprof install ) diff --git a/Documentation/topinfo.yo b/Documentation/topinfo.yo index 017486895f..0eff2fc942 100644 --- a/Documentation/topinfo.yo +++ b/Documentation/topinfo.yo @@ -1,37 +1,36 @@ +COMMENT( +URG +don't try to make html from this +) +whentexinfo( +nodetext(Your Rights.) +chapter(Copying) +LilyPond is Free Software. See file(COPYING) for details. -node()(Top)(Copying)((dir)) -menu( -mit(Copying)( Your rights.) -mit(Programs)( Your softs.) -mit(Mutopia)( Your music.) -mit(Concept Index)( Your index.) -) +COMMENT(prepare for texinfoing manpages) +redef(manpage)(5)() +redef(manpagename)(2)(nodeprefix()nodetext(ARG2)chapter(ARG1)nodeprefix(ARG1)) +redef(manpageauthor)(0)(sect(Authors)) +redef(manpagesection)(1)(sect(ARG1)) -node(Top)(Copying)(Programs)(Top) -chapter(COPYING) -LilyPond is Free Software. See file(COPYING) for details. +COMMENT(redef(includefile)(1)(INCLUDEFILE(man/ARG1))) +includefile(programs.yo) -node(Copying)(Programs)(convert-mudela)(Top) -menu( -mit(convert-mudela)( Convert Mudela) -mit(LilyPond)( The GNU Music Typsetter herself) -mit(Ly2dvi)( Lilypond Frontend) -mit(Mi2mu)( MIDI input) -mit(mudela-book)( Integrate LaTeX and mudela) -) +COMMENT(prepare for texinfoing articles) +redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1)) +redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Tutorial)) -whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/convert-mudela.texinfo)) -whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/lilypond.texinfo)) -whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/ly2dvi.texinfo)) -whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/mi2mu.texinfo)) -whentexinfo(texinfocommand(@include man/DOEXPAND(outdir)/mudela-book.texinfo)) -whentexinfo(texinfocommand(@include DOEXPAND(outdir)/mutopia.texinfo)) +redef(includefile)(1)(INCLUDEFILE(tex/ARG1)) +includefile(tutorial.yo) + +COMMENT(prepare for texinfoing articles) +redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(ARG1)) +redef(article)(3)(nodeprefix()chapter(ARG1)nodeprefix(Mutopia)) +redef(includefile)(1)(INCLUDEFILE(ARG1)) +includefile(mutopia.yo) nchapter(Concept Index) -node(Mutopia)(Concept Index)()(Top) COMMENT( urg makeindex()) -printndex() - -whentexinfo(texinfocommand(@bye)) - +printindex() +) diff --git a/INSTALL.txt b/INSTALL.txt index 11572c9d44..537727b2d7 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -39,11 +39,17 @@ o A GNU system: GNU LilyPond is known to run on these GNU systems: Linux (PPC, intel), FreeBSD, AIX, NeXTStep, IRIX, Digital Unix and Solaris. +o Lots of disk space: LilyPond takes between 50 and 100 mb to +compile if you use debugging information. If you are short on +disk-space run configure with --disable-debugging. + Although we recommend to use Unix, LilyPond is known to run on Windows NT/95/98 as well. See Section [w32]. o GNU C++ version 2.7 or newer (2.8 and egcs are also fine). -o Python 1.5 +o Python 1.5 (Strictly speaking, you shouldn't need Python for + compiling and installing, but you'll need it to regenerate the font + tables, e.g.). 3: RUNNING @@ -59,15 +65,28 @@ o A PostScript printer and/or viewer (such as Ghostscript) is strongly Although not strictly necessary, these are recommended to have. o GNU make. +Check out ftp://ftp.gnu.org +or any mirror of this site. + o Flex (version 2.5.4 or newer). +Check out ftp://ftp.gnu.org +or any mirror of this site. o Bison (version 1.25 or newer). -o Python (version 1.5 or newer). +Check out ftp://ftp.gnu.org +or any mirror of this site. + +o Python (version 1.5 or newer). Check out +ftp://ftp.python.org or ftp://ftp.cwi.nl/pub/python. + o Yodl. All documentation will be in Yodl. (1.30.17) ftp://pcnov095.win.tue.nl/pub/yodl http://www.cs.uu.nl/~hanwen/yodl o Texinfo. (version 3.12 or newer) o GNU find +Check out ftp://ftp.gnu.org +or any mirror of this site + o A fast computer (a full page of music typically takes 1 minute on my 486/133, using the --enable-checking compile. It's lot slower than most MusiXTeX preprocessors) @@ -187,8 +206,8 @@ following for the normal build, and for the profiling version, I specify a different configuration. configure --prefix=~ --enable-profiling --enable-config=optprof --enable-optimise --disable-checking - make configuration=optprof - make configuration=optprof install + make config=optprof + make config=optprof install 8: INSTALLING diff --git a/NEWS b/NEWS index 7447252788..2fc0ebd08f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,82 @@ + +pl 6 + - largish rehack: + * Super_element is now an `abstract' class, + * Paper_score directly contains one Line_of_score. The + breaking/postprocessing/deletion is mixed with the output phase. + * Hopefully this will save memory for large scores. (benchmarks, anyone?) + * bf: Horizontal_vertical_group_item::do_unlink () should call + + Axis_group_item::do_unlink () + + - changed LILYPOND to LILYPONDPREFIX + - added tfm and dvi target for mf/ + - reincluded english.ly + - doc fixes (thanks, Adrian Moriano) + - doc fixes. + - mf: ex height added. + +pl 5.mb1 + - Mudela 1.0.1: Changed \accidentals -> \keysignature + - Identifiers can be used in textual scripts: + + + tempoString="Allegro molto assai"; + + [...] + + c^\tempoString + + + +pl 5.jbr2 + - aclocal.m4,config.h.in,flower/file-path.cc: Added PATHSEP and + DIRSEP to configuration to support windows style path and pathlists. + - stepmake/bin/package-zip32.sh,stepmake/stepmake/package.make: + zip target now calls package-zip32.sh which creates winnt + binary distribution zip file. xzip target continues to use + package-zip.sh for Jan's cross-compiled version. + - lily/main.cc: Added a search for LILYPOND environment variable to + better facilitate binary distributions. + - Documentation/README-W32.yo: Updated information on running lilypond + on winnt. + + + +pl 5.jcn1 + - (step)make fixes from yodl + - minor doco fixes + - bf: patch in website after 'make release' + +pl 5.jbr1 + - Documentation/ntweb/Makefile: Used absolute url for LilyPond Homepage + - Documentation/ntweb/index.yo: Minor mods per Jan's suggestions + + + + +************* +pl 5 + +pl 4.jcn1 + - texinfo docs, lots of yodl TODO + - junked some makefiles + - ntweb: use BLURB + - bf: pletvisibility + - adaptions for yodl-1.31.2's automatic texinfo conversion + - reinclude of 1.jcn2: + - renamed -alto -> viola + - bf: avant-gardish six preludes + - bf: ly2dvi warnings + +pl 4.jbr1 + - stepmake/stepmake/install-outfiles.sub.make: fixed typo + - scripts/GNUmakefile: add ly2dvi32 to installation list and fixed + included executable-targets.make to facilate installation of scripts + - Documentation/ntweb: Fixes to nt web page and added topdoc like + automation. + +********* pl 4 pl 3.mb2 - Changed text script alignment: center -> left diff --git a/TODO b/TODO index 2ea55b7d59..7f8f4b5f9c 100644 --- a/TODO +++ b/TODO @@ -7,17 +7,23 @@ done, or is an idea that I want to think about Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr/urg - * add ex-dimension to feta-params. + * use streambufs to provide IO handling for TeX stream, mudela stream, +data-file. + * seriously buffer TeX output (do profile of writing .5 mb TeX file.) * strip EXEs before installing + * zip target for binary windows dist (JBR) + + * repeat bars: need distance after ":|" and before "|:" + + * doco should not depend on a4 + * text continuationss * fix plain tex footer line. - * portable libs for flowerlib/lilylib - * install TeX stuff into tex/generic directory. * preformatted .info stuff. @@ -89,9 +95,6 @@ grep for TODO and ugh/ugr/urg * make new VoiceOne, VoiceTwo, VoiceThree contexts with ydirection and hshift preset - * StepMake install - - /usr/bin/make-patch? - * *.yo: fix pod manpage layout legacy * text-items clash with stems/beams @@ -155,6 +158,7 @@ ydirection and hshift preset - plet -> tuplet - measure -> bar - abbreviation-beam -> (measured/unmeasured) tremolo + - partial -> anacrouse * libtoolize flowerlib @@ -206,8 +210,6 @@ ydirection and hshift preset * clefs (AG): The "8" should appear closer to the actual clef, touching it. - * give Items/Spanners access to unbroken originals - * scoping for properties? { c4 diff --git a/VERSION b/VERSION index 875f4fb000..f2ec42359f 100644 --- a/VERSION +++ b/VERSION @@ -1,9 +1,11 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_LEVEL=4 +PATCH_LEVEL=6 MY_PATCH_LEVEL= -# use the above to send patches, always empty for released version: -# please don't move these comments up; the patch should fail if +# use the above to send patches: MY_PATCH_LEVEL is always empty for a +# released version. +# +# Please don't move these comments up; the patch should fail if # the previous version was wrong. diff --git a/aclocal.m4 b/aclocal.m4 index 660b3aca0a..9947522568 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,11 +1,14 @@ +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/stepmake/../aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in AC_DEFUN(AC_STEPMAKE_COMPILE, [ # -O is necessary to get inlining - OPTIMIZE="-O" + OPTIMIZE="" + CXXFLAGS=${CXXFLAGS:-""} checking_b=yes - optimise_b=tja + optimise_b=no profile_b=no debug_b=yes @@ -14,7 +17,11 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ [checking_b=$enableval] ) # actually, the default is: tja='-O' to get inlining... - # off='' + # off='' --jcn + + #actually, that sucks. + # tja looks like a typo. Default is optimisation off. --hwn + AC_ARG_ENABLE(optimise, [ enable-optimise use maximal speed optimisations. Default: off], [optimise_b=$enableval]) @@ -45,8 +52,7 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ fi if test "$optimise_b" = yes; then - DEFINES="$DEFINES -finline-functions" - OPTIMIZE="-O2" + OPTIMIZE="-O2 -finline-functions" fi if test "$optimise_b" = no; then @@ -55,11 +61,11 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ if test $profile_b = yes; then EXTRA_LIBES="-pg" - DEFINES="$DEFINES -pg" + OPTIMIZE="$OPTIMIZE -pg" fi if test $debug_b = yes; then - DEFINES="$DEFINES -g" + OPTIMIZE="$OPTIMIZE -g" fi # however, C++ support in mingw32 v 0.1.4 is still flaky @@ -88,7 +94,8 @@ AC_DEFUN(AC_STEPMAKE_CXX, [ AC_CHECK_HEADER(FlexLexer.h, true, AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly)) - CXXFLAGS="$DEFINES $OPTIMIZE" + CPPFLAGS="$CPPFLAGS $DEFINES" + CXXFLAGS="$CXXFLAGS $OPTIMIZE" LDFLAGS=$EXTRA_LIBES AC_SUBST(CXXFLAGS) @@ -129,9 +136,9 @@ AC_DEFUN(AC_STEPMAKE_DATADIR, [ AC_DEFUN(AC_STEPMAKE_END, [ AC_OUTPUT($CONFIGFILE.make:config.make.in) - rm -f Makefile - cp make/toplevel.make.in ./Makefile - chmod 444 Makefile + rm -f GNUmakefile + cp make/toplevel.make.in ./GNUmakefile + chmod 444 GNUmakefile ]) AC_DEFUN(AC_STEPMAKE_GXX, [ @@ -189,6 +196,12 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ stepmake=stepmake AC_SUBST(stepmake) + STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null` + if test "x$STATE_VECTOR" != "x"; then + STATE_VECTOR="\$(depth)/$STATE_VECTOR" + fi + AC_SUBST(STATE_VECTOR) + CONFIGSUFFIX= AC_ARG_ENABLE(config, [ enable-config=FILE put configure settings in config-FILE.make], @@ -231,20 +244,30 @@ dnl fi AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then - LN=cp # hard link does not work under cygnus-nt (yet?) + LN=cp # hard link does not work under cygnus-nt + LN_S=cp # symbolic link does not work for native nt ZIP="zip -r -9" # DOTEXE=.exe - INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c" + DIRSEP='\\' + PATHSEP=';' + INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c" else + DIRSEP='/' + PATHSEP=':' LN=ln + LN_S='ln -s' ZIP="zip -r -9" INSTALL="\$(stepdir)/../bin/install-sh -c" fi AC_SUBST(DOTEXE) AC_SUBST(ZIP) AC_SUBST(LN) + AC_SUBST(LN_S) AC_SUBST(INSTALL) - + AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}') + AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}') + + AC_STEPMAKE_DATADIR ]) diff --git a/config.hh.in b/config.hh.in index 69939cf55a..48542789c4 100644 --- a/config.hh.in +++ b/config.hh.in @@ -24,3 +24,6 @@ /* define if explicit instantiation is needed */ #undef NEED_EXPLICIT_INSTANTIATION +/* define directory and path separators */ +#define DIRSEP '@DIRSEP@' +#define PATHSEP '@PATHSEP@' diff --git a/config.make.in b/config.make.in index 25bfe5945a..e15719086f 100644 --- a/config.make.in +++ b/config.make.in @@ -15,6 +15,7 @@ PACKAGE = @PACKAGE@ package = @package@ PACKAGE_NAME = @PACKAGE_NAME@ stepmake = @stepmake@ +state-vector = @STATE_VECTOR@ CONFIGSUFFIX = @CONFIGSUFFIX@ MAKEINFO = @MAKEINFO@ ICFLAGS = @ICFLAGS@ @@ -44,6 +45,7 @@ BISON = @BISON@ FIND = @FIND@ FLEX = @FLEX@ LN = @LN@ +LN_S = @LN_S@ MSGFMT = @MSGFMT@ PERL = @PERL@ PYTHON = @PYTHON@ diff --git a/configure b/configure index e3925f717b..d5e61aee35 100755 --- a/configure +++ b/configure @@ -627,6 +627,12 @@ EOF stepmake=stepmake + STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null` + if test "x$STATE_VECTOR" != "x"; then + STATE_VECTOR="\$(depth)/$STATE_VECTOR" + fi + + CONFIGSUFFIX= # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -649,7 +655,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:653: checking host system type" >&5 +echo "configure:659: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -674,7 +680,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:678: checking for $ac_word" >&5 +echo "configure:684: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -708,7 +714,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:712: checking for $ac_word" >&5 +echo "configure:718: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -745,7 +751,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:749: checking for $ac_word" >&5 +echo "configure:755: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -779,7 +785,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:783: checking for $ac_word" >&5 +echo "configure:789: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -812,7 +818,7 @@ test -n "$BASH" || BASH="/bin/sh" # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:816: checking for $ac_word" >&5 +echo "configure:822: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -875,12 +881,18 @@ fi if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then - LN=cp # hard link does not work under cygnus-nt (yet?) + LN=cp # hard link does not work under cygnus-nt + LN_S=cp # symbolic link does not work for native nt ZIP="zip -r -9" # DOTEXE=.exe - INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c" + DIRSEP='\\' + PATHSEP=';' + INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c" else + DIRSEP='/' + PATHSEP=':' LN=ln + LN_S='ln -s' ZIP="zip -r -9" INSTALL="\$(stepdir)/../bin/install-sh -c" fi @@ -888,7 +900,17 @@ fi + + cat >> confdefs.h <> confdefs.h <&6 -echo "configure:1009: checking for $ac_word" >&5 +echo "configure:1035: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1034,7 +1060,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1038: checking for $ac_word" >&5 +echo "configure:1064: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1082,7 +1108,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1086: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1112: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1092,11 +1118,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1116,12 +1142,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1120: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1146: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1125: checking whether we are using GNU C" >&5 +echo "configure:1151: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1130,7 +1156,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1145,7 +1171,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1149: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1175: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1202,7 +1228,7 @@ EOF fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1206: checking how to run the C++ preprocessor" >&5 +echo "configure:1232: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1215,12 +1241,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1251,7 +1277,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1255: checking for $ac_word" >&5 +echo "configure:1281: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1282,7 +1308,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1286: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1312: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1292,11 +1318,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1316,12 +1342,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1320: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1346: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1325: checking whether we are using GNU C++" >&5 +echo "configure:1351: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1330,7 +1356,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1345,7 +1371,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1349: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1375: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1375,17 +1401,17 @@ fi ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:1379: checking for FlexLexer.h" >&5 +echo "configure:1405: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1411,7 +1437,8 @@ else fi - CXXFLAGS="$DEFINES $OPTIMIZE" + CPPFLAGS="$CPPFLAGS $DEFINES" + CXXFLAGS="$CXXFLAGS $OPTIMIZE" LDFLAGS=$EXTRA_LIBES @@ -1434,12 +1461,12 @@ fi echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 -echo "configure:1438: checking whether explicit instantiation is needed" >&5 +echo "configure:1465: checking whether explicit instantiation is needed" >&5 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct foo { static int baz; }; @@ -1449,7 +1476,7 @@ int main() { return foo::baz; ; return 0; } EOF -if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* lily_cv_need_explicit_instantiation=no else @@ -1476,7 +1503,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1480: checking for $ac_word" >&5 +echo "configure:1507: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1518,7 +1545,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1522: checking for $ac_word" >&5 +echo "configure:1549: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1552,7 +1579,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1556: checking for $ac_word" >&5 +echo "configure:1583: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1619,7 +1646,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1623: checking for $ac_word" >&5 +echo "configure:1650: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1651,7 +1678,7 @@ test -n "$AR" || AR="error" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1655: checking for $ac_word" >&5 +echo "configure:1682: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1706,7 +1733,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:1710: checking language" >&5 +echo "configure:1737: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -1742,7 +1769,7 @@ EOF echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:1746: checking for gettext in -lintl" >&5 +echo "configure:1773: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1750,7 +1777,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1794,12 +1821,12 @@ fi for ac_func in gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1798: checking for $ac_func" >&5 +echo "configure:1825: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1857,7 +1884,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1861: checking for $ac_word" >&5 +echo "configure:1888: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1887,7 +1914,7 @@ done test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh " echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6 -echo "configure:1891: checking whether msgfmt accepts -o" >&5 +echo "configure:1918: checking whether msgfmt accepts -o" >&5 msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`" if test "$msgfmt_output" = ""; then echo "$ac_t""yes" 1>&6 @@ -1940,7 +1967,7 @@ fi echo $ac_n "checking TeX/MF root dir directory""... $ac_c" 1>&6 -echo "configure:1944: checking TeX/MF root dir directory" >&5 +echo "configure:1971: checking TeX/MF root dir directory" >&5 find_root_prefix="$prefix" @@ -1981,7 +2008,7 @@ echo "configure:1944: checking TeX/MF root dir directory" >&5 echo $ac_n "checking MF input directory""... $ac_c" 1>&6 -echo "configure:1985: checking MF input directory" >&5 +echo "configure:2012: checking MF input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name source -print |sort|head -1|sed 's#^\./##')` @@ -2006,7 +2033,7 @@ echo "configure:1985: checking MF input directory" >&5 echo $ac_n "checking TeX input directory""... $ac_c" 1>&6 -echo "configure:2010: checking TeX input directory" >&5 +echo "configure:2037: checking TeX input directory" >&5 find_dirdir=`(cd $find_texprefix; $FIND ./ -type d -a -name tex -print |sort|head -1|sed 's#^\./##')` @@ -2037,7 +2064,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2041: checking for $ac_word" >&5 +echo "configure:2068: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2071,7 +2098,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2075: checking for $ac_word" >&5 +echo "configure:2102: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2105,7 +2132,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2109: checking for $ac_word" >&5 +echo "configure:2136: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2138,7 +2165,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2142: checking for $ac_word" >&5 +echo "configure:2169: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2172,7 +2199,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2176: checking for $ac_word" >&5 +echo "configure:2203: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2206,7 +2233,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2210: checking for $ac_word" >&5 +echo "configure:2237: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2264,7 +2291,7 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl" echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2268: checking for 8-bit clean memcmp" >&5 +echo "configure:2295: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2272,7 +2299,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2303,12 +2330,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2307: checking for vprintf" >&5 +echo "configure:2334: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2358,12 +2385,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2362: checking for _doprnt" >&5 +echo "configure:2389: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2416,12 +2443,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2420: checking for $ac_func" >&5 +echo "configure:2447: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2486,7 +2513,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2490: checking for $ac_word" >&5 +echo "configure:2517: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2519,7 +2546,7 @@ test -n "$MAKEINFO" || MAKEINFO="error" result="`echo \"$YODL2TEXINFO\" | grep echo`" if test "x$YODL2TEXINFO" = "xerror" -o "x$result" != "x"; then - echo "configure: warning: can\'t find yodl. You should install Yodl 1.30.pre4 or better" 1>&2 + echo "configure: warning: can\'t find yodl. You should install Yodl 1.30.2 or better" 1>&2 warn_b=yes fi @@ -2663,6 +2690,7 @@ s%@package_depth@%$package_depth%g s%@AUTOGENERATE@%$AUTOGENERATE%g s%@absolute_builddir@%$absolute_builddir%g s%@stepmake@%$stepmake%g +s%@STATE_VECTOR@%$STATE_VECTOR%g s%@CONFIGSUFFIX@%$CONFIGSUFFIX%g s%@host@%$host%g s%@host_alias@%$host_alias%g @@ -2677,6 +2705,7 @@ s%@PYTHON@%$PYTHON%g s%@DOTEXE@%$DOTEXE%g s%@ZIP@%$ZIP%g s%@LN@%$LN%g +s%@LN_S@%$LN_S%g s%@INSTALL@%$INSTALL%g s%@DIR_DATADIR@%$DIR_DATADIR%g s%@subdirs@%$subdirs%g @@ -3015,8 +3044,8 @@ if test "$no_recursion" != yes; then fi - rm -f Makefile - cp make/toplevel.make.in ./Makefile - chmod 444 Makefile + rm -f GNUmakefile + cp make/toplevel.make.in ./GNUmakefile + chmod 444 GNUmakefile diff --git a/configure.in b/configure.in index ca80308b7d..275a9cae64 100644 --- a/configure.in +++ b/configure.in @@ -51,7 +51,7 @@ AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") AC_CHECK_PROGS(MAKEINFO, makeinfo, error) AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl, - You should install Yodl 1.30.pre4 or better) + You should install Yodl 1.30.2 or better) AC_STEPMAKE_END diff --git a/flower/file-path.cc b/flower/file-path.cc index 3b76d4b1dd..89c05dfb16 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -2,6 +2,7 @@ path.cc - manipulation of paths and filenames. */ #include +#include "config.hh" #include "file-path.hh" #include "flower-debug.hh" diff --git a/init/book-fragment.ly b/init/book-fragment.ly index 08a4a3c97a..0139e592cc 100644 --- a/init/book-fragment.ly +++ b/init/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.0"; +\version "1.0.1"; \include "declarations.ly" diff --git a/init/book-init.ly b/init/book-init.ly index 8ad5ef7a65..a2908e5e8d 100644 --- a/init/book-init.ly +++ b/init/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.0"; +\version "1.0.1"; \include "declarations.ly"; diff --git a/init/center-fragment.ly b/init/center-fragment.ly index 1b4c419c10..421c98e781 100644 --- a/init/center-fragment.ly +++ b/init/center-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.0"; +\version "1.0.1"; \include "declarations.ly" diff --git a/init/center.ly b/init/center.ly index 89b32b236c..39699af865 100644 --- a/init/center.ly +++ b/init/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.0"; +\version "1.0.1"; \include "declarations.ly" diff --git a/init/english.ly b/init/english.ly new file mode 100644 index 0000000000..518f5097f1 --- /dev/null +++ b/init/english.ly @@ -0,0 +1,86 @@ +%{ + abbreviations of english names for notes + + %} + +\notenames { + cff = \musicalpitch { -1 0 -2 } + cf = \musicalpitch { -1 0 -1 } + c = \musicalpitch { -1 0 0 } + cs = \musicalpitch { -1 0 1 } + css = \musicalpitch { -1 0 2 } + dff = \musicalpitch { -1 1 -2 } + df = \musicalpitch { -1 1 -1 } + d = \musicalpitch { -1 1 0 } + ds = \musicalpitch { -1 1 1 } + dss = \musicalpitch { -1 1 2 } + eff = \musicalpitch { -1 2 -2 } + ef = \musicalpitch { -1 2 -1 } + e = \musicalpitch { -1 2 0 } + es = \musicalpitch { -1 2 1 } + ess = \musicalpitch { -1 2 2 } + fff = \musicalpitch { -1 3 -2 } + ff = \musicalpitch { -1 3 -1 } + f = \musicalpitch { -1 3 0 } + fs = \musicalpitch { -1 3 1 } + fss = \musicalpitch { -1 3 2 } + gff = \musicalpitch { -1 4 -2 } + gf = \musicalpitch { -1 4 -1 } + g = \musicalpitch { -1 4 0 } + gs = \musicalpitch { -1 4 1 } + gss = \musicalpitch { -1 4 2 } + aff = \musicalpitch { -1 5 -2 } + af = \musicalpitch { -1 5 -1 } + a = \musicalpitch { -1 5 0 } + as = \musicalpitch { -1 5 1 } + ass = \musicalpitch { -1 5 2 } + bff = \musicalpitch { -1 6 -2 } + bf = \musicalpitch { -1 6 -1 } + b = \musicalpitch { -1 6 0 } + bs = \musicalpitch { -1 6 1 } + bss = \musicalpitch { -1 6 2 } + + + % + % upper case: 1 octave lower. + % + + + Cff = \musicalpitch { -2 0 -2 } + Cf = \musicalpitch { -2 0 -1 } + C = \musicalpitch { -2 0 0 } + Cs = \musicalpitch { -2 0 1 } + Css = \musicalpitch { -2 0 2 } + Dff = \musicalpitch { -2 1 -2 } + Df = \musicalpitch { -2 1 -1 } + D = \musicalpitch { -2 1 0 } + Ds = \musicalpitch { -2 1 1 } + Dss = \musicalpitch { -2 1 2 } + Eff = \musicalpitch { -2 2 -2 } + Ef = \musicalpitch { -2 2 -1 } + E = \musicalpitch { -2 2 0 } + Es = \musicalpitch { -2 2 1 } + Ess = \musicalpitch { -2 2 2 } + Fff = \musicalpitch { -2 3 -2 } + Ff = \musicalpitch { -2 3 -1 } + F = \musicalpitch { -2 3 0 } + Fs = \musicalpitch { -2 3 1 } + Fss = \musicalpitch { -2 3 2 } + Gff = \musicalpitch { -2 4 -2 } + Gf = \musicalpitch { -2 4 -1 } + G = \musicalpitch { -2 4 0 } + Gs = \musicalpitch { -2 4 1 } + Gss = \musicalpitch { -2 4 2 } + Aff = \musicalpitch { -2 5 -2 } + Af = \musicalpitch { -2 5 -1 } + A = \musicalpitch { -2 5 0 } + As = \musicalpitch { -2 5 1 } + Ass = \musicalpitch { -2 5 2 } + Bff = \musicalpitch { -2 6 -2 } + Bf = \musicalpitch { -2 6 -1 } + B = \musicalpitch { -2 6 0 } + Bs = \musicalpitch { -2 6 1 } + Bss = \musicalpitch { -2 6 2 } + + +} diff --git a/init/fragment.ly b/init/fragment.ly index 1b4c419c10..421c98e781 100644 --- a/init/fragment.ly +++ b/init/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.0"; +\version "1.0.1"; \include "declarations.ly" diff --git a/init/init.fly b/init/init.fly index 3d94ef25ed..31fbbe0698 100644 --- a/init/init.fly +++ b/init/init.fly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.0"; +\version "1.0.1"; \include "declarations.ly" diff --git a/init/init.ly b/init/init.ly index 91fa45796d..7f62919272 100644 --- a/init/init.ly +++ b/init/init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.0"; +\version "1.0.1"; \include "declarations.ly"; diff --git a/init/paper16.ly b/init/paper16.ly index 336a7fe737..8ce2fb67ed 100644 --- a/init/paper16.ly +++ b/init/paper16.ly @@ -6,7 +6,7 @@ -\version "1.0.0"; +\version "1.0.1"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/init/paper20.ly b/init/paper20.ly index 1977147a96..c156edb8dd 100644 --- a/init/paper20.ly +++ b/init/paper20.ly @@ -5,7 +5,7 @@ \include "table13.ly"; \include "table16.ly"; -\version "1.0.0"; +\version "1.0.1"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/init/property.ly b/init/property.ly index a53eccbf6e..999a8307b4 100644 --- a/init/property.ly +++ b/init/property.ly @@ -14,7 +14,8 @@ ydirection 0 stem direction free \stemboth ydirection 1 force stem up \stemup pletvisibility 0 show nothing pletvisibility 1 show number -pletvisibility 2 show number, and bracket-if-no-beam +pletvisibility 2 show (number and bracket)-if-no-beam +pletvisibility 3 show number, and bracket-if-no-beam pletvisibility 4 show number, and bracket slurdash 0 normal slurs @@ -44,8 +45,8 @@ beamquantisation 1 quantise pos and slope \beamposnormal beamquantisation 2 quantise avoide wedge2) \beampostraditional [Staff] -specialaccidentals 0 Accidental for all octaves \normalkey -specialaccidentals 1 Accidental only for specified octave \specialkey +keyoctaviation 0 Key signature only for specified octave \specialkey +keyoctaviation 1 Key signature for all octaves \normalkey [Staff?] @@ -209,7 +210,7 @@ pletoff = { \property Voice.pletvisibility = 0 } pleton = { - \property Voice.pletvisibility = 2 + \property Voice.pletvisibility = 3 } tiny = { \property Voice.fontsize= "-2" @@ -250,15 +251,15 @@ graceat = \melodic { ecarg = \melodic { \property Voice.pletvisibility = 0 \] - \property Voice.pletvisibility = 2 + \property Voice.pletvisibility = 3 } %} normalkey = { - \property Staff.specialaccidentals = 0 + \property Staff.keyoctaviation = 1 } specialkey = { - \property Staff.specialaccidentals = 1 + \property Staff.keyoctaviation = 0 } diff --git a/input/keys.ly b/input/keys.ly index 134351df3c..2adf18aa12 100644 --- a/input/keys.ly +++ b/input/keys.ly @@ -1,18 +1,18 @@ -\version "1.0.0"; +\version "1.0.1"; blah = \melodic { \transpose c'' { \time 4/4; - \accidentals es; + \keysignature es; [cis8 d e f] [e! a b cis'] | es e f e a a' a a' | \clef "bass"; } [es16 c' b a] [g f es d] [c d es d] [c Bes As G] | \clef "violin"; - \accidentals c; + \keysignature c; cis4 c cis cis | cis dis2 ~ | \time 2/4 ; diff --git a/input/kortjakje.ly b/input/kortjakje.ly index b3f68e393f..b32df6721f 100644 --- a/input/kortjakje.ly +++ b/input/kortjakje.ly @@ -10,7 +10,7 @@ copyright = "public domain"; Tested Features: example file with comments %} -\version "1.0.0"; +\version "1.0.1"; % the % is a comment. diff --git a/input/pedal.ly b/input/pedal.ly index 6810cfa6be..7cfb0b0900 100644 --- a/input/pedal.ly +++ b/input/pedal.ly @@ -24,7 +24,7 @@ % \lbheel \lbheel \lfheel \lftoe % \rbheel \rbtoe \rfheel \rftoe -\version "1.0.0"; +\version "1.0.1"; \score{ \melodic { diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index b198ed23f6..fe27b1a420 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -19,7 +19,7 @@ * organ staff... %} -\version "1.0.0"; +\version "1.0.1"; diff --git a/input/rhythm.ly b/input/rhythm.ly index a9624effb9..109ead0cc3 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.0.0"; +\version "1.0.1"; ritme = \melodic\transpose c'' { \partial 8; diff --git a/input/scales.ly b/input/scales.ly index 6c18cddc2f..dc4144ca25 100644 --- a/input/scales.ly +++ b/input/scales.ly @@ -12,7 +12,7 @@ copyright = "public domain"; % scales with accents. % -\version "1.0.0"; +\version "1.0.1"; blah = \melodic { \time 6/8; \transpose c { diff --git a/input/scripts.ly b/input/scripts.ly index bce1fb13ad..17fb060c23 100644 --- a/input/scripts.ly +++ b/input/scripts.ly @@ -1,5 +1,5 @@ -\version "1.0.0"; +\version "1.0.1"; blah = \melodic{ \transpose c'' { diff --git a/input/test/a.ly b/input/test/a.ly index 45c13fc8b5..d65526c2e0 100644 --- a/input/test/a.ly +++ b/input/test/a.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.0"; +\version "1.0.1"; shortlong = \melodic\transpose c'{ c4()c( c c | diff --git a/input/test/beams.ly b/input/test/beams.ly index 686dca2388..4912d94725 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.0.0"; +\version "1.0.1"; \score{ < diff --git a/input/test/broken.ly b/input/test/broken.ly index 8f33fb5490..f4e4932a7a 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.0"; +\version "1.0.1"; shortlong = \melodic{ c4()c( c c | diff --git a/input/test/collisions.ly b/input/test/collisions.ly index ade5a27a95..d0fa529d20 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,7 +5,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.0.0"; +\version "1.0.1"; diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly index 7dd60edfb8..be5fea4a6d 100644 --- a/input/test/denneboom.ly +++ b/input/test/denneboom.ly @@ -7,7 +7,7 @@ TestedFeatures = "This file tests silly line shapes"; \include "paper20.ly" -\version "1.0.0"; +\version "1.0.1"; oden = \lyric{ O8 | diff --git a/input/test/font-body.ly b/input/test/font-body.ly index be1e3f0d98..6b4ca16955 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.0.0"; +\version "1.0.1"; FontBody= \melodic\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 2063e9fb96..f139a81f1a 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.0"; +\version "1.0.1"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 9b2d190f79..2540a40788 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.0"; +\version "1.0.1"; \include "font-body.ly" \score{ diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 9d82c7aa42..4263aeae1e 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -4,7 +4,7 @@ copyright = "PD"; TestedFeatures = "This file tests some nasty Gourlay spacings"; } -\version "1.0.0"; +\version "1.0.1"; %{ diff --git a/input/test/knee.ly b/input/test/knee.ly index eedb742039..2d6f9beb13 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.0.0"; +\version "1.0.1"; \score{ \melodic\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 7fec239ef5..a63a95a592 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.0"; +\version "1.0.1"; shortlong = \melodic{ c4()c( c c | diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 7b4f14bf87..6e733c02e1 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.0.0"; +\version "1.0.1"; \score{ \melodic\relative c'{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index d723fbb618..cd49211b87 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.0.0"; +\version "1.0.1"; \score{ \melodic\transpose c'{ diff --git a/input/test/spacing.ly b/input/test/spacing.ly index e8c72ce3f7..9c1fc724c7 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.0.0"; +\version "1.0.1"; multipart = \melodic{ \type StaffGroup < diff --git a/input/test/stem.ly b/input/test/stem.ly index 6df99dd73f..7bc33a1b4a 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.0.0"; +\version "1.0.1"; beamintervals = \melodic{ \time 7/4; diff --git a/input/test/title.ly b/input/test/title.ly index 50209186cd..30869a2225 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.0.0"; +\version "1.0.1"; \score{ \melodic diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 3c6dac9233..d2b9011647 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -2,9 +2,9 @@ Hi all, I have extend Mats' patches to allow accidental transposition: - \accidentals bes es fis; + \keysignature bes es fis; = \transpose d => - \accidentals gis; + \keysignature gis; As you can see in output the example file "test.ly" there are a few problems left: - key undo (already in the Todo) @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; vOne = \melodic \relative c''{ \clef"violin"; @@ -39,12 +39,12 @@ vTwo = \melodic \relative c''\transpose d' { \vOne } vThree = \melodic \relative c''{ \clef"violin"; - \accidentals fis cis; + \keysignature fis cis; \time 2/4 ; d4 d | - \accidentals bes es fis; + \keysignature bes es fis; fis4 fis | - \accidentals fis cis gis dis ais eis; + \keysignature fis cis gis dis ais eis; cis4 ais4 | } diff --git a/input/tril.ly b/input/tril.ly index f7d64a5676..ce996bcf1a 100644 --- a/input/tril.ly +++ b/input/tril.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests trills" "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.0"; +\version "1.0.1"; \score{ \melodic{ diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index eb2cd8e9a3..da173b7487 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -12,7 +12,7 @@ copyright = "public domain"; Tested Features lyrics and chords %} -\version "1.0.0"; +\version "1.0.1"; melodie = \melodic\relative c { \clef"violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index 926f7abafb..3c3a054371 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -15,7 +15,7 @@ copyright = "public domain"; Tested Features: lyrics, interleaving lyrics and staffs %} -\version "1.0.0"; +\version "1.0.1"; melody = \melodic \relative c'' { \clef violin; diff --git a/lily/GNUmakefile b/lily/GNUmakefile index 47338e5c36..52014326e8 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -17,10 +17,7 @@ include $(depth)/make/stepmake.make $(outdir)/my-lily-parser.o: $(outdir)/parser.hh $(outdir)/my-lily-lexer.o: $(outdir)/parser.hh $(outdir)/lexer.o: $(outdir)/parser.hh - - $(outdir)/lily-version.o: $(outdir)/version.hh - $(outdir)/main.o: $(outdir)/BLURB.hh $(outdir)/COPERTINA.hh $(outdir)/FLAPTEKST.hh diff --git a/lily/VERSION b/lily/VERSION index 875f4fb000..f2ec42359f 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,9 +1,11 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_LEVEL=4 +PATCH_LEVEL=6 MY_PATCH_LEVEL= -# use the above to send patches, always empty for released version: -# please don't move these comments up; the patch should fail if +# use the above to send patches: MY_PATCH_LEVEL is always empty for a +# released version. +# +# Please don't move these comments up; the patch should fail if # the previous version was wrong. diff --git a/lily/horizontal-group-elem.cc b/lily/horizontal-group-element.cc similarity index 100% rename from lily/horizontal-group-elem.cc rename to lily/horizontal-group-element.cc diff --git a/lily/horizontal-vertical-group-elem.cc b/lily/horizontal-vertical-group-element.cc similarity index 100% rename from lily/horizontal-vertical-group-elem.cc rename to lily/horizontal-vertical-group-element.cc diff --git a/lily/include/horizontal-vertical-group-item.hh b/lily/include/horizontal-vertical-group-item.hh index 2a6a0bf425..181d88ee4f 100644 --- a/lily/include/horizontal-vertical-group-item.hh +++ b/lily/include/horizontal-vertical-group-item.hh @@ -20,7 +20,9 @@ class Horizontal_vertical_group_item : public Axis_group_item, public Horizontal_vertical_group_element { protected: virtual void do_print() const; - virtual void do_unlink () { Horizontal_vertical_group_element::do_unlink (); } + virtual void do_unlink () { + Axis_group_item::do_unlink (); + } SCORE_ELEMENT_CLONE(Horizontal_vertical_group_item); public: Horizontal_vertical_group_item (); diff --git a/lily/include/item.hh b/lily/include/item.hh index 3201029829..bd38edcc0f 100644 --- a/lily/include/item.hh +++ b/lily/include/item.hh @@ -28,6 +28,7 @@ class Item : public virtual Score_element { public: Link_array attached_span_l_arr_; Drul_array broken_to_drul_; + Item *unbroken_original_l_; /// should be put in a breakable col. bool breakable_b_; diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh index d84e7bc27c..e7aaedbea1 100644 --- a/lily/include/lily-proto.hh +++ b/lily/include/lily-proto.hh @@ -222,7 +222,7 @@ struct String; struct Atom; struct Symtable; struct Symtables; -struct Super_elem; +struct Super_element; struct Translation_property; struct Tempo_req; struct Tex_stream; @@ -233,6 +233,7 @@ struct Text_engraver; struct Text_req; struct Text_spanner; struct Tie; +struct Tex_outputter; struct Tie_engraver; struct Tie_req; struct Time_description; diff --git a/lily/include/line-of-score.hh b/lily/include/line-of-score.hh index 894b39a5ba..2d0904f312 100644 --- a/lily/include/line-of-score.hh +++ b/lily/include/line-of-score.hh @@ -1,5 +1,5 @@ /* - scoreline.hh -- part of GNU LilyPond + line-of-score.hh -- part of GNU LilyPond (c) 1996--1998 Han-Wen Nienhuys */ @@ -9,9 +9,10 @@ #include "colhpos.hh" #include "spanner.hh" +#include "super-element.hh" /// the columns of a score that form one line. -class Line_of_score : public Spanner +class Line_of_score : public Spanner , public Super_element { public: Link_array cols; @@ -26,14 +27,14 @@ public: bool contains_b (Paper_column const *c) const; Link_array get_lines() const; - void set_breaking (Array const&); + Line_of_score * set_breaking (Array const&, int j) const; protected: virtual Link_array get_extra_dependencies () const; virtual void do_unlink (); virtual void do_junk_links (); - virtual void break_into_pieces (bool); + virtual Interval do_width() const; virtual void do_print() const; SCORE_ELEMENT_CLONE(Line_of_score); diff --git a/lily/include/p-score.hh b/lily/include/p-score.hh index a6b4dc2a9d..6cdfc5cda3 100644 --- a/lily/include/p-score.hh +++ b/lily/include/p-score.hh @@ -22,7 +22,9 @@ */ class Paper_score : public Music_output { - void tex_output (); + Tex_outputter *open_tex_outputter (Tex_stream*); + Tex_stream *open_output_stream (); + public: Paper_def *paper_l_; @@ -36,11 +38,9 @@ public: Pointer_list elem_p_list_; Outputter *outputter_l_; - Super_elem *super_elem_l_; - + Line_of_score * line_l_; + Paper_score (); - /// add a line to the broken stuff. Positions given in #config# - void set_breaking (Array const &); /// add to bottom of pcols @@ -67,18 +67,22 @@ public: virtual ~Paper_score(); protected: + + /* MAIN ROUTINES */ virtual void process(); // can't instantiate template with cygnus' gcc... // virtual ~Paper_score(); private: + + void remove_line (Line_of_score*); /// before calc_breaking void preprocess(); void calc_idealspacing(); /// calculate where the lines are to be broken, and use results - void calc_breaking(); + Array calc_breaking(); /// after calc_breaking void postprocess(); diff --git a/lily/include/score-element.hh b/lily/include/score-element.hh index 7a3211b234..bc4b64fe75 100644 --- a/lily/include/score-element.hh +++ b/lily/include/score-element.hh @@ -34,7 +34,7 @@ public: virtual void print () const; Paper_def *paper () const; - Lookup * lookup_l () const; + Lookup const *lookup_l () const; virtual ~Score_element (); DECLARE_MY_RUNTIME_TYPEINFO; @@ -76,7 +76,7 @@ public: protected: /** - Administration: Where are we?. This is mainly used by Super_elem and + Administration: Where are we?. This is mainly used by Super_element and Score_element::calcalute_dependencies () 0 means ORPHAN, diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh index d5688cb8e0..1cad1d8ebb 100644 --- a/lily/include/spanner.hh +++ b/lily/include/spanner.hh @@ -34,13 +34,13 @@ */ class Spanner : public virtual Score_element { public: - Drul_array spanned_drul_; void set_bounds (Direction d, Item*); DECLARE_MY_RUNTIME_TYPEINFO; virtual Spanner* access_Spanner (); Spanner (); + Spanner (Spanner const &); bool broken_b () const; virtual Array get_rods () const; Spanner* find_broken_piece (Line_of_score*) const; @@ -54,6 +54,7 @@ protected: virtual void break_into_pieces (); Link_array broken_into_l_arr_; + Spanner * unbroken_original_l_; virtual void do_unlink (); virtual void do_junk_links (); diff --git a/lily/include/super-element.hh b/lily/include/super-element.hh index a625b850ec..133fbb0072 100644 --- a/lily/include/super-element.hh +++ b/lily/include/super-element.hh @@ -1,5 +1,5 @@ /* - super-element.hh -- declare Super_elem + super-element.hh -- declare Super_element source file of the LilyPond music typesetter @@ -7,19 +7,16 @@ */ -#ifndef SUPER_ELEM_HH -#define SUPER_ELEM_HH +#ifndef Super_element_HH +#define Super_element_HH #include "score-element.hh" /** The toplevel element. The Paper_score contains this element, and any element shoud be a dependency for the super element. */ -class Super_elem : public Score_element { +class Super_element : public virtual Score_element { public: - Link_array lines_arr_; - Line_of_score * line_of_score_l_; - void add_broken_line (Line_of_score*); - Super_elem(); + Super_element(); void space_processing (); void pre_processing(); @@ -30,11 +27,7 @@ public: void unlink_all (); protected: - virtual void do_substitute_dependency (Score_element*,Score_element*); - virtual void handle_broken_dependencies(); - - virtual void do_add_processing(); DECLARE_MY_RUNTIME_TYPEINFO; }; -#endif // SUPER_ELEM_HH +#endif // Super_element_HH diff --git a/lily/item.cc b/lily/item.cc index ec4a583a07..610c6b5c08 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -15,6 +15,7 @@ Item::Item () { + unbroken_original_l_ =0; break_priority_i_ = 0; breakable_b_ = false; break_status_dir_ = CENTER; @@ -162,10 +163,13 @@ Item::do_unlink() do { if (s->spanned_drul_[d] == this) s->set_bounds (d, 0); - - } while ( flip (&d) != LEFT); + if (unbroken_original_l_ + && unbroken_original_l_-> broken_to_drul_[d] == this) + unbroken_original_l_->broken_to_drul_[d] = 0; + } while (flip (&d) != LEFT); } attached_span_l_arr_.set_size (0); + unbroken_original_l_ =0; } Paper_column * @@ -177,6 +181,7 @@ Item::column_l () const Item::Item (Item const &s) : Score_element (s) { + unbroken_original_l_ = &s; /* do not copy attached_span_l_arr_ */ breakable_b_ = s.breakable_b_; broken_to_drul_[LEFT] = broken_to_drul_[RIGHT] =0; diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index fce50bd7ad..23df0763f3 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -94,10 +94,10 @@ Key_engraver::read_req (Key_change_req const * r) { old_accidental_idx_arr_ = accidental_idx_arr_; key_.clear (); - Scalar prop = get_property ("specialaccidentals"); + Scalar prop = get_property ("keyoctaviation"); if (prop.length_i () > 0) { - key_.multi_octave_b_ = prop.to_bool (); + key_.multi_octave_b_ = ! prop.to_bool (); } accidental_idx_arr_.clear (); diff --git a/lily/lexer.ll b/lily/lexer.ll index 91363bcc8d..7e8ab40af8 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -4,7 +4,7 @@ source file of the LilyPond music typesetter - (c) 1996,1997 Han-Wen Nienhuys + (c) 1996,1997 Han-Wen Nienhuys */ diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index 164d07937f..6704153d48 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -37,70 +37,41 @@ Line_of_score::contains_b (Paper_column const* c) const return cols.find_l ((Paper_column*)c); } -void -Line_of_score::set_breaking (Array const &breaking) +Line_of_score* +Line_of_score::set_breaking (Array const &breaking, int j) const { - for (int j=0; j < breaking.size(); j++) - { - const Array &curline (breaking[j].cols); - const Array &errors (breaking[j].error_col_l_arr_); - const Array &config (breaking[j].config); + const Array &curline (breaking[j].cols); + const Array &errors (breaking[j].error_col_l_arr_); + const Array &config (breaking[j].config); - for (int i=0; i < errors.size(); i++) - errors[i]->error_mark_b_ = true; + for (int i=0; i < errors.size(); i++) + errors[i]->error_mark_b_ = true; - Line_of_score *line_l=0; - Line_of_score *line_p =0; + const Line_of_score *line_l=0; - if (breaking.size() >1) - { - line_p = (Line_of_score*)clone()->access_Spanner (); - line_l = line_p; - } - else - line_l = this; + if (breaking.size() >1) + { + line_l = (Line_of_score*)clone()->access_Spanner (); + } + else + line_l = this; - ((Array &)line_l->cols) = curline; - line_l->set_bounds(LEFT,curline[0]); + ((Array &)line_l->cols) = curline; + line_l->set_bounds(LEFT,curline[0]); - line_l->set_bounds(RIGHT,curline.top()); + line_l->set_bounds(RIGHT,curline.top()); - if (line_p) - { - pscore_l_->typeset_broken_spanner (line_p); - broken_into_l_arr_.push (line_p); - } - - for (int i=0; i < curline.size(); i++) - { - curline[i]->translate_axis (config[i],X_AXIS); - curline[i]->line_l_ = (Line_of_score*)line_l; - } + for (int i=0; i < curline.size(); i++) + { + curline[i]->translate_axis (config[i],X_AXIS); + curline[i]->line_l_ = (Line_of_score*)line_l; } -} - -void -Line_of_score::break_into_pieces (bool) -{ - + return line_l; } -Link_array -Line_of_score::get_lines() const -{ - Link_array ret; - if (broken_into_l_arr_.size()) - for (int i=0; i < broken_into_l_arr_.size(); i++) - { - ret.push ((Line_of_score*)broken_into_l_arr_[i]); - } - else - ret.push ((Line_of_score*)this); // ugh - - return ret; -} + void Line_of_score::do_print() const diff --git a/lily/main.cc b/lily/main.cc index 379e4daa46..4adc7f4ef3 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -182,13 +182,25 @@ identify () int main (int argc, char **argv) { + // facilitate binary distributions + char const *env_lily = getenv ("LILYPONDPREFIX"); + String prefix_directory; + if (env_lily) + prefix_directory = env_lily; #if HAVE_GETTEXT setlocale (LC_ALL, ""); // setlocale (LC_MESSAGES, ""); + String lily_locale_dir; String name (PACKAGE); name.to_lower (); - bindtextdomain (name.ch_C (), DIR_LOCALEDIR); + if (!prefix_directory.empty_b()) + { + lily_locale_dir = prefix_directory + "/share/locale"; + bindtextdomain (name.ch_C (), lily_locale_dir.ch_C()); + } + else + bindtextdomain (name.ch_C (), DIR_LOCALEDIR); textdomain (name.ch_C ()); #endif @@ -202,6 +214,12 @@ main (int argc, char **argv) if (env_sz) global_path.parse_path (env_sz); + if (!prefix_directory.empty_b()) + { + global_path.add (prefix_directory + "/share/lilypond/init/"); + global_path.add (prefix_directory + "/share/lilypond"); + } + global_path.add (String (DIR_DATADIR) + "/init/"); global_path.push (DIR_DATADIR); @@ -307,11 +325,12 @@ main (int argc, char **argv) /* urg: make input file name: + input: file name + output: file name with added default extension. "" is stdin. - in reference argument: the extention. ".ly" if none + in reference argument: the extension. ".ly" if none */ - String distill_inname_str (String name_str, String& ext_r) { diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 286f09277a..2931b16517 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -25,7 +25,6 @@ static Keyword_ent the_key_tab[]={ {"absdynamic", ABSDYNAMIC}, {"accepts", ACCEPTS}, - {"accidentals", ACCIDENTALS}, {"bar", BAR}, {"cadenza", CADENZA}, {"clear", CLEAR}, @@ -39,6 +38,7 @@ static Keyword_ent the_key_tab[]={ {"in", IN_T}, {"lyric", LYRIC}, {"key", KEY}, + {"keysignature", KEYSIGNATURE}, {"mark", MARK}, {"melodic" , MELODIC}, {"musicalpitch", MUSICAL_PITCH}, diff --git a/lily/p-score.cc b/lily/p-score.cc index af2300881c..48f2e400ac 100644 --- a/lily/p-score.cc +++ b/lily/p-score.cc @@ -7,7 +7,6 @@ */ #include "main.hh" -#include "super-element.hh" #include "debug.hh" #include "lookup.hh" #include "spanner.hh" @@ -33,15 +32,26 @@ Paper_score::Paper_score () { outputter_l_ =0; - super_elem_l_ = new Super_elem; - typeset_element (super_elem_l_); + Line_of_score * line_p = new Line_of_score; + typeset_unbroken_spanner (line_p); + + line_l_ = line_p; } Paper_score::~Paper_score () { - super_elem_l_->unlink_all (); +#if 0 + for (int i=0; i< line_l_arr_.size (); i++) + line_l_arr_[i]->unlink_all (); + for (PCursor i(elem_p_list_.top()); i.ok(); i++) - assert(!i->linked_b()); + { + + if (i->linked_b()) + i->unlink (); + assert (! i->linked_b ()); + } +#endif } void @@ -49,7 +59,6 @@ Paper_score::typeset_element (Score_element * elem_p) { elem_p_list_.bottom ().add (elem_p); elem_p->pscore_l_ = this; - elem_p->add_processing (); } @@ -118,12 +127,10 @@ Paper_score::find_col (Paper_column const *c) const } +#if 0 void Paper_score::set_breaking (Array const &breaking) { - super_elem_l_->line_of_score_l_->set_breaking (breaking); - super_elem_l_->break_processing (); - for (iter (span_p_list_.top (),i); i.ok ();) { Spanner *span_p = i.remove_p (); @@ -151,8 +158,10 @@ Paper_score::set_breaking (Array const &breaking) i++; } } +#endif -void + +Array Paper_score::calc_breaking () { Break_algorithm *algorithm_p=0; @@ -178,7 +187,7 @@ Paper_score::calc_breaking () sol = algorithm_p->solve (); delete algorithm_p; } - set_breaking (sol); + return sol; } void @@ -187,21 +196,79 @@ Paper_score::process () clean_cols (); print (); *mlog << _ ("Preprocessing elements...") << " " << flush; - super_elem_l_->breakable_col_processing (); - super_elem_l_->pre_processing (); + line_l_->breakable_col_processing (); + line_l_->pre_processing (); - *mlog << '\n' << _ ("Calculating column positions...") << " " << flush; - super_elem_l_->space_processing (); - calc_breaking (); - print (); - *mlog << _ ("Postprocessing elements...") << " " << endl; - super_elem_l_->post_processing (); - tex_output (); + *mlog << '\n' << _ ("Calculating column positions...") << " " << flush; + line_l_->space_processing (); + + Array breaking = calc_breaking (); + Tex_stream *tex_stream_p = open_output_stream (); + outputter_l_=open_tex_outputter (tex_stream_p); + + Link_array lines; + for (int i=0; i < breaking.size (); i++) + { + Line_of_score *line_l = line_l_->set_breaking (breaking, i); + lines.push (line_l); + if (line_l != line_l_) + typeset_broken_spanner (line_l); + + } + + *mlog << "\nLine ... "; + for (int i=0; i < lines.size (); i++) + { + *mlog << '[' << flush; + + Line_of_score *line_l = lines[i]; + line_l->break_processing (); + line_l->post_processing (); + *mlog << i << flush; + line_l->output_all (); + *mlog << ']' << flush; + remove_line (line_l); + + } + *tex_stream_p << "\n\\EndLilyPondOutput"; + delete outputter_l_; + delete tex_stream_p; + outputter_l_ = 0; } void -Paper_score::tex_output () +Paper_score::remove_line (Line_of_score *l) +{ + Link_array to_remove; + for (PCursor i(elem_p_list_.top ()); i.ok (); ) + { + if (i->line_l () == l) + to_remove.push (i.remove_p ()); + else + i++; + } + + for (PCursor i (span_p_list_.top ()); i.ok (); ) + { + Score_element *e = i.ptr (); + if (e->line_l () == l) + to_remove.push (i.remove_p ()); + else + i++; + } + + // l->unlink_all (); + for (int i=0; i < to_remove.size (); i++) + { + to_remove[i]->unlink (); + assert (!to_remove[i]->linked_b ()); + delete to_remove [i]; + } +} + +Tex_stream * +Paper_score::open_output_stream () { // output String base_outname = paper_l_->outfile_str_ ; @@ -223,33 +290,36 @@ Paper_score::tex_output () *mlog << _f ("TeX output to %s...", outname == "-" ? String ("") : outname ) << endl; - Tex_stream tex_out (outname); - Tex_outputter interfees (&tex_out); + return new Tex_stream (outname); +} + - outputter_l_ = &interfees; + +Tex_outputter * +Paper_score::open_tex_outputter (Tex_stream *tex_out_p) +{ + Tex_outputter *interfees_p= new Tex_outputter (tex_out_p); if (header_global_p) { - tex_out << header_global_p->TeX_string (); + *tex_out_p << header_global_p->TeX_string (); } - tex_out << _ ("% outputting Score, defined at: ") << origin_str_ << '\n'; + *tex_out_p << _ ("% outputting Score, defined at: ") << origin_str_ << '\n'; if (header_l_) { - tex_out << header_l_->TeX_string(); + *tex_out_p << header_l_->TeX_string(); } - tex_out << paper_l_->TeX_output_settings_str (); + *tex_out_p << paper_l_->TeX_output_settings_str (); if (experimental_features_global_b) - tex_out << "\\turnOnExperimentalFeatures%\n"; + *tex_out_p << "\\turnOnExperimentalFeatures%\n"; - tex_out << "\\turnOnPostScript%\n"; - super_elem_l_->output_all (); - tex_out << "\n\\EndLilyPondOutput"; - outputter_l_ = 0; + *tex_out_p << "\\turnOnPostScript%\n"; + return interfees_p; } /** Get all breakable columns between l and r, (not counting l and r). */ diff --git a/lily/parser.yy b/lily/parser.yy index 5df3722a0a..86b67fb02d 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1,11 +1,11 @@ %{ // -*-Fundamental-*- /* - parser.yy -- YACC -> C++ parser for mudela + parser.yy -- Bison/C++ parser for mudela source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -44,8 +44,8 @@ // mmm -Mudela_version oldest_version ("1.0.0"); -Mudela_version version ("1.0.0"); +Mudela_version oldest_version ("1.0.1"); +Mudela_version version ("1.0.1"); // needed for bison.simple's malloc() and free() @@ -137,7 +137,6 @@ yylex (YYSTYPE *s, void * v_l) /* tokens which are not keywords */ -%token ACCIDENTALS %token ALIAS %token BAR %token BEAMPLET @@ -160,6 +159,7 @@ yylex (YYSTYPE *s, void * v_l) %token IN_T %token LYRIC %token KEY +%token KEYSIGNATURE %token MARK %token MUSIC %token MUSICAL_PITCH @@ -850,7 +850,7 @@ verbose_command_req: $$ = key_p; delete $2; } - | ACCIDENTALS pitch_list { + | KEYSIGNATURE pitch_list { Key_change_req *key_p= new Key_change_req; key_p->pitch_arr_ = *$2; key_p->ordinary_key_b_ = false; @@ -1125,7 +1125,7 @@ gen_script_def: ; text_def: - STRING { + string { Text_def *t = new Text_def; $$ = t; t->text_str_ = *$1; diff --git a/lily/score-element.cc b/lily/score-element.cc index 94b6da163f..5eaff4dad8 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -133,7 +133,7 @@ Score_element::paper() const } -Lookup * +Lookup const * Score_element::lookup_l () const { return pscore_l_->paper_l_->lookup_l (size_i_); diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 1df1ecd5f8..1b30731fd7 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -51,7 +51,7 @@ Score_engraver::finish() void Score_engraver::do_creation_processing() { - scoreline_l_ = pscore_p_->super_elem_l_->line_of_score_l_; + scoreline_l_ = pscore_p_->line_l_; scoreline_l_->set_bounds(LEFT,get_staff_info().command_pcol_l ()); command_column_l_->breakable_b_ = true; Engraver_group_engraver::do_creation_processing(); diff --git a/lily/spanner.cc b/lily/spanner.cc index bc128bef42..0a1a74e5bd 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -54,8 +54,8 @@ Spanner::break_into_pieces () for (int i=1; i < break_cols.size(); i++) { Spanner* span_p = clone()->access_Spanner (); - left = break_cols[i-1]; - right = break_cols[i]; + Item *left = break_cols[i-1]; + Item *right = break_cols[i]; if (!right->line_l()) right = right->find_prebroken_piece(LEFT); if (!left->line_l()) @@ -108,7 +108,9 @@ Spanner::do_break_processing() { break_into_pieces (); for (int i=0; i < broken_into_l_arr_.size(); i++) - broken_into_l_arr_[i]->handle_broken_dependencies(); + { + broken_into_l_arr_[i]->handle_broken_dependencies(); + } } else { @@ -124,10 +126,18 @@ Spanner::access_Spanner () Spanner::Spanner () { + unbroken_original_l_ =0; spanned_drul_[LEFT]=0; spanned_drul_[RIGHT]=0; } +Spanner::Spanner (Spanner const &s) + :Score_element (s) +{ + spanned_drul_[LEFT] = spanned_drul_[RIGHT] =0; + unbroken_original_l_ = &s; +} + void Spanner::do_brew_molecule () { @@ -182,6 +192,12 @@ Spanner::do_unlink() { set_bounds (LEFT, 0); set_bounds (RIGHT, 0); + + if (unbroken_original_l_) + { + unbroken_original_l_->broken_into_l_arr_.substitute (this, 0); + unbroken_original_l_ =0; + } } void diff --git a/lily/super-elem.cc b/lily/super-element.cc similarity index 57% rename from lily/super-elem.cc rename to lily/super-element.cc index fda20ea9ee..e3b3ffbfc1 100644 --- a/lily/super-elem.cc +++ b/lily/super-element.cc @@ -12,35 +12,12 @@ #include "string.hh" #include "tex-outputter.hh" -void -Super_elem::handle_broken_dependencies() -{ - lines_arr_ = line_of_score_l_->get_lines(); - for (int i =0; i < lines_arr_.size(); i++) - add_dependency (lines_arr_[i]); -} - -void -Super_elem::do_substitute_dependency (Score_element*o,Score_element* n) -{ - if (line_of_score_l_ == o->access_Spanner ()) - line_of_score_l_ = n? (Line_of_score*) n->access_Spanner () : 0; -} - -Super_elem::Super_elem() -{ - line_of_score_l_ = new Line_of_score ; -} - -void -Super_elem::do_add_processing() +Super_element::Super_element() { - pscore_l_->typeset_unbroken_spanner (line_of_score_l_); - add_dependency (line_of_score_l_); } -IMPLEMENT_IS_TYPE_B1(Super_elem,Score_element); +IMPLEMENT_IS_TYPE_B1(Super_element,Score_element); /** @@ -64,13 +41,13 @@ enum Score_element_status { }; void -Super_elem::pre_processing () +Super_element::pre_processing () { calcalute_dependencies (PRECALCING, PRECALCED, &Score_element::do_pre_processing); } void -Super_elem::space_processing () +Super_element::space_processing () { calcalute_dependencies (SPACING, SPACED, &Score_element::do_space_processing); } @@ -80,37 +57,34 @@ Super_elem::space_processing () Score_element::handle_[pre]broken_dependencies assigned to status_i_ */ void -Super_elem::breakable_col_processing () +Super_element::breakable_col_processing () { calcalute_dependencies (PREBROKEN, PREBROKEN, &Score_element::do_breakable_col_processing); } void -Super_elem::break_processing () +Super_element::break_processing () { calcalute_dependencies (BROKEN, BROKEN, &Score_element::do_break_processing); } void -Super_elem::post_processing () +Super_element::post_processing () { calcalute_dependencies (POSTCALCING, POSTCALCED, &Score_element::do_post_processing); } void -Super_elem::output_all () +Super_element::output_all () { - for (int i=0; i < lines_arr_.size(); i++) - { - pscore_l_->outputter_l_->start_line (); - lines_arr_[i]->calcalute_dependencies (BREWING, BREWED, &Score_element::do_brew_molecule); - pscore_l_->outputter_l_->stop_line (); - } + pscore_l_->outputter_l_->start_line (); + calcalute_dependencies (BREWING, BREWED, &Score_element::do_brew_molecule); + pscore_l_->outputter_l_->stop_line (); } void -Super_elem::unlink_all () +Super_element::unlink_all () { calcalute_dependencies (UNLINKING, UNLINKED, &Score_element::junk_links); } diff --git a/make/GNUmakefile b/make/GNUmakefile index 441e932170..4fb79e0c8e 100644 --- a/make/GNUmakefile +++ b/make/GNUmakefile @@ -4,7 +4,9 @@ depth = .. STEPMAKE_TEMPLATES=makedir BLURBS=BLURB # COPERTINA FLAPTEKST -include $(depth)/make/stepmake.make - +# ifneq ($(strip $(state-vector)),) +EXTRA_DIST_FILES = STATE-VECTOR +# endif +include $(depth)/make/stepmake.make diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR new file mode 100644 index 0000000000..74664f1efa --- /dev/null +++ b/make/STATE-VECTOR @@ -0,0 +1,72 @@ +0.1.76 +0.1.76.jcn1 +0.1.77 +0.1.77.uu1 +0.1.77.hwjc +0.1.77.jcn1 +0.1.77.jcn2 +0.1.77.hwn1 +0.1.78 +0.1.78.hwn1 +0.1.78.jcn1 +0.1.78.jcn2 +0.1.79 +0.1.79.hwn1 +0.1.79.jcn2 +0.1.80 +0.1.80.jcn1 +0.1.80.eb1 +0.1.80.hwn1 +0.1.81 +0.1.81.jcn1 +0.1.81.jbr2 +0.1.81.jcn2 +0.1.81.jbr1 +0.1.81.jcn1 +0.1.81.hwn1 +0.1.81.hwn2 +0.1.82 +0.1.82.jcn1 +0.1.82.jcn2 +0.1.82.jcn3 +0.1.82.jcn4 +0.1.82.jcn5 +0.1.82.hwn1 +0.1.82.hwn2 +0.1.83 +0.1.83.hwn1 +0.1.83.jcn1 +0.1.83.uu1 +0.1.83.hwn1 +0.1.83.hwn2 +0.1.83.hwn3 +0.1.83.hwn4 +0.1.83.hwn5 +0.1.83.jcn4 +0.1.84 +0.1.84.jcn1 +0.1.84.hwn1 +0.1.84.jcn2 +0.1.84.hwn2 +0.1.84.jcn3 +0.1.84.hwn4 +0.1.85 +0.1.85.jcn1 +0.1.85.hwn1 +0.1.85.jcn2 +1.0.0 +1.0.0.hwn1 +1.0.0.hwn2 +1.0.1 +1.0.1.jbr1 +1.0.1.jcn2 +1.0.1.jbr2 +1.0.2 +1.0.2.hwn1 +1.0.3 +1.0.4.jcn1 +1.0.5 +1.0.5.jbr1 +1.0.5.jcn1 +1.0.5.hwn1 +1.0.6 diff --git a/make/docrules.make b/make/docrules.make deleted file mode 100644 index 9351453aa5..0000000000 --- a/make/docrules.make +++ /dev/null @@ -1,3 +0,0 @@ -# Docrules.make - -include $(make-dir)/mudela_rules.make diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index e093972cad..4f47dcb672 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -19,6 +19,7 @@ Prereq: tetex %build ./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --enable-optimise --enable-shared --enable-tex-dir='${prefix}/lib/texmf/texmf/tex/generic' --enable-mf-dir='${prefix}/lib/texmf/texmf/fonts/source/' make all +make -C Documentation texinfo || true make htmldoc %install @@ -51,6 +52,7 @@ make prefix="$RPM_BUILD_ROOT/usr" install /usr/man/man1/mudela-book.1 /usr/man/man1/ly2dvi.1 /usr/man/man1/convert-mudela.1 +/usr/info/lilypond.info* /usr/lib/texmf/texmf/tex/generic/lilypond /usr/lib/texmf/texmf/fonts/source/public/lilypond /usr/share/lilypond/ diff --git a/make/mutopia.make b/make/mutopia.make deleted file mode 100644 index 1c541ee636..0000000000 --- a/make/mutopia.make +++ /dev/null @@ -1,3 +0,0 @@ -# make/Mutopia.make - - diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index e8e8b5a297..760a70ff1f 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.0.4 -Inschrijf datum: 24AUG98 +Versie: 1.0.6 +Inschrijf datum: 02SEP98 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.0.4.tar.gz + 770k lilypond-1.0.6.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.4.tar.gz + 770k lilypond-1.0.6.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 962f34360f..6fcad9b7c5 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.0.4 -Entered-date: 24AUG98 +Version: 1.0.6 +Entered-date: 02SEP98 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.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 - 770k lilypond-1.0.4.tar.gz + 770k lilypond-1.0.6.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.4.tar.gz + 770k lilypond-1.0.6.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index e04958140d..9564956100 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.0.4 +Version: 1.0.6 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.4.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.6.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys @@ -25,6 +25,7 @@ a nice font of musical symbols. %build ./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --enable-optimise --enable-shared --enable-tex-dir='${prefix}/lib/texmf/texmf/tex/generic' --enable-mf-dir='${prefix}/lib/texmf/texmf/fonts/source/' make all +make -C Documentation texinfo || true make htmldoc %install @@ -57,6 +58,7 @@ make prefix="$RPM_BUILD_ROOT/usr" install /usr/man/man1/mudela-book.1 /usr/man/man1/ly2dvi.1 /usr/man/man1/convert-mudela.1 +/usr/info/lilypond.info* /usr/lib/texmf/texmf/tex/generic/lilypond /usr/lib/texmf/texmf/fonts/source/public/lilypond /usr/share/lilypond/ diff --git a/make/substitute.make b/make/substitute.make index 6e80db582f..92df5d2cef 100644 --- a/make/substitute.make +++ b/make/substitute.make @@ -2,6 +2,7 @@ #guh include $(stepdir)/substitute-vars.make +include $(stepdir)/substitute-rules.make ATVARIABLES = \ BASH\ diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 07d99c1758..0062f7c5ba 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -26,6 +26,8 @@ $(outdir)/%.afm $(outdir)/%.ly $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$( -% Jan Nieuwenhuizen -% - -font_identifier:="feta-brackets16"; -font_size 16; -mode_setup; - -staffsize#:=16pt#; -input feta-haak; -end. - diff --git a/mf/feta-brackets20.mf b/mf/feta-brackets20.mf deleted file mode 100644 index fb409093d0..0000000000 --- a/mf/feta-brackets20.mf +++ /dev/null @@ -1,16 +0,0 @@ -% -% feta-brackets20.mf -- implement -% -% source file of the Feta (Font-En-Tja) music font -% -% (c) 1997 Han-Wen Nienhuys -% Jan Nieuwenhuizen -% - -font_identifier:="feta-brackets20"; -font_size 20; -mode_setup; - -staffsize#:=20pt#; -input feta-haak; -end. diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index 1fde0e32e4..e9803f5dff 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -40,5 +40,5 @@ else: % input feta-toevallig; % input feta-schrift; % input feta-schrift; - input feta-haak; +% input feta-haak; fi diff --git a/mf/feta-nummer-generic.mf b/mf/feta-nummer-generic.mf index fca2c215cc..cdd56736c3 100644 --- a/mf/feta-nummer-generic.mf +++ b/mf/feta-nummer-generic.mf @@ -4,13 +4,16 @@ test:=0; input feta-autometric; +input feta-macros; + +blot_diameter# = .4pt#; + fet_beginfont("feta-nummer", size); mode_setup; -input feta-macros; -input feta-params; height#:=designsize; + save b,h; 4h+b=1.15; 10h+b=1; fatten:=designsize*h+b; save b,h; 4h+b=1.05; 10h+b=1; diff --git a/mf/feta-params.mf b/mf/feta-params.mf index fe1200789c..6c1ea69a09 100644 --- a/mf/feta-params.mf +++ b/mf/feta-params.mf @@ -4,7 +4,7 @@ stafflines = 5; interline#:=staffsize#/(stafflines-1); % URG! -% font_x_height ( interline# ); +font_x_height interline# ; % % [D.K.Roush & J.S.Gourlay] say this should be 0.072 diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf index 01c1e1406b..e612937728 100644 --- a/mf/feta-sleur.mf +++ b/mf/feta-sleur.mf @@ -54,19 +54,6 @@ def draw_slur(expr dxs,dys,hs,d) = boogje:=boogje rotated angle(dxs,dys); pickup pencircle scaled sleur_pen; filldraw boogje; - show z1; - show z2; - show z3; - show z4; - show z5; - show z6; enddef; -def slurchar(expr dxs,dys,hs,d) = - beginchar(0,0,0,0) "Embedded mf"; - draw_slur(dxs,dys,hs,d); - endchar; -enddef; - -% drawslur(10,10,0,1); diff --git a/mutopia/Coriolan/GNUmakefile b/mutopia/Coriolan/GNUmakefile index 90bb711455..201e77e30d 100644 --- a/mutopia/Coriolan/GNUmakefile +++ b/mutopia/Coriolan/GNUmakefile @@ -3,7 +3,7 @@ depth = ../.. # do Coriolan if you have plenty RAM / CPU -examples=coriolan oboi-part viola-part +#examples=coriolan oboi-part viola-part # examples= oboi-part viola-part LOCALSTEPMAKE_TEMPLATES=mutopia diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index 405f6d5169..e66e414d6c 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index 0476375b81..026d38ebe5 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index 08b129c6ed..d79ea0fdb9 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 2eb3869b1a..44ff9ef9a4 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; clarinetto1 = \melodic \relative c { R1 *2 | d''4-.\ff r r2 | R1 *3 | e4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index 759cb2995f..58564653ed 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; clarinetto2 = \melodic \relative c { R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly index e3cd408778..980ee0bf72 100644 --- a/mutopia/Coriolan/contrabasso-part.ly +++ b/mutopia/Coriolan/contrabasso-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "contrabasso.ly" diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index 71f4ad500d..55d22b546e 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; contrabasso = \melodic \relative c { % \translator Staff=violoncello diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 7d11fd68a1..896bf7fb42 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 1f5fc1d3d1..db65dc3c8e 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index b2f3c39fc1..32d1412a3a 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "corno-1.ly" \include "corno-2.ly" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 1ddbd53db7..1ce84c1c7f 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; corno1 = \melodic \relative c { R1 *2 | f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index 2a02324d51..ad8ba33261 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; corno2 = \melodic \relative c { R1 *2 | d''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 6d13a85fde..f3cb5cf194 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 4dd33f7f59..a4bf8c26d2 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "fagotto-1.ly" \include "fagotto-2.ly" diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index c6bc7c80f8..fa029e8947 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; fagotto1 = \melodic \relative c { R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index c236e123fe..07610f2507 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; fagotto2 = \melodic \relative c { R1 *2 | f4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index d0ff7a749b..65621ede25 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index f829429dca..2e14b35ba0 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "flauto-1.ly" \include "flauto-2.ly" diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index a6c7440b6b..abdf417cce 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; flauto1 = \melodic \relative c { R1 *2 | c'''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 3132d85146..ba9288f126 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; flauto2 = \melodic \relative c { R1 *2 | as'''4-.\ff r r2 | R1 *3 | b4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 28f818a186..bbd1ea28db 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; global = \melodic { \time 4/4; diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index 2a04c174c4..3458fa8638 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; oboe1 = \melodic \relative c'' { R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index 1b47a5a167..bf4b77a19d 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; oboe2 = \melodic \relative c{ R1 *2| f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 7ee1996719..16aa625b44 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 9b8de116fa..981973b036 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "oboe-1.ly" \include "oboe-2.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 28075b3536..a9d52b4efb 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; timpani = \melodic \relative c { R1 *2 | c4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index ec77ec0d82..c3f13d2c06 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 84b28bdfb5..36583629d0 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "trombo-1.ly" \include "trombo-2.ly" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index c7501cf01a..74b717a03e 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; trombo1 = \melodic \relative c { R1 *2 | c''4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 561a701114..be909a3430 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; trombo2 = \melodic \relative c { R1 *2 | c'4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index c639b503de..b6b000ee30 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; viola1 = \melodic \relative c { \type Voice=one diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index 31dc72611b..e3109c9ac0 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; viola2 = \melodic \relative c { % starts on (actualy, most part is on) same staff as viola1 diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly index 5496e50ff5..ad8c60a676 100644 --- a/mutopia/Coriolan/viola-part.ly +++ b/mutopia/Coriolan/viola-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "viola-1.ly" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index 2ad314be9b..cdfa1a723e 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index 1a3e2f393d..d623a38d76 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; violino1 = \melodic \relative c { c'1\ff ~ | c | r r2 | R1 | diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index cc9a9a1c87..d8b426945b 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index de6fea2061..f9693fdf0a 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; violino2 = \melodic \relative c { c'1\ff ~ | c | r r2 | R1 | diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly index bec6971a1a..953d20a304 100644 --- a/mutopia/Coriolan/violoncello-part.ly +++ b/mutopia/Coriolan/violoncello-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 085b31dbf5..622ea85ab9 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; violoncello = \melodic \relative c { c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 | diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 0c111fa734..b794f9367e 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -14,7 +14,7 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; one = \melodic\relative c { \property Voice . textstyle = "italic" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 585f74e7c5..22dc7c74bf 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -14,7 +14,7 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; one = \melodic\relative c{ \property Voice . textstyle = "italic" r8\mf [c'-1( e-2 g-4] [e-2 c-1 bes'-5 g-3] | diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index 66e95430a0..754ee16d34 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -12,7 +12,7 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; one = \melodic\relative c{ \property Voice . textstyle = "italic" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 5a2d50f848..9ba965c560 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -12,7 +12,7 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; one = \melodic\relative c{ diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index feb7345d31..0bdcd15b06 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -12,7 +12,7 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; one = \melodic\relative c{ diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly index 114480452c..97e59feb9d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -2,7 +2,7 @@ filename = "allemande-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Allemande"; +%piece = "Allemande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "allemande-urtext.ly"; @@ -45,5 +45,6 @@ allemande_cello_staff = \type Staff < \$allemande_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 45; } + \header{ piece = "Allemande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index 0b9c0fb9bb..5d80bab714 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -1,10 +1,10 @@ % allemande-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly similarity index 64% rename from mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly rename to mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly index e8fbc3bda3..450639b718 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -1,8 +1,8 @@ \header{ -filename = "allemande-alto.ly"; +filename = "allemande-viola.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Allemande"; +% piece = "Allemande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,11 +15,11 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "allemande-urtext.ly"; -allemande_alto_global = \melodic{ +allemande_viola_global = \melodic{ \time 4/4; \key f; \partial 16; @@ -32,18 +32,19 @@ allemande_alto_global = \melodic{ \bar ":|"; } -allemande_alto_scripts = \melodic{ +allemande_viola_scripts = \melodic{ } -allemande_alto_staff = \type Staff < +allemande_viola_staff = \type Staff < \melodic \transpose c'' \$allemande - \$allemande_alto_global - \$allemande_alto_scripts + \$allemande_viola_global + \$allemande_viola_scripts > \score{ - \$allemande_alto_staff + \$allemande_viola_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 45; } + \header{ piece = "Allemande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly index 5909c0be7d..1784fae420 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -2,7 +2,7 @@ filename = "courante-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Courante"; +% piece = "Courante"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "courante-urtext.ly"; @@ -45,5 +45,6 @@ courante_cello_staff = \type Staff < \$courante_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 55; } + \header{ piece = "Courante"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index c04de2dac6..3d540b4378 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -1,10 +1,10 @@ % courante-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly similarity index 65% rename from mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly rename to mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly index 8e7f0970be..2178cbf982 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -1,8 +1,8 @@ \header{ -filename = "courante-alto.ly"; +filename = "courante-viola.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Courante"; +% piece = "Courante"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,11 +15,11 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "courante-urtext.ly"; -courante_alto_global = \melodic{ +courante_viola_global = \melodic{ \time 3/4; \key f; \partial 16; @@ -32,18 +32,19 @@ courante_alto_global = \melodic{ \bar ":|"; } -courante_alto_scripts = \melodic{ +courante_viola_scripts = \melodic{ } -courante_alto_staff = \type Staff < +courante_viola_staff = \type Staff < \melodic \transpose c' \$courante - \$courante_alto_global - \$courante_alto_scripts + \$courante_viola_global + \$courante_viola_scripts > \score{ - \$courante_alto_staff + \$courante_viola_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 55; } + \header{ piece = "Courante"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index 70c72a36f6..9283675475 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -2,7 +2,7 @@ filename = "gigue-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Pr\\'elude"; % duh +% piece = "Gigue"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "gigue-urtext.ly"; @@ -45,5 +45,6 @@ gigue_cello_staff = \type Staff < \$gigue_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 60; } + \header{ piece = "Gigue"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly index 100156c7d7..8f36fb38bd 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -1,10 +1,10 @@ % gigue-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly similarity index 90% rename from mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly rename to mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly index 784dea6b29..d49bd990f8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -2,7 +2,7 @@ filename = "gigue-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Pr\\'elude"; % duh +% piece = "Gigue"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "gigue-urtext.ly"; @@ -23,7 +23,7 @@ gigue_cello_global = \melodic{ \time 3/8; \key f; \clef bass; - \partial 8 + \partial 8; \skip 4.*31; s4 \bar ":|:"; @@ -46,5 +46,6 @@ gigue_cello_staff = \type Staff < \include "scs-paper.ly"; %broken \midi{ \tempo 4 = 60; } + \header{ piece = "Gigue"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index 5d5f9c4d0d..f8b4a17965 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -2,7 +2,7 @@ filename = "menuetto-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Menuetto I"; +%piece = "Menuetto I"; source = "?"; % opus = "BWV 1008 no. 5"; opus = ""; @@ -16,7 +16,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "menuetto-urtext.ly"; @@ -63,6 +63,7 @@ menuetto_i_cello_staff = \type Staff < \$menuetto_i_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 110; } + \header{ piece = "Menuetto I"; } } menuetto_ii_cello_global = \melodic{ @@ -84,13 +85,10 @@ menuetto_ii_cello_staff = \type Staff < % \$menuetto_ii_cello_scripts > -\header{ -piece = "Menuetto II"; -opus = ""; -} \score{ \$menuetto_ii_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 130; } + \header{ piece = "Menuetto II"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly index 67e2f44128..76c93f5fb7 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -1,10 +1,10 @@ % menuetto-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} menuetto_i_a = \melodic \relative c { diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly similarity index 65% rename from mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly rename to mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index 96ed306a9f..0cd664fb61 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -1,9 +1,9 @@ \header{ -filename = "menuetto-alto.ly"; +filename = "menuetto-viola.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Menuetto I"; -description = "Transcribed for Alto"; +% piece = "Menuetto I"; +description = "Transcribed for Viola"; source = "?"; % opus = "BWV 1008 no. 5"; opus = ""; @@ -17,11 +17,11 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "menuetto-urtext.ly"; -menuetto_i_alto_global = \melodic{ +menuetto_i_viola_global = \melodic{ \time 3/4; \key f; \clef alto; @@ -37,7 +37,7 @@ menuetto_i_alto_global = \melodic{ \bar ":|"; } -menuetto_i_alto_scripts = \melodic{ +menuetto_i_viola_scripts = \melodic{ s2. s8^"~"^1_2_4 s8*5 s2.*5 @@ -52,19 +52,20 @@ menuetto_i_alto_scripts = \melodic{ s4-\downbow s4-\upbow } -menuetto_i_alto_staff = \type Staff < +menuetto_i_viola_staff = \type Staff < \melodic \transpose c' \$menuetto_i - \$menuetto_i_alto_global -% \$menuetto_i_alto_scripts + \$menuetto_i_viola_global +% \$menuetto_i_viola_scripts > \score{ - \$menuetto_i_alto_staff + \$menuetto_i_viola_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 110; } + \header{ piece = "Menuetto I"; } } -menuetto_ii_alto_global = \melodic{ +menuetto_ii_viola_global = \melodic{ \time 3/4; \key D; \clef alto; @@ -77,19 +78,16 @@ menuetto_ii_alto_global = \melodic{ \bar ":|"; } -menuetto_ii_alto_staff = \type Staff < +menuetto_ii_viola_staff = \type Staff < \melodic \transpose c' \$menuetto_ii - \$menuetto_ii_alto_global -% \$menuetto_ii_alto_scripts + \$menuetto_ii_viola_global +% \$menuetto_ii_viola_scripts > -\header{ -piece = "Menuetto II"; -opus = ""; -} \score{ - \$menuetto_ii_alto_staff + \$menuetto_ii_viola_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 130; } + \header{ piece = "Menuetto II"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly index d872e5ccb8..994d74cad5 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -2,7 +2,7 @@ filename = "prelude-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Pr\\'elude"; % duh +%piece = "Pr\\'elude"; % duh opus = "BWV 1008"; % opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "prelude-urtext.ly"; @@ -40,5 +40,6 @@ prelude_cello_staff = \type Staff < \$prelude_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } + \header{ piece = "Pr\\'elude"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly index f93032b967..2c31ae382d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -1,10 +1,10 @@ % prelude-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % who is going to make a -violin.ly? %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet see alto_scripts . +But merging melodic and scripts doen't work too well yet see viola_scripts . %} % urg, Thread is gone, try Voice diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly similarity index 62% rename from mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly rename to mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly index 2219165c5e..b70782a1ae 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -1,8 +1,8 @@ \header{ -filename = "prelude-alto.ly"; +filename = "prelude-viola.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Pr\\'elude"; % duh +% piece = "Pr\\'elude"; % duh opus = "BWV 1008"; % opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,11 +15,11 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "prelude-urtext.ly"; -prelude_alto_global = \melodic{ +prelude_viola_global = \melodic{ \time 3/4; \key f; \clef alto; @@ -27,18 +27,19 @@ prelude_alto_global = \melodic{ \bar "|."; } -prelude_alto_scripts = \melodic{ +prelude_viola_scripts = \melodic{ } -prelude_alto_staff = \type Staff < +prelude_viola_staff = \type Staff < \melodic \transpose c' \$prelude - \$prelude_alto_global - \$prelude_alto_scripts + \$prelude_viola_global + \$prelude_viola_scripts > \score{ - \$prelude_alto_staff + \$prelude_viola_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } + \header{ piece = "Pr\\'elude"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly index 4a8002713e..32a1443ed8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -2,7 +2,7 @@ filename = "sarabande-cello.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Sarabande"; +% piece = "Sarabande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "sarabande-urtext.ly"; @@ -42,5 +42,6 @@ sarabande_cello_staff = \type Staff < \$sarabande_cello_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } + \header{ piece = "Sarabande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index 00db06b77e..1a82029959 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -1,10 +1,10 @@ % sarabande-urtext.ly -% belongs together with -cello.ly and -alto.ly +% belongs together with -cello.ly and -viola.ly % (who is going to make a -violin.ly?) %{ Well, there are still some scripts in this "urtext". -But merging melodic and scripts doen't work too well yet (see alto_scripts). +But merging melodic and scripts doen't work too well yet (see viola_scripts). %} n = { \slurnormal } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly similarity index 63% rename from mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly rename to mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly index b39274e169..051611fae9 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -1,8 +1,8 @@ \header{ -filename = "sarabande-alto.ly"; +filename = "sarabande-viola.ly"; title = "Solo Cello Suites"; subtitle = "Suite II"; -piece = "Sarabande"; +% piece = "Sarabande"; % opus = "BWV 1008"; opus = ""; composer = "Johann Sebastian Bach (1685-1750)"; @@ -15,11 +15,11 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.0"; +\version "1.0.1"; \include "sarabande-urtext.ly"; -sarabande_alto_global = \melodic{ +sarabande_viola_global = \melodic{ \time 3/4; \key f; \clef alto; @@ -29,18 +29,19 @@ sarabande_alto_global = \melodic{ \bar ":|"; } -sarabande_alto_scripts = \melodic{ +sarabande_viola_scripts = \melodic{ } -sarabande_alto_staff = \type Staff < +sarabande_viola_staff = \type Staff < \melodic \transpose c' \$sarabande - \$sarabande_alto_global - \$sarabande_alto_scripts + \$sarabande_viola_global + \$sarabande_viola_scripts > \score{ - \$sarabande_alto_staff + \$sarabande_viola_staff \include "scs-paper.ly"; \midi{ \tempo 4 = 40; } + \header{ piece = "Sarabande"; } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly similarity index 76% rename from mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly rename to mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly index e0ba58142c..b6db279eec 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-alto.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/scsii-viola.ly @@ -2,6 +2,6 @@ instrument="Alto"; } -instrument="alto"; +instrument="viola"; \include "solo-cello-suite-ii.ly" diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 630abd5978..3ca2d85690 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -11,7 +11,7 @@ copyright = "Public Domain"; %{ %} -\version "1.0.0"; +\version "1.0.1"; global = diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index 1cc7e167be..550835215b 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -13,13 +13,13 @@ Tested Features: stem direction, multivoice, forced accidentals. %} -\version "1.0.0"; +\version "1.0.1"; \include "nederlands.ly" % for correct parsing of note names global = \melodic { \time 4/4; - \accidentals bes es as; + \keysignature bes es as; \skip 1*31; \bar "|."; | } diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index 2cb87d2913..584dfd295b 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -8,7 +8,7 @@ enteredby = "Shay Rojansky"; copyright = "Public Domain"; } -\version "1.0.0"; +\version "1.0.1"; global = \melodic { diff --git a/mutopia/W.A.Mozart/cadenza.ly b/mutopia/W.A.Mozart/cadenza.ly index 431214056a..e45f5fd9e7 100644 --- a/mutopia/W.A.Mozart/cadenza.ly +++ b/mutopia/W.A.Mozart/cadenza.ly @@ -13,7 +13,7 @@ Tested Features: cadenza mode Ugh.. Wish we had grace notes.... It adds another dimension to this piece of music. %} -\version "1.0.0"; +\version "1.0.1"; cad = \melodic \relative c' { diff --git a/mutopia/W.A.Mozart/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3.ly index a4a6998269..82fd269cb2 100644 --- a/mutopia/W.A.Mozart/horn-concerto-3.ly +++ b/mutopia/W.A.Mozart/horn-concerto-3.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; allegro = \melodic diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index 5d97250b00..63f1899b81 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -45,7 +45,7 @@ Voice engraver by uncommenting the lines in the paper definition below. --MB %} -\version "1.0.0"; +\version "1.0.1"; vi1=\melodic \relative c'' { \time 4/4; diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly index 48fed8cf12..bc9c0882f5 100644 --- a/mutopia/los-toros-oboe.ly +++ b/mutopia/los-toros-oboe.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "public domain"; latexheaders= "headers"; } -\version "1.0.0"; +\version "1.0.1"; %{ Silly latex file dropped; use ly2dvi diff --git a/mutopia/standchen-16.ly b/mutopia/standchen-16.ly index 9454dfede0..88671e093b 100644 --- a/mutopia/standchen-16.ly +++ b/mutopia/standchen-16.ly @@ -9,6 +9,6 @@ description = "A schubert song in 16 pt"; copyright = "public domain"; } -\version "1.0.0"; +\version "1.0.1"; \include "standchen.ly" diff --git a/mutopia/standchen-20.ly b/mutopia/standchen-20.ly index ea129b36c3..364b13c08a 100644 --- a/mutopia/standchen-20.ly +++ b/mutopia/standchen-20.ly @@ -9,7 +9,7 @@ copyright = "public domain"; description = "A schubert song in 20 pt"; } -\version "1.0.0"; +\version "1.0.1"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly index 185e298a39..ff67a5f0d9 100644 --- a/mutopia/standchen.ly +++ b/mutopia/standchen.ly @@ -14,7 +14,7 @@ copyright = "public domain"; multiple \paper{}s in one \score %} -\version "1.0.0"; +\version "1.0.1"; $vocal_verse1 = \melodic\relative c{ % ugh: treble/bass diff --git a/po/nl.po b/po/nl.po index 85fb726c2d..d6ddac0f01 100644 --- a/po/nl.po +++ b/po/nl.po @@ -213,7 +213,7 @@ msgstr "Ineq_constrained_qp::solve (): voorwaarde zit er %f naast" #: ineq-constrained-qp.cc:222 msgid "didn't converge!" -msgstr "ik convederde niet!" +msgstr "ik convergederde niet!" #: ineq-constrained-qp.cc:224 msgid "Too much degeneracy. " diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile index 0605eb6d64..6f414ded45 100644 --- a/scripts/GNUmakefile +++ b/scripts/GNUmakefile @@ -1,12 +1,12 @@ # bin/Makefile depth = .. -SEXECUTABLES=convert-mudela mudela-book ly2dvi +SEXECUTABLES=convert-mudela mudela-book ly2dvi ly2dvi32 STEPMAKE_TEMPLATES=script include $(depth)/make/stepmake.make -# include $(stepdir)/Executable_targets.make +include $(stepdir)/executable-targets.make diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index d5a78f9a0b..0ce2191032 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -150,6 +150,24 @@ if 1: # need new a namespace ((1,0,0), conv, '0.1.21 -> 1.0.0 ')) +if 1: # need new a namespace + def conv (lines): + newlines = [] + for x in lines: + x = regsub.gsub ('\\\\accidentals', + '\\\\keysignature',x) + x = regsub.gsub ('specialaccidentals *= *1', + 'keyoctaviation = 0',x) + x = regsub.gsub ('specialaccidentals *= *0', + 'keyoctaviation = 1',x) + newlines.append (x) + return newlines + + + conversions.append ( + ((1,0,1), conv, '\\accidentals -> \\keysignature, ' + + 'specialaccidentals -> keyoctaviation\n')) + ############################ diff --git a/scripts/ly2dvi.sh b/scripts/ly2dvi.sh index 5280c852df..b2e0330aaa 100644 --- a/scripts/ly2dvi.sh +++ b/scripts/ly2dvi.sh @@ -10,7 +10,7 @@ # Original LaTeX file made by Mats Bengtsson, 17/8 1997 # -VERSION="0.12" +VERSION="0.12.jcn1" NAME=ly2dvi.sh IDENTIFICATION="$NAME $VERSION" NOW=`date` @@ -21,9 +21,11 @@ echo "$IDENTIFICATION" 1>&2 # NEWS +# 0.12.jcn1 +# - mudelaDefs really fixed (sorry, PC) + # 0.12 # - -S/--sourcedir switch -# # #0.11.jcn3 @@ -636,20 +638,28 @@ regexp_quote(){ # mudelaDefs(){ # Include \def\mudela-definitions +# The aim here is to pick up the definition for the +# current file, then any other file. # +mudelatmp=$TMP/mudelaDefs$$ +# Use `cat' to prevent filenames being prepended +# +cat "$File" $OF | fgrep "$MU_DEF" > $mudelatmp for L in $MU_DEF do - for F in "$File" "$OF" - do - LL=`sed -n 's/\\\\def\\\\'"$L"'{\([^}]*\)}.*$/\1/p' "$F"` - [ "$LL" ] && { - Echo "$1\\"$L'{'"$LL"'}%' >> $LatF - break - } - done + # This converts \def\mudelatitle{fred} + # to \mudelatitle{fred} or to + # \def\mudelatitle{fred} + # and stops after the first one found. + sed -n '/\\def\\'"$L"'{\([^}]*\)}.*$/{ + s//'"`regexp_quote \"$1\"`"'\\'"$L"'{\1}%/p + q + }' $mudelatmp >> $LatF done +rm -f $mudelatmp } # +# startFile(){ # # LaTeX file name diff --git a/stepmake/AUTHORS.txt b/stepmake/AUTHORS.txt index ba6e0f27cd..a7bed18d26 100644 --- a/stepmake/AUTHORS.txt +++ b/stepmake/AUTHORS.txt @@ -10,7 +10,7 @@ This file lists authors of StepMake, and what they wrote. AUTHORS o Jan Nieuwenhuizen , - http://www.digicash.com/~jan + http://www.xs4all.nl/~jantien Main author. o Han-Wen Nienhuys , diff --git a/stepmake/INSTALL.txt b/stepmake/INSTALL.txt index c856e2e008..a0e5f7708a 100644 --- a/stepmake/INSTALL.txt +++ b/stepmake/INSTALL.txt @@ -1,20 +1,174 @@ - - NAME - INSTALL - installing StepMake - - DESCRIPTION - This page documents installation and usage of StepMake - - ABSTRACT +StepMake is a drop-in package that takes care of generic Makefile and +packaging/distribution issues. It enables you to write only the simplest of +Makefile snippets, while providing a series powerful make targets. Features +include speed, wildcarding, out/ dir build, stateless Makefiles and package +clustering. It includes some handy scripts for making (package-)diffs and +patches, making binary distributions etc. + +To use StepMake with your package, you do something remotely like: + + tar xzf releases/stepmake-0.1.23 + cd package-x.x.x/ # package to be StepMake-ised + ./../stepmake-0.1.23/bin/stepmakeise.sh + +You'll have to customize at least the files: + + ./VERSION . + ./configure.in + +to your package's needs. You might want to take a look at: + + ./make/Toplevel.make.in + ./config.hh.in + ./config.make.in + +Also, you should put a Makefile in every subdirectory of your +package. These makefiles generally are quite simple, e.g. this +is a the makefile for an include directory of LilyPond: + + # lily/include/Makefile + + depth = ../.. + include $(depth)/make/Stepmake.make + +it will identify all .h, .hh, ... files and take care of distributing +them. + +There's a make/Template.make that you can use as an example. +See also the Makefiles in the LilyPond or Yodl package. + +Once included in your package, StepMake (or in fact, any +StepMake-ised package) behaves as a normal subdirectory; +make commands such as 'make dist' recurse into the stepmake tree +(For a list of available targets, type make help after +configuring). +Stepmake (and any changes made) will be distributed with the main +pacakage. However, StepMake doesn't lose its independency, change +to the stepmake directory, and it'll behave as a main package. +You shouldn't version directory names of subpackages, otherwise +you'll see that package twice in each patch when you upgrade. + +PREREQUISITES + +To use StepMake with a package you need: + +o A GNU system: StepMake is known to work on these GNU systems: Linux + (PPC, intel), FreeBSD, AIX, NeXTStep, IRIX, Digital Unix and Solaris. + If you have the Cygnus WINDOWS32 port of the GNU utils, it will even + work in Windows NT/95, but we don't promise to support it. +o GNU make +o GNU autoconf + +RECOMMENDED + +Although not strictly necessary, these are recommended to have. + +o Python +o Yodl. All documentation will be in Yodl. (1.22.jcn3) +o GNU find + +INTERNALS + +Over time, we put a lot of effort in the configure, make, distribute +system (CMDS) for LilyPond. Some months ago, we realised it was not +standard GNU --- we require GNU make for building, and Python for extra +scripting. In an effort to be more GNU, we tried automake, but after two +weeks we realised the costs were too high for us and we reverted to our +own system (see automake.urgh). Not long after that i was confronted +with two other packages that lacked a decent CMDS. I realised that Lily's +would be perfect, it's modular and easy. The only problem was to make a +clean cut between generic and Lily specific stuff. The result was +StepMake: a bunch of generic makefiles, found in: + + stepmake/stepmake/*.make + +eneric helper scripts: + + stepmake/bin/*.sh + stepmake/bin/*.py + +and modular configure functions: + + stepmake/configure.in + stepmake/aclocal.m4 + stepmake/config.hh.in + stepmake/config.make.in + +Of course, every package has its own configure- and make peculiarities. +The best way to create the configure scripts is to copy them from +stepmake (Actually, stepmake/bin/stepmakeise.sh will do +that for you.) into you package's toplevel directory. For most +packages, you'll only have to comment in/out some functions in +configure.in. + +Package specific makefiles go in: + + make/Targets.make + make/Rulese.make + make/Substitute.make + +and are included by the generic StepMake makefiles. + +MAINTAINING + +If you want to make and manage (binary) distributions, create and apply +patches, you'll need some framework that's outside of the package's +sourcetree. +For a number of simple maintenance tasks, StepMake will therefore assume +the following directory structure: + + doos/ # gnu/windows32 build and binary releases + harmonia -> harmonia-x.y.z + harmonia-x.y.z/ + lilypond -> lilypond-x.y.z # symlink to development directory + lilypond-x.y.z/ # current development + patches/ # patches between different releases + RedHat/BUILD # RedHat build and binary releases + RedHat/RPMS + RedHat/SPECS + releases/ # .tar.gz releases + test/ # tarballs and diffs from current version + yodl -> yodl-1.30.17 + yodl-1.30.17 + +with prefix $HOME/usr/src +and (for building rpms only) in $HOME/.rpmrc: + + topdir: /home/fred/usr/src/RedHat + +Check and update the layout with the command: + + ./stepmake/bin/stepdirs.sh + +SEE ALSO + +../PATCHES.txt + +CONFIGURING + +Stepmake comes with a number of precooked configure functions for +general needs, such as AC_STEPMAKE_COMPILE for simple C development +and AC_STEPMAKE_CXX for C++. + +See configure.in and comment in/out the functions that your package +needs. For specific needs, you can write your own autoconf code, +see info autoconf. + +AUTHORS + +Jan Nieuwenhuizen + +Han-Wen Nienhuys +Have fun! diff --git a/stepmake/NEWS b/stepmake/NEWS index 75d1d7809f..9eaeacf1c8 100644 --- a/stepmake/NEWS +++ b/stepmake/NEWS @@ -1,3 +1,11 @@ +pl 47 + - bf: patch in website after 'make release' + - windows ln -> cp + - bf: texinfo build + +pl 46 + - bf: versioning typo: topleveL_MAJOR + - bf: reincluded optional STATE-VECTOR pl 45 - Foo_rules.make -> foo-rules.make diff --git a/stepmake/VERSION b/stepmake/VERSION index 8d0a721a4e..0aaf2231f7 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=45 +PATCH_LEVEL=47 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 660b3aca0a..06abbe832a 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -3,9 +3,10 @@ dnl StepMake subroutines for configure.in AC_DEFUN(AC_STEPMAKE_COMPILE, [ # -O is necessary to get inlining - OPTIMIZE="-O" + OPTIMIZE="" + CXXFLAGS=${CXXFLAGS:-""} checking_b=yes - optimise_b=tja + optimise_b=no profile_b=no debug_b=yes @@ -14,7 +15,11 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ [checking_b=$enableval] ) # actually, the default is: tja='-O' to get inlining... - # off='' + # off='' --jcn + + #actually, that sucks. + # tja looks like a typo. Default is optimisation off. --hwn + AC_ARG_ENABLE(optimise, [ enable-optimise use maximal speed optimisations. Default: off], [optimise_b=$enableval]) @@ -45,8 +50,7 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ fi if test "$optimise_b" = yes; then - DEFINES="$DEFINES -finline-functions" - OPTIMIZE="-O2" + OPTIMIZE="-O2 -finline-functions" fi if test "$optimise_b" = no; then @@ -55,11 +59,11 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ if test $profile_b = yes; then EXTRA_LIBES="-pg" - DEFINES="$DEFINES -pg" + OPTIMIZE="$OPTIMIZE -pg" fi if test $debug_b = yes; then - DEFINES="$DEFINES -g" + OPTIMIZE="$OPTIMIZE -g" fi # however, C++ support in mingw32 v 0.1.4 is still flaky @@ -88,7 +92,8 @@ AC_DEFUN(AC_STEPMAKE_CXX, [ AC_CHECK_HEADER(FlexLexer.h, true, AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly)) - CXXFLAGS="$DEFINES $OPTIMIZE" + CPPFLAGS="$CPPFLAGS $DEFINES" + CXXFLAGS="$CXXFLAGS $OPTIMIZE" LDFLAGS=$EXTRA_LIBES AC_SUBST(CXXFLAGS) @@ -129,9 +134,9 @@ AC_DEFUN(AC_STEPMAKE_DATADIR, [ AC_DEFUN(AC_STEPMAKE_END, [ AC_OUTPUT($CONFIGFILE.make:config.make.in) - rm -f Makefile - cp make/toplevel.make.in ./Makefile - chmod 444 Makefile + rm -f GNUmakefile + cp make/toplevel.make.in ./GNUmakefile + chmod 444 GNUmakefile ]) AC_DEFUN(AC_STEPMAKE_GXX, [ @@ -189,6 +194,12 @@ AC_DEFUN(AC_STEPMAKE_INIT, [ stepmake=stepmake AC_SUBST(stepmake) + STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null` + if test "x$STATE_VECTOR" != "x"; then + STATE_VECTOR="\$(depth)/$STATE_VECTOR" + fi + AC_SUBST(STATE_VECTOR) + CONFIGSUFFIX= AC_ARG_ENABLE(config, [ enable-config=FILE put configure settings in config-FILE.make], @@ -231,20 +242,30 @@ dnl fi AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then - LN=cp # hard link does not work under cygnus-nt (yet?) + LN=cp # hard link does not work under cygnus-nt + LN_S=cp # symbolic link does not work for native nt ZIP="zip -r -9" # DOTEXE=.exe - INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c" + DIRSEP='\\' + PATHSEP=';' + INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c" else + DIRSEP='/' + PATHSEP=':' LN=ln + LN_S='ln -s' ZIP="zip -r -9" INSTALL="\$(stepdir)/../bin/install-sh -c" fi AC_SUBST(DOTEXE) AC_SUBST(ZIP) AC_SUBST(LN) + AC_SUBST(LN_S) AC_SUBST(INSTALL) - + AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}') + AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}') + + AC_STEPMAKE_DATADIR ]) diff --git a/stepmake/bin/package-zip32.sh b/stepmake/bin/package-zip32.sh new file mode 100644 index 0000000000..401749e575 --- /dev/null +++ b/stepmake/bin/package-zip32.sh @@ -0,0 +1,75 @@ +#!/bin/sh +# package-zip32.sh --- make a windoze formated distribution + +set -x + +if [ $# -lt 1 ]; then + echo "Usage: $0 PACKAGE_SOURCEDIR" + exit 2 +fi + +srcdir=$1 +shift + +. $srcdir/VERSION + +VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL +if [ "x$MY_PATCH_LEVEL" != "x" ]; then + VERSION=$VERSION.$MY_PATCH_LEVEL +fi + +package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` +name=$package-$VERSION +ZIP_CMD="zip -r -9" + +here=`pwd` +cd $srcdir/.. +PACKAGE_ROOTDIR=`pwd` +export PACKAGE_ROOTDIR +cd $here + +RELEASE_DIR="$PACKAGE_ROOTDIR/bin.releases/winnt" +ZIP_FILE="$RELEASE_DIR/$name.bin.zip" + + +if [ ! -e $RELEASE_DIR ]; then + mkdir -p $RELEASE_DIR +fi + +distdir=/tmp/${name} + +rm -f ${srcdir}/config.cache +${srcdir}/configure --prefix=${distdir} \ + --srcdir=${srcdir} \ + --enable-tex-prefix=${distdir}/texmf \ + --enable-tex-dir=${distdir}/texmf/tex \ + --enable-mf-dir=${distdir}/texmf/mf + +if ! make ; then + echo "make failed" + exit 1 +fi + +if ! make install ; then + echo "make install failed" + exit 1 +fi + +# +# Post install clean up +# +CYGWIN_LIB=$PACKAGE_ROOTDIR/distfiles/winnt/cygwinb19.dll +if [ ! -e $CYGWIN_LIB ]; then + echo "Unable to locate $CYGWIN_LIB" + exit 1 +fi + +cd $distdir/bin +cp $CYGWIN_LIB . +mv ly2dvi32 ly2dvi.py +cd $distdir/.. +$ZIP_CMD $ZIP_FILE $name +echo "Wrote $ZIP_FILE" +exit 0 + + diff --git a/stepmake/config.make.in b/stepmake/config.make.in index 25bfe5945a..e15719086f 100644 --- a/stepmake/config.make.in +++ b/stepmake/config.make.in @@ -15,6 +15,7 @@ PACKAGE = @PACKAGE@ package = @package@ PACKAGE_NAME = @PACKAGE_NAME@ stepmake = @stepmake@ +state-vector = @STATE_VECTOR@ CONFIGSUFFIX = @CONFIGSUFFIX@ MAKEINFO = @MAKEINFO@ ICFLAGS = @ICFLAGS@ @@ -44,6 +45,7 @@ BISON = @BISON@ FIND = @FIND@ FLEX = @FLEX@ LN = @LN@ +LN_S = @LN_S@ MSGFMT = @MSGFMT@ PERL = @PERL@ PYTHON = @PYTHON@ diff --git a/stepmake/configure b/stepmake/configure index 420a69c374..4980c54f7f 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -609,6 +609,12 @@ EOF stepmake=stepmake + STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null` + if test "x$STATE_VECTOR" != "x"; then + STATE_VECTOR="\$(depth)/$STATE_VECTOR" + fi + + CONFIGSUFFIX= # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -631,7 +637,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:635: checking host system type" >&5 +echo "configure:641: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -656,7 +662,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:660: checking for $ac_word" >&5 +echo "configure:666: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -690,7 +696,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:694: checking for $ac_word" >&5 +echo "configure:700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -727,7 +733,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:731: checking for $ac_word" >&5 +echo "configure:737: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -761,7 +767,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:765: checking for $ac_word" >&5 +echo "configure:771: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -794,7 +800,7 @@ test -n "$BASH" || BASH="/bin/sh" # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:798: checking for $ac_word" >&5 +echo "configure:804: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -857,12 +863,18 @@ fi if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then - LN=cp # hard link does not work under cygnus-nt (yet?) + LN=cp # hard link does not work under cygnus-nt + LN_S=cp # symbolic link does not work for native nt ZIP="zip -r -9" # DOTEXE=.exe - INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c" + DIRSEP='\\' + PATHSEP=';' + INSTALL="\$(stepdir)/../bin/install-dot-exe.sh -c" else + DIRSEP='/' + PATHSEP=':' LN=ln + LN_S='ln -s' ZIP="zip -r -9" INSTALL="\$(stepdir)/../bin/install-sh -c" fi @@ -870,7 +882,17 @@ fi + + cat >> confdefs.h <> confdefs.h <&6 -echo "configure:930: checking language" >&5 +echo "configure:952: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -958,7 +980,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:962: checking for $ac_word" >&5 +echo "configure:984: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -992,7 +1014,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:996: checking for $ac_word" >&5 +echo "configure:1018: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1026,7 +1048,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1030: checking for $ac_word" >&5 +echo "configure:1052: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1059,7 +1081,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1063: checking for $ac_word" >&5 +echo "configure:1085: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1093,7 +1115,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1097: checking for $ac_word" >&5 +echo "configure:1119: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1127,7 +1149,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1131: checking for $ac_word" >&5 +echo "configure:1153: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1181,7 +1203,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1185: checking for $ac_word" >&5 +echo "configure:1207: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1351,6 +1373,7 @@ s%@package_depth@%$package_depth%g s%@AUTOGENERATE@%$AUTOGENERATE%g s%@absolute_builddir@%$absolute_builddir%g s%@stepmake@%$stepmake%g +s%@STATE_VECTOR@%$STATE_VECTOR%g s%@CONFIGSUFFIX@%$CONFIGSUFFIX%g s%@host@%$host%g s%@host_alias@%$host_alias%g @@ -1365,6 +1388,7 @@ s%@PYTHON@%$PYTHON%g s%@DOTEXE@%$DOTEXE%g s%@ZIP@%$ZIP%g s%@LN@%$LN%g +s%@LN_S@%$LN_S%g s%@INSTALL@%$INSTALL%g s%@DIR_DATADIR@%$DIR_DATADIR%g s%@YODL@%$YODL%g @@ -1589,7 +1613,7 @@ rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - rm -f Makefile - cp make/toplevel.make.in ./Makefile - chmod 444 Makefile + rm -f GNUmakefile + cp make/toplevel.make.in ./GNUmakefile + chmod 444 GNUmakefile diff --git a/stepmake/make/GNUmakefile b/stepmake/make/GNUmakefile index bb5632d158..c204b04dc2 100644 --- a/stepmake/make/GNUmakefile +++ b/stepmake/make/GNUmakefile @@ -4,8 +4,10 @@ depth = .. STEPMAKE_TEMPLATES=makedir BLURBS=BLURB # COPERTINA FLAPTEKST +ifneq ($(strip $(state-vector)),) +EXTRA_DIST_FILES = STATE-VECTOR +endif include $(depth)/make/stepmake.make - diff --git a/stepmake/make/out/stepmake.lsm b/stepmake/make/out/stepmake.lsm index c9f1388430..a3eaff4e9c 100644 --- a/stepmake/make/out/stepmake.lsm +++ b/stepmake/make/out/stepmake.lsm @@ -1,15 +1,15 @@ Begin3 Title: StepMake -Version: .1.45 -Entered-date: 24AUG98 +Version: 0.1.47 +Entered-date: 02SEP98 Description: Keywords: music notation typesetting midi fonts engraving Author: janneke@gnu.org (Jan Nieuwenhuizen) hanwen@cs.ruu.nl (Han-Wen Nienhuys) Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 40k stepmake-.1.45.tar.gz + 40k stepmake-0.1.47.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 40k stepmake-.1.45.tar.gz + 40k stepmake-0.1.47.tar.gz Copying-policy: GPL End diff --git a/stepmake/make/out/stepmake.spec b/stepmake/make/out/stepmake.spec index 99900b82af..358b472c22 100644 --- a/stepmake/make/out/stepmake.spec +++ b/stepmake/make/out/stepmake.spec @@ -1,9 +1,9 @@ Name: stepmake -Version: .1.45 +Version: 0.1.47 Release: 1 Copyright: GPL Group: Development -Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-.1.45.tar.gz +Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.47.tar.gz Summary: generic make package Packager: janneke@gnu.org (Jan Nieuwenhuizen) Buildroot: /tmp/stepmake-install diff --git a/stepmake/make/toplevel-version.make b/stepmake/make/toplevel-version.make index c6711a8d2f..a79dd82674 100644 --- a/stepmake/make/toplevel-version.make +++ b/stepmake/make/toplevel-version.make @@ -1,6 +1,6 @@ include $(depth)/VERSION -topleveL_MAJOR_VERSION:=$(MAJOR_VERSION) +TOPLEVEL_MAJOR_VERSION:=$(MAJOR_VERSION) TOPLEVEL_MINOR_VERSION:=$(MINOR_VERSION) TOPLEVEL_PATCH_LEVEL:=$(PATCH_LEVEL) # use to send patches, always empty for released version: diff --git a/stepmake/stepmake/automatically-configured.sub.make b/stepmake/stepmake/automatically-configured.sub.make new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/stepmake/stepmake/automatically-configured.sub.make @@ -0,0 +1 @@ + diff --git a/stepmake/stepmake/automatically-generated.sub.make b/stepmake/stepmake/automatically-generated.sub.make new file mode 100644 index 0000000000..5697a8c765 --- /dev/null +++ b/stepmake/stepmake/automatically-generated.sub.make @@ -0,0 +1,9 @@ + +LINECOMMENT=\# + +default: + chmod +w $(OUTFILE) + echo "$(LINECOMMENT) WARNING WARNING WARNING WARNING" > $(OUTFILE) + echo "$(LINECOMMENT) do not edit! this is $(OUTFILE), generated from $(INFILE)" >> $(OUTFILE) + cat $(INFILE) >> $(OUTFILE) + chmod -w $(OUTFILE) diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make index 58c668d95f..60516476a2 100644 --- a/stepmake/stepmake/documentation-targets.make +++ b/stepmake/stepmake/documentation-targets.make @@ -24,14 +24,14 @@ local-WWW: readme-top_FILES-txt readme-top_FILES-html $(OUTHTML_FILES) $(OUTREAD doc: do-doc +$(outdir)/$(package).info: $(outdir)/topinfo.texinfo $(OUTTEXINFO_FILES) + $(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo + # what to do here? ifneq ($(strip $(INFO_FILES)),) INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_FILES)" -f $(stepdir)/install-outfiles.sub.make $@ -$(outdir)/$(package).info: check-texinfo-deps $(OUTTEXINFO_FILES) - $(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo - localinstall: # $(INFO_FILES) -$(INSTALL) -d $(infodir) $(INFOINSTALL) diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make index 465ab3d5b5..0cf6a9a022 100644 --- a/stepmake/stepmake/documentation-vars.make +++ b/stepmake/stepmake/documentation-vars.make @@ -17,7 +17,6 @@ ALL_DOC_FILES = $(POD_FILES) $(TEXINFO_FILES) $(YO_FILES) OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt) OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html) # $(OUTREADME_HTML_FILES) # OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo))) -# OUTTEXINFO_FILES = $(outdir)/topinfo.texinfo $(outdir)/mutopia.texinfo OUTREADME_TXT_FILES=$(addprefix $(outdir)/,$(addsuffix .txt, $(README_TOP_FILES))) OUTREADME_HTML_FILES=$(addprefix $(outdir)/,$(addsuffix .html, $(README_TOP_FILES))) diff --git a/stepmake/stepmake/documentation.shared.make b/stepmake/stepmake/documentation.shared.make deleted file mode 100644 index 79c67fb8bd..0000000000 --- a/stepmake/stepmake/documentation.shared.make +++ /dev/null @@ -1,9 +0,0 @@ -# stepmake/documentation.shared.make -# urg: stuff shared between yodl/lily/stepmake - -# could/should do this for bin/Makefile make/Makefile too - -### below here is shared between lily/yodl/Documentation and topdocs... - -include $(stepdir)/documentation_vars.make -include $(stepdir)/documentation_rules.make diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index 413d1b3b10..68c065b9fc 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -84,8 +84,12 @@ doc++: (cd $(outdir); sh ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz) - - +update-state-vector: +ifneq ($(strip $(state-vector)),) + if [ "`tail -1 $(state-vector)`" != "$(TOPLEVEL_VERSION)" ]; then\ + echo $(TOPLEVEL_VERSION) >> $(state-vector); \ + fi +endif local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES) mkdir -p $(distdir)/$(localdir) @@ -171,3 +175,4 @@ $(depth)/$(configuration).make: $(depth)/configure @echo "configure changed! You should probably reconfigure manually." @echo "**************************************" (cd $(depth); ./config.status) + touch $@ # do something for multiple simultaneous configs. diff --git a/stepmake/stepmake/install-outfiles.sub.make b/stepmake/stepmake/install-outfiles.sub.make index f406025dad..a9a306bc0b 100644 --- a/stepmake/stepmake/install-outfiles.sub.make +++ b/stepmake/stepmake/install-outfiles.sub.make @@ -1,5 +1,5 @@ # Initial_outfiles.sub.make include $(depth)/make/stepmake.make -include $(stepdir)/install_outfiles.make +include $(stepdir)/install-outfiles.make diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 304512da5e..3d6eb28e73 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -10,3 +10,8 @@ $(outdir)/%.log: %.mf mv $(@F) $@ rm $(basename $< ).*gf + +$(outdir)/%.tfm: %.mf + mf '\mode:=ljfour; input $<;' + mv $(@F) $(outdir) + rm $(basename $<).*{gf,log} diff --git a/stepmake/stepmake/metafont-targets.make b/stepmake/stepmake/metafont-targets.make index ea30561d83..4a4d3017e2 100644 --- a/stepmake/stepmake/metafont-targets.make +++ b/stepmake/stepmake/metafont-targets.make @@ -1 +1,6 @@ -#empty + + +tfm: $(TFM_FILES) + +dvi: $(DVI_FILES) + diff --git a/stepmake/stepmake/metafont-vars.make b/stepmake/stepmake/metafont-vars.make index 67600b84bf..95d2563275 100644 --- a/stepmake/stepmake/metafont-vars.make +++ b/stepmake/stepmake/metafont-vars.make @@ -1,5 +1,12 @@ -MF_FILES = $(wildcard *.mf) +MF_FILES := $(wildcard *.mf) FONT_FILES = $(wildcard *[0-9].mf) EXTRA_DIST_FILES += $(MF_FILES) +MF_TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm)) +MF_DVI_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.dvi)) +MF_LOG_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.log)) +DVI_FILES += $(MF_DVI_FILES) +TFM_FILES += $(MF_TFM_FILES) + + diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make index d0d29f11e1..303bc8f0df 100644 --- a/stepmake/stepmake/package.make +++ b/stepmake/stepmake/package.make @@ -31,6 +31,9 @@ rpm: $(depth)/$(package-icon) dist update: $(PYTHON) $(step-bindir)/update.py --package=$(topdir) $(makeflags) -zip: +xzip: $(SHELL) $(step-bindir)/package-zip.sh $(topdir) $(prefix:/%=%) +zip: + $(SHELL) $(step-bindir)/package-zip32.sh $(topdir) + diff --git a/stepmake/stepmake/po-vars.make b/stepmake/stepmake/po-vars.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/substitute-targets.make b/stepmake/stepmake/substitute-targets.make deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index a1f223b4c4..4e45a880ef 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -15,9 +15,6 @@ texi2html =\ $(outdir)/%.1: %.texinfo $(texi2man) -# $(outdir)/%.info: %.texinfo -# $(MAKEINFO) -o $@ $< - $(outdir)/%.info: $(outdir)/%.texinfo $(MAKEINFO) -o $@ $< @@ -33,9 +30,6 @@ $(outdir)/%.html: $(outdir)/%.texinfo $(texi2html) $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index $(depth)/../index.html $@ -$(outdir)/%.texinfo: %.texinfo - cp $< $@ - $(outdir)/%.1: $(outdir)/%.texinfo -$(texi2man) diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make index cf5b0a77bf..374f10ef2b 100644 --- a/stepmake/stepmake/toplevel-targets.make +++ b/stepmake/stepmake/toplevel-targets.make @@ -11,14 +11,11 @@ local-maintainerclean: rm -f configure GNUmakefile: make/toplevel.make.in - chmod +w $@ - echo "# WARNING WARNING WARNING WARNING" > $@ - echo "# do not edit! this is generated from make/Toplevel.make.in" >> $@ - cat $< >> $@ - chmod -w $@ + $(MAKE) INFILE=$< OUTFILE=$@ -f $(stepdir)/automatically-generated.sub.make aclocal.m4: $(stepdir)/../aclocal.m4 - cp $< $@ + $(MAKE) INFILE=$< OUTFILE=$@ LINECOMMENT=dnl -f $(stepdir)/automatically-generated.sub.make + local-WWW: #index.html @@ -29,7 +26,8 @@ index.html: check-top-web NEWS WWW-clean: $(MAKE) CONFIGSUFFIX='www' clean -dist: +dist: + $(MAKE) update-state-vector rm -rf $(distdir) $(MAKE) local-dist $(distdir) chmod -R a+r $(distdir) diff --git a/stepmake/stepmake/yolily-topdoc-vars.make b/stepmake/stepmake/yolily-topdoc-vars.make index 5ace65177d..1ada75d8a9 100644 --- a/stepmake/stepmake/yolily-topdoc-vars.make +++ b/stepmake/stepmake/yolily-topdoc-vars.make @@ -1,6 +1,4 @@ # Yolily_topdoc_vars.make -# INFO_FILES = $(outdir)/$(package).info - TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES)) diff --git a/stepmake/stepmake/yolily-toplevel-targets.make b/stepmake/stepmake/yolily-toplevel-targets.make index b451793c52..c41b64867c 100644 --- a/stepmake/stepmake/yolily-toplevel-targets.make +++ b/stepmake/stepmake/yolily-toplevel-targets.make @@ -17,6 +17,7 @@ htmldoc: $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW rm -f `find . -name \*.html~ -print` find `find Documentation -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > wwwlist + -ln -f $(patch-dir)/$(distname).diff.gz out-www -ln -f $(depth)/$(distname).diff.gz out-www tar cfz $(outdir)/htmldoc.tar.gz `cat wwwlist` `ls *.gif out-www/$(distname).diff.gz $(ERRORLOG)` index.html -- 2.39.5