From b71bb68fd8b36ec4b00cfec5e620c53087983fc0 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 18 Sep 1998 17:02:58 +0200 Subject: [PATCH] release: 1.0.10 --- Documentation/tex/GNUmakefile | 6 +- Documentation/tex/glossary.yo | 1 - Documentation/tex/other-packages.bib | 12 ++ NEWS | 24 ++-- TODO | 4 +- VERSION | 4 +- init/book-fragment.ly | 2 +- init/book-init.ly | 4 +- init/center-fragment.ly | 4 +- init/center.ly | 4 +- init/declarations.ly | 2 +- init/fragment.ly | 4 +- init/init.fly | 2 +- init/init.ly | 2 +- init/midi.ly | 2 +- init/paper16.ly | 2 +- init/paper20.ly | 2 +- init/svenska.ly | 6 - input/example-3.ly | 8 +- input/keys.ly | 2 +- input/kortjakje.ly | 2 +- input/part.ly | 7 +- input/pedal.ly | 2 +- input/praeludium-fuga-E.ly | 2 +- input/rhythm.ly | 2 +- input/scales.ly | 2 +- input/scripts.ly | 2 +- input/test/abbrev.ly | 2 +- input/test/bar-scripts.ly | 2 +- input/test/beam-pos.ly | 2 +- input/test/beams.ly | 2 +- input/test/broken.ly | 2 +- input/test/clefs.ly | 2 +- input/test/collisions.ly | 2 +- input/test/defaultbars.ly | 2 +- input/test/denneboom.ly | 2 +- input/test/dotted-slur.ly | 2 +- input/test/find-quarts.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/grace.ly | 2 +- input/test/hara-kiri.ly | 4 +- input/test/keys.ly | 2 +- input/test/knee.ly | 2 +- input/test/mark.ly | 2 +- input/test/multi-rest.ly | 2 +- input/test/ossia.ly | 2 +- input/test/score-bar-scripts.ly | 2 +- input/test/sleur.ly | 2 +- input/test/slur-bug.ly | 2 +- input/test/slur-damping.ly | 2 +- input/test/slur-swap.ly | 2 +- input/test/slurs.ly | 2 +- input/test/spacing.ly | 2 +- input/test/stem.ly | 2 +- input/test/test-lyrics.ly | 2 +- input/test/tie-bug.ly | 2 +- input/test/tie.ly | 2 +- input/test/title.ly | 2 +- input/test/transposition.ly | 2 +- input/test/vertical-align.ly | 2 +- input/tril.ly | 2 +- input/twinkle-pop.ly | 2 +- input/twinkle.ly | 2 +- lily/VERSION | 4 +- lily/identifier.cc | 11 +- lily/include/identifier.hh | 4 + lily/include/my-lily-lexer.hh | 2 +- lily/include/my-lily-parser.hh | 1 - lily/include/notename-table.hh | 2 +- lily/include/notename.hh | 24 ---- lily/music-output-def.cc | 5 +- lily/my-lily-lexer.cc | 6 +- lily/my-lily-parser.cc | 9 +- lily/parser.yy | 118 ++++++++++-------- make/STATE-VECTOR | 5 +- make/lilypond-vars.make | 4 +- make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- make/stepmake.make | 6 +- mudela-mode.el | 6 +- 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 | 4 +- 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 +- .../Cembalo-Partitas/Partita_II_Allemande.ly | 2 +- .../Cembalo-Partitas/Partita_II_Sinfonia.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 | 2 +- .../Solo-Cello-Suites/allemande-viola.ly | 2 +- .../Solo-Cello-Suites/courante-cello.ly | 2 +- .../Solo-Cello-Suites/courante-viola.ly | 2 +- .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 2 +- .../J.S.Bach/Solo-Cello-Suites/gigue-viola.ly | 2 +- .../Solo-Cello-Suites/menuetto-cello.ly | 2 +- .../Solo-Cello-Suites/menuetto-viola.ly | 2 +- .../Solo-Cello-Suites/prelude-cello.ly | 2 +- .../Solo-Cello-Suites/prelude-viola.ly | 2 +- .../Solo-Cello-Suites/sarabande-cello.ly | 2 +- .../Solo-Cello-Suites/sarabande-viola.ly | 2 +- mutopia/J.S.Bach/wtk1-fugue1.ly | 2 +- mutopia/J.S.Bach/wtk1-fugue2.ly | 2 +- mutopia/J.S.Bach/wtk1-prelude1.ly | 2 +- mutopia/W.A.Mozart/cadenza.ly | 2 +- mutopia/W.A.Mozart/horn-concerto-3.ly | 4 +- mutopia/gallina.ly | 2 +- mutopia/los-toros-oboe.ly | 2 +- mutopia/standchen-16.ly | 2 +- mutopia/standchen-20.ly | 2 +- mutopia/standchen.ly | 2 +- scripts/convert-mudela.py | 20 +-- stepmake/bin/package-zip32.sh | 4 +- stepmake/make/out/stepmake.lsm | 8 +- stepmake/make/out/stepmake.spec | 4 +- stepmake/stepmake/metafont-rules.make | 2 +- tex/lilyponddefs.tex | 2 +- 158 files changed, 305 insertions(+), 298 deletions(-) delete mode 100644 lily/include/notename.hh diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile index cda611dd31..9ac25bad27 100644 --- a/Documentation/tex/GNUmakefile +++ b/Documentation/tex/GNUmakefile @@ -20,11 +20,15 @@ PS_FILES = $(DVI_FILES:.dvi=.ps) STEPMAKE_TEMPLATES=documentation LOCALSTEPMAKE_TEMPLATES=lilypond mudela -export BIBINPUTS="$(topdir)/Documentation/tex//"#huh? include $(depth)/make/stepmake.make + +export BIBINPUTS:="$(topdir)/Documentation/tex//"#huh? + + + dvi: $(OUT_BIB_FILES) $(DVI_FILES) diff --git a/Documentation/tex/glossary.yo b/Documentation/tex/glossary.yo index 839ed95eca..3fb23a5f58 100644 --- a/Documentation/tex/glossary.yo +++ b/Documentation/tex/glossary.yo @@ -25,7 +25,6 @@ latexlayoutcmds( \setlength{\evensidemargin}{0.25in} ) -latexpackage()(a4wide) COMMENT(UGH) whenlatex(notableofcontents()) whentexinfo(notableofcontents()) diff --git a/Documentation/tex/other-packages.bib b/Documentation/tex/other-packages.bib index 07ab38a4d0..da52e7ea9b 100644 --- a/Documentation/tex/other-packages.bib +++ b/Documentation/tex/other-packages.bib @@ -332,3 +332,15 @@ music.'}, note = {A notation product from a company that now focuses on sequencing}, } +@Misc{mp, + OPTkey = {}, + OPTauthor = {Bernhard Hill}, + OPTtitle = {Music Publisher}, + html={http://www.braeburn.co.uk/mp.htm} + OPThowpublished = {}, + OPTmonth = {}, + OPTyear = {}, + OPTnote = {}, + OPTannote = {} +} + diff --git a/NEWS b/NEWS index 1889f523cc..794216b558 100644 --- a/NEWS +++ b/NEWS @@ -1,21 +1,19 @@ ---- ../lilypond-1.0.9/NEWS Thu Sep 17 12:03:26 1998 -++ b/NEWS Sat Sep 19 23:46:51 1998 -@@ -1,3 +1,8 @@ -pl 9.jbr1 - - scripts/convert-mudela.py: We must close infile and outfile before - a rename occurs. NT Windows locks open files. - stepmake/bin/package-zip32.sh: renamed all python bins to: - .py in NT Windows distribution. - - (need to fix pictures. I know) - pl 9.jcn1 + +(need to fix pictures. I know) + + +pl 9.jcn1 - started gnuisation of website * filetype and size * 'no gifs due to patent problems' - bumped stepmake version nr (again): please update stepmake/VERSION after making changes to stepmake... - -(need to fix pictures. I know) + +pl 9.hwn1 + - do default midi,paper by toplevel \paper / \midi (mudela 1.0.4) + - bf: error if no Score context + - notename table now can be declared as well. + - junked \clear pl 9 diff --git a/TODO b/TODO index 3ec1590a25..ea03cc73a2 100644 --- a/TODO +++ b/TODO @@ -9,6 +9,8 @@ grep for TODO and ugh/ugr/urg * egcs-1.1 support + * make engraver hacking robust. + * fix LOCALE settings, and \def\foo{2,000pt} output * use streambufs and iostream @@ -54,8 +56,6 @@ grep for TODO and ugh/ugr/urg * install TeX stuff into tex/generic directory. - * preformatted .info stuff. - * percussion note heads * mi2mu empty staffs. diff --git a/VERSION b/VERSION index 7097c5caa1..32ca2233ed 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_LEVEL=9 -MY_PATCH_LEVEL=jbr1 +PATCH_LEVEL=10 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/init/book-fragment.ly b/init/book-fragment.ly index 91645e70c7..242d28e061 100644 --- a/init/book-fragment.ly +++ b/init/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.3"; +\version "1.0.4"; \include "declarations.ly" diff --git a/init/book-init.ly b/init/book-init.ly index 2975e48249..4637aeba10 100644 --- a/init/book-init.ly +++ b/init/book-init.ly @@ -1,12 +1,12 @@ % Toplevel initialisation file. -\version "1.0.3"; +\version "1.0.4"; \include "declarations.ly"; \include "paper16.ly" -default_paper = \paper{ + \paper{ \paper_sixteen } diff --git a/init/center-fragment.ly b/init/center-fragment.ly index 192f0f031f..8a7fb5381e 100644 --- a/init/center-fragment.ly +++ b/init/center-fragment.ly @@ -1,13 +1,13 @@ % Toplevel initialisation file. -\version "1.0.3"; +\version "1.0.4"; \include "declarations.ly" \include "paper16.ly"; -default_paper = \paper { + \paper { \paper_sixteen linewidth = 7.\cm; } diff --git a/init/center.ly b/init/center.ly index feafaedcb4..035c39761b 100644 --- a/init/center.ly +++ b/init/center.ly @@ -1,12 +1,12 @@ % Toplevel initialisation file. -\version "1.0.3"; +\version "1.0.4"; \include "declarations.ly" \include "paper16.ly" -default_paper = \paper { + \paper { \paper_sixteen; % linewidth = 7.\cm; linewidth = 11.\cm; diff --git a/init/declarations.ly b/init/declarations.ly index 73ec21f886..ec6a60a127 100644 --- a/init/declarations.ly +++ b/init/declarations.ly @@ -13,7 +13,7 @@ Wordwrap = 0.0 \include "paper20.ly" -default_paper = \paper{ +\paper{ \paper_twenty } diff --git a/init/fragment.ly b/init/fragment.ly index 192f0f031f..8a7fb5381e 100644 --- a/init/fragment.ly +++ b/init/fragment.ly @@ -1,13 +1,13 @@ % Toplevel initialisation file. -\version "1.0.3"; +\version "1.0.4"; \include "declarations.ly" \include "paper16.ly"; -default_paper = \paper { + \paper { \paper_sixteen linewidth = 7.\cm; } diff --git a/init/init.fly b/init/init.fly index 9a2fa1d688..c7b8aff7dc 100644 --- a/init/init.fly +++ b/init/init.fly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.3"; +\version "1.0.4"; \include "declarations.ly" diff --git a/init/init.ly b/init/init.ly index e076b2102d..02c6e14ff1 100644 --- a/init/init.ly +++ b/init/init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.3"; +\version "1.0.4"; \include "declarations.ly"; diff --git a/init/midi.ly b/init/midi.ly index 103028cf20..114d34f20f 100644 --- a/init/midi.ly +++ b/init/midi.ly @@ -1,5 +1,5 @@ -default_midi = \midi { +\midi { \tempo 4=60; \include "performer.ly" } diff --git a/init/paper16.ly b/init/paper16.ly index 4ccaea1351..c59a5c3ccf 100644 --- a/init/paper16.ly +++ b/init/paper16.ly @@ -6,7 +6,7 @@ -\version "1.0.3"; +\version "1.0.4"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/init/paper20.ly b/init/paper20.ly index 4da2520dd5..955f164eec 100644 --- a/init/paper20.ly +++ b/init/paper20.ly @@ -5,7 +5,7 @@ \include "table13.ly"; \include "table16.ly"; -\version "1.0.3"; +\version "1.0.4"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/init/svenska.ly b/init/svenska.ly index 6b8977fdcb..d5422ce646 100644 --- a/init/svenska.ly +++ b/init/svenska.ly @@ -3,12 +3,6 @@ % % by Mats Bengtsson. - -% -% Please note that, while these names are used to enter *notes*, they -% actually are *melodic*s, i.e. they represent a pitch solely. Notes -% have a rhythmic part too. This is the reason that we don't write 'note { .. }' -% \notenames { cessess = \musicalpitch { -1 0 -2 } cess = \musicalpitch { -1 0 -1 } diff --git a/input/example-3.ly b/input/example-3.ly index ebd4ba1851..eb8c8c48f9 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,8 +1,10 @@ -one = \melodic\relative c{ +\version "1.0.4"; + +one = \notes\relative c{ c'' d e f } -two = \melodic\relative c{ +two = \notes\relative c{ \clef "bass"; c'2 g2 } @@ -16,7 +18,7 @@ two = \melodic\relative c{ \midi{} } -% A full-mudala example with two staffs +% A full-mudela example with two staffs % % Type: % diff --git a/input/keys.ly b/input/keys.ly index 7f4bc62a6b..84738b6ed9 100644 --- a/input/keys.ly +++ b/input/keys.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; blah = \notes { diff --git a/input/kortjakje.ly b/input/kortjakje.ly index c823ab99f9..2baeadd3ca 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.3"; +\version "1.0.4"; % the % is a comment. diff --git a/input/part.ly b/input/part.ly index b7beca7636..7ee17905f3 100644 --- a/input/part.ly +++ b/input/part.ly @@ -1,4 +1,5 @@ -part = \melodic{ +\version "1.0.4"; +part = \{ c-1 c c c r1*3 c4-5 c c c @@ -30,7 +31,7 @@ a4 = \paper{ \score{ < - \melodic{ + \notes{ \property Score.part = 1 \part } @@ -40,7 +41,7 @@ a4 = \paper{ \score{ < - \melodic{ + \notes{ \property Score.part = 0 \part } diff --git a/input/pedal.ly b/input/pedal.ly index dde473995c..deff27a0d7 100644 --- a/input/pedal.ly +++ b/input/pedal.ly @@ -24,7 +24,7 @@ % \lbheel \lbheel \lfheel \lftoe % \rbheel \rbtoe \rfheel \rftoe -\version "1.0.3"; +\version "1.0.4"; \score{ \notes { diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index c9cb4f6da8..b7848e8af0 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -23,7 +23,7 @@ * organ staff... %} -\version "1.0.3"; +\version "1.0.4"; diff --git a/input/rhythm.ly b/input/rhythm.ly index b0e2e1cd66..ee8e9d6b9d 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.0.3"; +\version "1.0.4"; ritme = \notes\transpose c'' { \partial 8; diff --git a/input/scales.ly b/input/scales.ly index 81375258ce..08741e0259 100644 --- a/input/scales.ly +++ b/input/scales.ly @@ -12,7 +12,7 @@ copyright = "public domain"; % scales with accents. % -\version "1.0.3"; +\version "1.0.4"; blah = \notes { \time 6/8; \transpose c { diff --git a/input/scripts.ly b/input/scripts.ly index b4386c9538..2de3a30b85 100644 --- a/input/scripts.ly +++ b/input/scripts.ly @@ -1,5 +1,5 @@ -\version "1.0.3"; +\version "1.0.4"; blah = \notes{ \transpose c'' { diff --git a/input/test/abbrev.ly b/input/test/abbrev.ly index 134ff73cf0..38cfe3e795 100644 --- a/input/test/abbrev.ly +++ b/input/test/abbrev.ly @@ -1,5 +1,5 @@ -\version "1.0.3"; +\version "1.0.4"; \score{ \notes \transpose c'''{ \stemup diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index 1a1550b37c..ec1e8e9f65 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,7 +1,7 @@ -\version "1.0.3"; +\version "1.0.4"; onestaff = \type Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly index 7d9e968cdf..76d640ade5 100644 --- a/input/test/beam-pos.ly +++ b/input/test/beam-pos.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; \score{ \notes\transpose c''{ diff --git a/input/test/beams.ly b/input/test/beams.ly index 7e94c04216..89be9bec73 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.0.3"; +\version "1.0.4"; \score{ < diff --git a/input/test/broken.ly b/input/test/broken.ly index 27f1d708ae..d08dae39ef 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.3"; +\version "1.0.4"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 98ba6334ef..d4d07a45cf 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; \score { \notes{ diff --git a/input/test/collisions.ly b/input/test/collisions.ly index e503cbf7a9..b99931cf4a 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.3"; +\version "1.0.4"; diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index db8efbea8a..a3cf882cf2 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; \score { diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly index 43b3f393be..59c12abf21 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.3"; +\version "1.0.4"; oden = \lyric{ O8 | diff --git a/input/test/dotted-slur.ly b/input/test/dotted-slur.ly index e29a2aa09b..80fc0c07cf 100644 --- a/input/test/dotted-slur.ly +++ b/input/test/dotted-slur.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; \score{ \notes{ diff --git a/input/test/find-quarts.ly b/input/test/find-quarts.ly index 63d8647b21..1b1f7eac8a 100644 --- a/input/test/find-quarts.ly +++ b/input/test/find-quarts.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; \score{ \notes \relative c { diff --git a/input/test/font-body.ly b/input/test/font-body.ly index dde06fd8e0..47518dabb8 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 6bc11d45b9..4fcb9dac5e 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.3"; +\version "1.0.4"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index c8ddcec331..377a95ac05 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.3"; +\version "1.0.4"; \include "font-body.ly" \score{ diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 144656f5e4..51c2d0f60f 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.3"; +\version "1.0.4"; %{ diff --git a/input/test/grace.ly b/input/test/grace.ly index 8424587c52..86e3c94d2c 100644 --- a/input/test/grace.ly +++ b/input/test/grace.ly @@ -1,5 +1,5 @@ -\version "1.0.3"; +\version "1.0.4"; \include "table13.ly"; \include "table16.ly"; diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 573aea14ba..f4f6807837 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; toeter_i = \notes\relative c { \property Staff.instrument = "Toeters" @@ -62,7 +62,7 @@ zoger = \type Staff = zoger \notes \relative c { \skip 1*1; } -default_paper = \include "score-paper.ly"; + \include "score-paper.ly"; zagers = \type GrandStaff < \zager diff --git a/input/test/keys.ly b/input/test/keys.ly index f1cab0f0d6..f1167e53a6 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; %{ test key itemv breaking diff --git a/input/test/knee.ly b/input/test/knee.ly index dec8562e64..afefec8948 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; \score{ \notes\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/test/mark.ly b/input/test/mark.ly index e694fe6c3c..2ffb0f71e3 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; global = \notes { s1 | \mark "A"; diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index 6a801c03a3..7b694a526c 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; voice_one = \notes\transpose c' { \stemup R1 * 2 | f'4-. r r2 | R1 * 3 | diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 9aa99298e2..b8be66d9d0 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; \score { diff --git a/input/test/score-bar-scripts.ly b/input/test/score-bar-scripts.ly index 5d72b15d06..9cc3670809 100644 --- a/input/test/score-bar-scripts.ly +++ b/input/test/score-bar-scripts.ly @@ -1,7 +1,7 @@ -\version "1.0.3"; +\version "1.0.4"; onestaff = \type Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 28ce6fc9ce..db1338d5d8 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.3"; +\version "1.0.4"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-bug.ly b/input/test/slur-bug.ly index ba60200dc5..6bd9773103 100644 --- a/input/test/slur-bug.ly +++ b/input/test/slur-bug.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; % bug % excentric slur can't handle this ... diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 32eb795327..8199d2a769 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.0.3"; +\version "1.0.4"; \score{ \notes\relative c'{ diff --git a/input/test/slur-swap.ly b/input/test/slur-swap.ly index 782e9b9c13..a4b712da93 100644 --- a/input/test/slur-swap.ly +++ b/input/test/slur-swap.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; % urg, the direction of the slur gets swapped! \score{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 78407e6cb1..065f3209fd 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.0.3"; +\version "1.0.4"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 908476bc94..1a177c47b9 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.3"; +\version "1.0.4"; multipart = \notes{ \type StaffGroup < diff --git a/input/test/stem.ly b/input/test/stem.ly index 1db1f9d49f..6b40f48841 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.0.3"; +\version "1.0.4"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/test-lyrics.ly b/input/test/test-lyrics.ly index 529dbf581b..ce992078a0 100644 --- a/input/test/test-lyrics.ly +++ b/input/test/test-lyrics.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; $somewhat_long = \lyric{ \textstyle "roman" ; diff --git a/input/test/tie-bug.ly b/input/test/tie-bug.ly index 0e9d54e8b1..15f7e0b499 100644 --- a/input/test/tie-bug.ly +++ b/input/test/tie-bug.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; % middle tie is wrong diff --git a/input/test/tie.ly b/input/test/tie.ly index 042721976f..e94930d739 100644 --- a/input/test/tie.ly +++ b/input/test/tie.ly @@ -1,4 +1,4 @@ -\version "1.0.3"; +\version "1.0.4"; tie = \notes\transpose c''{ diff --git a/input/test/title.ly b/input/test/title.ly index 601c81a24f..2eafb8ae11 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.0.3"; +\version "1.0.4"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 21e9b35e2f..ba4569910c 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 6831dda8f7..e80a68201c 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.0.3"; +\version "1.0.4"; \score { \notes < diff --git a/input/tril.ly b/input/tril.ly index 26e1dc5b39..93d228e61f 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.3"; +\version "1.0.4"; \score{ \notes{ diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 153d3d65ae..842f3c4185 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.3"; +\version "1.0.4"; melodie = \notes\relative c { \clef"violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index 70e18c964a..b2b888819d 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -20,7 +20,7 @@ traditional song in various languages. Tested Features: lyrics, interleaving lyrics and staffs %} -\version "1.0.3"; +\version "1.0.4"; melody = \notes \relative c'' { \clef violin; diff --git a/lily/VERSION b/lily/VERSION index 7097c5caa1..32ca2233ed 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_LEVEL=9 -MY_PATCH_LEVEL=jbr1 +PATCH_LEVEL=10 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/lily/identifier.cc b/lily/identifier.cc index 71f093fdfe..c5dbee2c00 100644 --- a/lily/identifier.cc +++ b/lily/identifier.cc @@ -18,7 +18,7 @@ #include "script-def.hh" #include "request.hh" #include "translator.hh" - +#include "notename-table.hh" IMPLEMENT_IS_TYPE_B(Identifier); @@ -102,7 +102,7 @@ Class ## _identifier::do_str () const { \ } - +DUMMY_STR(Notename_table); DUMMY_STR(General_script_def); DUMMY_STR(Lookup); DUMMY_STR(Translator); @@ -126,7 +126,8 @@ STRING_PRINT(Duration); STRING_PRINT(Real); STRING_PRINT(int); STRING_PRINT(String); - +STRING_PRINT(Notename_table); + #define DEFAULT_STR(Class) \ String \ Class ## _identifier::do_str () const\ @@ -185,12 +186,12 @@ IMPLEMENT_ID_CLASS(Score); IMPLEMENT_ID_CLASS(Request); IMPLEMENT_ID_CLASS(Midi_def); IMPLEMENT_ID_CLASS(Paper_def); - +IMPLEMENT_ID_CLASS(Notename_table); VIRTUAL_ACCESSOR(Music); VIRTUAL_ACCESSOR(Request); VIRTUAL_ACCESSOR(Translator); VIRTUAL_ACCESSOR(General_script_def); - +DEFAULT_ACCESSOR(Notename_table); DEFAULT_ACCESSOR(Duration); DEFAULT_ACCESSOR(int); DEFAULT_ACCESSOR(Real); diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh index de26489e32..8a951de6c7 100644 --- a/lily/include/identifier.hh +++ b/lily/include/identifier.hh @@ -14,6 +14,8 @@ #define DECLARE_TYPE_NAME(Class) + +class Notename_table_identifier; class Translator_identifier; class Music_identifier; class General_script_def_identifier; @@ -53,6 +55,7 @@ struct Identifier : public Input { void error (String) const; String str () const; IDACCESSOR(Translator) + IDACCESSOR(Notename_table) IDACCESSOR(Music) IDACCESSOR(General_script_def) IDACCESSOR(Symtables) @@ -92,6 +95,7 @@ struct Class ## _identifier : Identifier {\ DECLARE_ID_CLASS(Translator); DECLARE_ID_CLASS(Duration); +DECLARE_ID_CLASS(Notename_table); DECLARE_ID_CLASS(Real); DECLARE_ID_CLASS(String); DECLARE_ID_CLASS(General_script_def); diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index e4e3d293ed..5b5d17c008 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -46,7 +46,7 @@ public: /* *************** */ void start_main_input (); - void clear_notenames(); + void set_notename_table(Notename_table*tab_p); bool notename_b(String) const; Identifier*lookup_identifier (String s); Musical_pitch lookup_pitch (String s); diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index d92762265a..e68324ddcd 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -61,7 +61,6 @@ public: Midi_def*default_midi_p(); void do_yyparse(); void parser_error (String); - void clear_notenames(); Array* get_parens_request (int t); diff --git a/lily/include/notename-table.hh b/lily/include/notename-table.hh index 56dd7c3927..7338f05bf1 100644 --- a/lily/include/notename-table.hh +++ b/lily/include/notename-table.hh @@ -1,5 +1,5 @@ /* - notename-table.hh -- declare + notename-table.hh -- declare Notename_table source file of the GNU LilyPond music typesetter diff --git a/lily/include/notename.hh b/lily/include/notename.hh deleted file mode 100644 index 716217ef84..0000000000 --- a/lily/include/notename.hh +++ /dev/null @@ -1,24 +0,0 @@ -/* - notename.hh -- part of GNU LilyPond - - (c) 1996--1998 Han-Wen Nienhuys -*/ - -#ifndef NOTENAME_HH -#define NOTENAME_HH -#error OBSOLETE! -#include "string.hh" - -struct Notename_tab { - String notetab[7*5]; - - void set (int l, int s, String nm); - void lookup (int &large, int &small, String s); -}; - -void set_notename_tab (Notename_tab*n); -void lookup_notename (int &large, int &small, String s); - - -#endif // NOTENAME_HH - diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index ff1c78ddb9..bcda3dbc42 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -53,7 +53,10 @@ Music_output_def::find_translator_l (String name) const Global_translator * Music_output_def::get_global_translator_p () { - Translator * t = find_translator_l ("Score")->clone (); + Translator * t = find_translator_l ("Score"); + if (!t) + error (_("Can't find Score context")); + t = t->clone (); Global_translator *g = t->group_l ()->global_l (); t->add_processing (); diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 01b33c406e..1ae47c5057 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -27,11 +27,9 @@ static Keyword_ent the_key_tab[]={ {"accepts", ACCEPTS}, {"bar", BAR}, {"cadenza", CADENZA}, - {"clear", CLEAR}, {"clef", CLEF}, {"cm", CM_T}, {"consists", CONSISTS}, - {"contains", CONTAINS}, {"duration", DURATION}, {"font", FONT}, {"grouping", GROUPING}, @@ -178,10 +176,10 @@ My_lily_lexer::add_notename (String s, Musical_pitch p) } void -My_lily_lexer::clear_notenames() +My_lily_lexer::set_notename_table(Notename_table *p) { delete note_tab_p_; - note_tab_p_ = new Notename_table; + note_tab_p_ = p; } char diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 0494553930..ea2cbe6b5a 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -40,11 +40,6 @@ My_lily_parser::~My_lily_parser() } -void -My_lily_parser::clear_notenames() -{ - lexer_p_->clear_notenames(); -} void My_lily_parser::set_version_check (bool ig) @@ -318,14 +313,14 @@ My_lily_parser::add_notename (String s, Musical_pitch p) Paper_def* My_lily_parser::default_paper_p () { - Identifier *id = lexer_p_->lookup_identifier ("default_paper"); + Identifier *id = lexer_p_->lookup_identifier ("$defaultpaper"); return id ? id->access_Paper_def () : new Paper_def ; } Midi_def* My_lily_parser::default_midi_p () { - Identifier *id = lexer_p_->lookup_identifier ("default_midi"); + Identifier *id = lexer_p_->lookup_identifier ("$defaultmidi"); return id ? id->access_Midi_def () : new Midi_def ; } diff --git a/lily/parser.yy b/lily/parser.yy index f9a3094e02..067eed8e65 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -10,7 +10,7 @@ */ #include - +#include "notename-table.hh" #include "scalar.hh" #include "translation-property.hh" #include "script-def.hh" @@ -45,7 +45,7 @@ // mmm Mudela_version oldest_version ("1.0.3"); -Mudela_version version ("1.0.3"); +Mudela_version version ("1.0.4"); // needed for bison.simple's malloc() and free() @@ -103,6 +103,7 @@ Paper_def* current_paper = 0; Midi_def* midi; Moment *moment; Note_req *notereq; + Notename_table *notenametab; Paper_def *paper; Real real; Request * request; @@ -139,61 +140,54 @@ yylex (YYSTYPE *s, void * v_l) /* tokens which are not keywords */ -%token ALIAS +%token ABSDYNAMIC +%token ACCEPTS %token BAR %token BEAMPLET -%token MAEBTELP -%token PENALTY %token CADENZA -%token CLEAR %token CLEF -%token CONTAINS -%token RELATIVE -%token CONSISTS -%token ACCEPTS %token CM_T +%token CONSISTS %token DURATION -%token ABSDYNAMIC %token END +%token FONT %token GROUPING -%token TRANSLATOR %token HEADER %token IN_T -%token LYRIC %token KEY %token KEYSIGNATURE +%token LYRIC +%token MAEBTELP %token MARK -%token MUSIC -%token MUSICAL_PITCH -%token NOTES +%token MEASURES %token MIDI -%token TIME_T %token MM_T - +%token MUSIC +%token MUSICAL_PITCH %token NOTENAMES +%token NOTES %token OCTAVE %token OUTPUT %token PAPER %token PARTIAL +%token PENALTY %token PLET -%token TELP +%token PROPERTY %token PT_T +%token RELATIVE %token SCORE %token SCRIPT %token SHAPE %token SKIP %token SPANDYNAMIC - -%token START_T %token SYMBOLTABLES %token TABLE -%token TRANSPOSE +%token TELP %token TEMPO +%token TIME_T +%token TRANSLATOR +%token TRANSPOSE %token TYPE -%token FONT -%token MEASURES -%token TITLE -%token PROPERTY %token VERSION /* escaped */ @@ -204,7 +198,7 @@ yylex (YYSTYPE *s, void * v_l) %token NOTENAME_PITCH %token DURATION_IDENTIFIER %token IDENTIFIER - +%token NOTENAME_TABLE_IDENTIFIER %token MUSIC_IDENTIFIER %token POST_REQUEST_IDENTIFIER %token SCRIPT_IDENTIFIER @@ -248,7 +242,7 @@ yylex (YYSTYPE *s, void * v_l) %type duration_length %type scalar -%type Music transposed_music relative_music Sequential_music Simultaneous_music +%type Music relative_music Sequential_music Simultaneous_music %type property_def translator_change %type Music_list %type paper_block paper_body @@ -271,24 +265,40 @@ yylex (YYSTYPE *s, void * v_l) %type symtable symtable_body %type translator_spec translator_spec_body %type tempo_request - +%type notenames_body notenames_block %expect 1 %% mudela: /* empty */ - | mudela mudela_header { - delete header_global_p; - header_global_p = $2; - } - | mudela score_block { - score_global_array.push ($2); - } + | mudela toplevel_expression {} | mudela add_declaration { } | mudela error | mudela check_version { } - | mudela add_notenames { } + ; + +toplevel_expression: + notenames_block { + THIS->lexer_p_->set_notename_table ($1); + } + | mudela_header { + delete header_global_p; + header_global_p = $1; + } + | score_block { + score_global_array.push ($1); + } + | paper_block { + Identifier * id = new + Paper_def_identifier ($1, PAPER_IDENTIFIER); + THIS->lexer_p_->set_identifier ("$defaultpaper", id) + } + | midi_block { + Identifier * id = new + Midi_def_identifier ($1, MIDI_IDENTIFIER); + THIS->lexer_p_->set_identifier ("$defaultmidi", id) + } ; check_version: @@ -305,17 +315,23 @@ check_version: } ; -add_notenames: - NOTENAMES '{' notenames_body '}' + +notenames_block: + NOTENAMES '{' notenames_body '}' { $$ = $3; } ; + + + notenames_body: /**/ { + $$ = new Notename_table; } - | notenames_body CLEAR { - THIS->clear_notenames (); + | NOTENAME_TABLE_IDENTIFIER { + $$ = $1-> access_Notename_table(); } | notenames_body STRING '=' explicit_musical_pitch { - THIS->add_notename (*$2, *$4); + (*$$)[*$2] = *$4; + delete $4; delete $2; } @@ -342,7 +358,6 @@ mudela_header: /* DECLARATIONS */ - add_declaration: STRING { THIS->remember_spot (); @@ -359,6 +374,9 @@ identifier_init: $$ = new Score_identifier ($1, SCORE_IDENTIFIER); } + | notenames_block { + $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER); + } | paper_block { $$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER); } @@ -681,7 +699,11 @@ Music: } | Simultaneous_music { $$ = $1; } | Sequential_music { $$ = $1; } - | transposed_music { $$ = $1; } + | TRANSPOSE musical_pitch Music { + $$ = $3; + $$ -> transpose (*$2); + delete $2; + } | MUSIC_IDENTIFIER { $$ = $1->access_Music (); } | NOTES { THIS->lexer_p_->push_note_state (); } @@ -742,14 +764,6 @@ scalar: ; -transposed_music: - TRANSPOSE musical_pitch Music { - $$ = $3; - $$ -> transpose (*$2); - delete $2; - } - ; - request_chord: pre_requests simple_element post_requests { diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR index 3a5fb3494a..6a3daf8541 100644 --- a/make/STATE-VECTOR +++ b/make/STATE-VECTOR @@ -80,5 +80,6 @@ 1.0.8.jcn1 1.0.8.uu1 1.0.9 -1.0.9.jcn1 -1.0.9.jbr1 +1.0.9.hwn1 +1.0.9.uu1 +1.0.10 diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index f912908583..2294c969fa 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -1,6 +1,6 @@ -export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH) -export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP) +export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out$(PATHSEP)$(PATH) +export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(PATHSEP)$(MFINPUTS)$(PATHSEP) export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(PATHSEP) export LILYINCLUDE:=$(topdir)/init$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(LILYINCLUDE) diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 3679f2f0c1..8421726703 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.0.9 -Inschrijf datum: 17SEP98 +Versie: 1.0.10 +Inschrijf datum: 18SEP98 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.9.tar.gz + 770k lilypond-1.0.10.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.9.tar.gz + 770k lilypond-1.0.10.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 9fb364eb77..cb18d96acc 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.0.9 -Entered-date: 17SEP98 +Version: 1.0.10 +Entered-date: 18SEP98 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.9.tar.gz + 770k lilypond-1.0.10.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.0.9.tar.gz + 770k lilypond-1.0.10.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 0f0869fbaa..c9c562b9d2 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.0.9 +Version: 1.0.10 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.9.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.10.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/make/stepmake.make b/make/stepmake.make index e08af849a4..835f6907a4 100644 --- a/make/stepmake.make +++ b/make/stepmake.make @@ -31,8 +31,12 @@ LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES) all: +include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES))) + +# ugh. need to do this because of PATH :=$(topdir)/..:$(PATH) include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPLATES))) -include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES))) + + include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMPLATES))) include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES))) include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TEMPLATES))) diff --git a/mudela-mode.el b/mudela-mode.el index bd66bb4d4f..f6ea3233e7 100644 --- a/mudela-mode.el +++ b/mudela-mode.el @@ -32,10 +32,10 @@ (defconst mudela-font-lock-keywords (let* ((keywords '( - "accepts" "accidentals" "break" "bar" "cadenza" "clear" + "accepts" "accidentals" "break" "bar" "cadenza" "clef" "cm" "consists" "contains" "duration" "absdynamic" - "in" "translator" "type" "lyric" "key" "maininput" "melodic" - "musical_pitch" "meter" "midi" "mm" "multi" "header" + "in" "translator" "type" "lyric" "key" "maininput" "notes" + "musical_pitch" "meter" "midi" "mm" "header" "notenames" "octave" "output" "partial" "paper" "plet" "property" "pt" "shape" "relative" "include" "score" "script" "skip" "table" "spandynamic" "symboltables" diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index a5dc6dd7dc..f3e31235d1 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.3"; +\version "1.0.4"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index 352c0031d4..0f3c74edf5 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.3"; +\version "1.0.4"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index 5456ca9573..7156bbdcb2 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 7c18d193f9..f7d4d6c0b6 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; clarinetto1 = \notes \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 d87a791b58..87ae15613c 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; clarinetto2 = \notes \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 72b14e59c6..30697b2c73 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.3"; +\version "1.0.4"; \include "global.ly" \include "contrabasso.ly" diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index 0a272c9e33..d022c82b5d 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; contrabasso = \notes \relative c { % \translator Staff=violoncello diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index baed0a99b0..ac6f000eb4 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "global.ly" @@ -63,7 +63,7 @@ strijkers = \type StaffGroup = strijkers_group < \$bassi > -default_paper = \include "score-paper.ly" + \include "score-paper.ly" \score{ < \property Score . textstyle = "italic" diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 77231a6566..e914ce3c8d 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.3"; +\version "1.0.4"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 2d85377244..09293eb75d 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "corno-1.ly" \include "corno-2.ly" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 52f04de55a..8b7232ed21 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.3"; +\version "1.0.4"; corno1 = \notes \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 17d91e4c23..80746b3df6 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.3"; +\version "1.0.4"; corno2 = \notes \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 12acc984da..f485eb00e2 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 88120d81b0..b0cf8a0bb7 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "fagotto-1.ly" \include "fagotto-2.ly" diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 8674d66d75..f9cdfb573e 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; fagotto1 = \notes \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 2b4c5d59ac..ed15d8b76c 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.3"; +\version "1.0.4"; fagotto2 = \notes \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 92e2575a71..9afed158c9 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 861a962152..7217b6f831 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "flauto-1.ly" \include "flauto-2.ly" diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 84ca0c5e9d..8841c9ca95 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.3"; +\version "1.0.4"; flauto1 = \notes \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 1efc09e28f..724e9e4174 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.3"; +\version "1.0.4"; flauto2 = \notes \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 7e51a44d45..50fa87f4c8 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; global = \notes { \time 4/4; diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index 2bc57696a8..670f10fc2b 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.3"; +\version "1.0.4"; oboe1 = \notes \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 2e66374c27..afcf542610 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; oboe2 = \notes \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 f2153e900f..0209b433cb 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 4df66776c7..543805266b 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "oboe-1.ly" \include "oboe-2.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 9eab499572..5447bd60a6 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; timpani = \notes \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 75e41015dd..1e69e439c4 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 6955a46757..593801191c 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; \include "trombo-1.ly" \include "trombo-2.ly" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 7b98c1f2c9..65b362e2c5 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.3"; +\version "1.0.4"; trombo1 = \notes \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 d51c389d17..cf1e654933 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.3"; +\version "1.0.4"; trombo2 = \notes \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 29d873adf5..3d69be4a38 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.3"; +\version "1.0.4"; viola1 = \notes \relative c { \type Voice=one diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index f45118959e..d309d0d766 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.3"; +\version "1.0.4"; viola2 = \notes \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 072df6244a..f6ff5bf220 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.3"; +\version "1.0.4"; \include "global.ly" \include "viola-1.ly" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index 3dd9bbc20c..af23c50350 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.3"; +\version "1.0.4"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index 6e71c6f065..0b32f8cedc 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.3"; +\version "1.0.4"; violino1 = \notes \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 0179102b87..6fe721a4a7 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.3"; +\version "1.0.4"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index b4a6d19ef5..4a4b04496d 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.3"; +\version "1.0.4"; violino2 = \notes \relative c { c'1\ff ~ | c | r r2 | R1 | diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly index 677223d111..30720db5ba 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.3"; +\version "1.0.4"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 0f5941ca9b..e8d117e4fa 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.3"; +\version "1.0.4"; violoncello = \notes \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/Cembalo-Partitas/Partita_II_Allemande.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly index 5d6789756a..d55183d9a2 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -4,7 +4,7 @@ piece = "Allemande"; } -\version "1.0.3"; +\version "1.0.4"; global = \notes{ \time 4/4; diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly index 98aa397f91..c6527f5447 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -10,7 +10,7 @@ copyright = "Public Domain"; } -\version "1.0.3"; +\version "1.0.4"; global = \notes { \time 4/4; diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 18084f2ccf..2897e9c0dc 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.3"; +\version "1.0.4"; one = \notes\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 5b3e102358..17a74c61da 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.3"; +\version "1.0.4"; one = \notes\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 19a5f1082d..8fc766402b 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.3"; +\version "1.0.4"; one = \notes\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 3d4d462d25..142f047f45 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.3"; +\version "1.0.4"; one = \notes\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 db680f0af4..4455273075 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.3"; +\version "1.0.4"; one = \notes\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 538ae83172..2a182ad2be 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "allemande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly index a523205ece..a8536451d5 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "allemande-urtext.ly"; 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 5d79e6204b..35c1cbdd51 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "courante-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly index 585b13464f..e3b92a148d 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "courante-urtext.ly"; 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 a864e15460..1dadeae3b6 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "gigue-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly index 9e3317146a..cc075b3f72 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "gigue-urtext.ly"; 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 7b9a4b75ee..33a843066c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -16,7 +16,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "menuetto-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index 5e55a3571a..afc1078efb 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -17,7 +17,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "menuetto-urtext.ly"; 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 6b0c12f743..9043a9cace 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "prelude-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly index 99b826deaf..40f3288678 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "prelude-urtext.ly"; 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 e3dbc0f649..9e16f386d8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly index 99e82955f8..1c7bf7ccf7 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.3"; +\version "1.0.4"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index f6cacd4df4..e00ea800d3 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.3"; +\version "1.0.4"; global = diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index f8df5be8fb..8c36ac007b 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -13,7 +13,7 @@ Tested Features: stem direction, multivoice, forced accidentals. %} -\version "1.0.3"; +\version "1.0.4"; \include "nederlands.ly" % for correct parsing of note names diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index 179e70471b..1ae74ec4aa 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.3"; +\version "1.0.4"; global = \notes { diff --git a/mutopia/W.A.Mozart/cadenza.ly b/mutopia/W.A.Mozart/cadenza.ly index 64eb8eda22..a192b1afd9 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.3"; +\version "1.0.4"; cad = \notes \relative c' { diff --git a/mutopia/W.A.Mozart/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3.ly index 2e014d83cf..730f69b5ac 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.3"; +\version "1.0.4"; allegro = \notes @@ -359,7 +359,7 @@ rondo = \notes \relative c' c4 r8 r4 r8 } -default_paper = \include "part-paper.ly" + \include "part-paper.ly" \score { diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index cd7a5d0eb1..978b8bcc89 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.3"; +\version "1.0.4"; vi1=\notes \relative c'' { \time 4/4; diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly index 29bc8a371e..d3c21e22a9 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.3"; +\version "1.0.4"; %{ Silly latex file dropped; use ly2dvi diff --git a/mutopia/standchen-16.ly b/mutopia/standchen-16.ly index 1525accfd8..77b00acb9f 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.3"; +\version "1.0.4"; \include "standchen.ly" diff --git a/mutopia/standchen-20.ly b/mutopia/standchen-20.ly index 4ffffeaae8..15d0d84dc7 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.3"; +\version "1.0.4"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly index fdd3ee056e..90997fbbe2 100644 --- a/mutopia/standchen.ly +++ b/mutopia/standchen.ly @@ -16,7 +16,7 @@ multiple \paper{}s in one \score Note: Original key F. %} -\version "1.0.3"; +\version "1.0.4"; $vocal_verse1 = \notes\relative c{ % ugh: treble/bass diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index 41441d2c5e..b12167c7ee 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -14,7 +14,7 @@ # - rewrite in python program_name = 'convert-mudela' -version = '0.3' +version = '0.2' import os @@ -189,6 +189,16 @@ if 1: return newlines conversions.append ((1,0,3), conv, '\melodic -> \notes\n') +if 1: + def conv(lines): + newlines =[] + for x in lines: + x = regsub.gsub ('default_paper *=', '',x) + x = regsub.gsub ('default_midi *=', '',x) + newlines.append (x) + return newlines + + conversions.append ((1,0,4), conv, 'default_{paper,midi}\n') ############################ @@ -215,7 +225,6 @@ def do_conversion (infile, from_version, outfile, to_version): lines = x[1] (lines) last_conversion = x[0] - sys.stderr.write ('\n') except FatalConversionError: sys.stderr.write ('Error while converting; I won\'t convert any further') @@ -263,16 +272,11 @@ def do_one_file (infile_name): do_conversion (infile, from_version, outfile, to_version) - if infile_name: - infile.close () - - if outfile_name: - outfile.close () - if __main__.edit: os.rename (infile_name, infile_name + '~') os.rename (infile_name + '.NEW', infile_name) + sys.stderr.write ('\n') edit = 0 to_version = () diff --git a/stepmake/bin/package-zip32.sh b/stepmake/bin/package-zip32.sh index bf28e0a94e..60174c018c 100644 --- a/stepmake/bin/package-zip32.sh +++ b/stepmake/bin/package-zip32.sh @@ -78,11 +78,9 @@ fi cp $CYGWIN_LIB $distdir/bin # -# Rename python files to .py +# Rename ly2dvi32 to ly2dvi.py # mv $distdir/bin/ly2dvi32 $distdir/bin/ly2dvi.py -mv $distdir/bin/convert-mudela $distdir/bin/convert-mudela.py -mv $distdir/bin/mudela-book $distdir/bin/mudela-book.py # # copy man documentation to doc directory diff --git a/stepmake/make/out/stepmake.lsm b/stepmake/make/out/stepmake.lsm index 0941e05ae6..33e52a7b6f 100644 --- a/stepmake/make/out/stepmake.lsm +++ b/stepmake/make/out/stepmake.lsm @@ -1,15 +1,15 @@ Begin3 Title: StepMake -Version: 0.1.50 -Entered-date: 17SEP98 +Version: 0.1.51 +Entered-date: 18SEP98 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-0.1.50.tar.gz + 40k stepmake-0.1.51.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 40k stepmake-0.1.50.tar.gz + 40k stepmake-0.1.51.tar.gz Copying-policy: GPL End diff --git a/stepmake/make/out/stepmake.spec b/stepmake/make/out/stepmake.spec index 80f1f08641..aff88bef90 100644 --- a/stepmake/make/out/stepmake.spec +++ b/stepmake/make/out/stepmake.spec @@ -1,9 +1,9 @@ Name: stepmake -Version: 0.1.50 +Version: 0.1.51 Release: 1 Copyright: GPL Group: Development -Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.50.tar.gz +Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.51.tar.gz Summary: generic make package Packager: janneke@gnu.org (Jan Nieuwenhuizen) Buildroot: /tmp/stepmake-install diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 915ff84e5b..df23a2fb43 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -14,4 +14,4 @@ $(outdir)/%.log: %.mf $(outdir)/%.tfm: %.mf mf '\mode:=ljfour; input $<;' mv $(@F) $(outdir) - rm $(basename $<).gf $(basename $<).log + rm $(basename $<).*gf $(basename $<).*log diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index bec5af39ff..22411bb56f 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -234,6 +234,6 @@ \message{footer defined}% \csname lilyfooter\texsuffix\endcsname \else - \message{page empty!} + \message{footer empty!} \csname nolilyfooter\texsuffix\endcsname \fi -- 2.39.2